From d5dee805806c1af5774040e3a1f40e7d1914758e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 12 May 2016 09:48:53 +0200 Subject: [PATCH] Move files_trashbin to PSR-4 (#24570) --- apps/files_trashbin/appinfo/info.xml | 1 + .../AppInfo/Application.php} | 0 .../ExpireTrash.php} | 0 .../lib/{capabilities.php => Capabilities.php} | 0 .../cleanup.php => lib/Command/CleanUp.php} | 0 .../{command/expire.php => lib/Command/Expire.php} | 0 .../CopyRecursiveException.php} | 0 .../lib/{expiration.php => Expiration.php} | 0 apps/files_trashbin/lib/{helper.php => Helper.php} | 0 apps/files_trashbin/lib/{hooks.php => Hooks.php} | 0 .../lib/{storage.php => Storage.php} | 0 .../lib/{trashbin.php => Trashbin.php} | 0 .../ExpireTrashTest.php} | 4 ++-- .../cleanuptest.php => Command/CleanUpTest.php} | 0 .../expiretest.php => Command/ExpireTest.php} | 0 .../tests/{expiration.php => ExpirationTest.php} | 5 +++-- .../tests/{storage.php => StorageTest.php} | 6 +++--- .../tests/{trashbin.php => TrashbinTest.php} | 14 +++++++------- 18 files changed, 16 insertions(+), 14 deletions(-) rename apps/files_trashbin/{appinfo/application.php => lib/AppInfo/Application.php} (100%) rename apps/files_trashbin/lib/{backgroundjob/expiretrash.php => BackgroundJob/ExpireTrash.php} (100%) rename apps/files_trashbin/lib/{capabilities.php => Capabilities.php} (100%) rename apps/files_trashbin/{command/cleanup.php => lib/Command/CleanUp.php} (100%) rename apps/files_trashbin/{command/expire.php => lib/Command/Expire.php} (100%) rename apps/files_trashbin/lib/{exceptions/copyrecursiveexception.php => Exceptions/CopyRecursiveException.php} (100%) rename apps/files_trashbin/lib/{expiration.php => Expiration.php} (100%) rename apps/files_trashbin/lib/{helper.php => Helper.php} (100%) rename apps/files_trashbin/lib/{hooks.php => Hooks.php} (100%) rename apps/files_trashbin/lib/{storage.php => Storage.php} (100%) rename apps/files_trashbin/lib/{trashbin.php => Trashbin.php} (100%) rename apps/files_trashbin/tests/{backgroundjob/expiretrash.php => BackgroundJob/ExpireTrashTest.php} (91%) rename apps/files_trashbin/tests/{command/cleanuptest.php => Command/CleanUpTest.php} (100%) rename apps/files_trashbin/tests/{command/expiretest.php => Command/ExpireTest.php} (100%) rename apps/files_trashbin/tests/{expiration.php => ExpirationTest.php} (98%) rename apps/files_trashbin/tests/{storage.php => StorageTest.php} (99%) rename apps/files_trashbin/tests/{trashbin.php => TrashbinTest.php} (97%) diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml index c3c29f2297b..52b00d90ff6 100644 --- a/apps/files_trashbin/appinfo/info.xml +++ b/apps/files_trashbin/appinfo/info.xml @@ -14,6 +14,7 @@ To prevent a user from running out of disk space, the ownCloud Deleted files app + Files_Trashbin diff --git a/apps/files_trashbin/appinfo/application.php b/apps/files_trashbin/lib/AppInfo/Application.php similarity index 100% rename from apps/files_trashbin/appinfo/application.php rename to apps/files_trashbin/lib/AppInfo/Application.php diff --git a/apps/files_trashbin/lib/backgroundjob/expiretrash.php b/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php similarity index 100% rename from apps/files_trashbin/lib/backgroundjob/expiretrash.php rename to apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php diff --git a/apps/files_trashbin/lib/capabilities.php b/apps/files_trashbin/lib/Capabilities.php similarity index 100% rename from apps/files_trashbin/lib/capabilities.php rename to apps/files_trashbin/lib/Capabilities.php diff --git a/apps/files_trashbin/command/cleanup.php b/apps/files_trashbin/lib/Command/CleanUp.php similarity index 100% rename from apps/files_trashbin/command/cleanup.php rename to apps/files_trashbin/lib/Command/CleanUp.php diff --git a/apps/files_trashbin/command/expire.php b/apps/files_trashbin/lib/Command/Expire.php similarity index 100% rename from apps/files_trashbin/command/expire.php rename to apps/files_trashbin/lib/Command/Expire.php diff --git a/apps/files_trashbin/lib/exceptions/copyrecursiveexception.php b/apps/files_trashbin/lib/Exceptions/CopyRecursiveException.php similarity index 100% rename from apps/files_trashbin/lib/exceptions/copyrecursiveexception.php rename to apps/files_trashbin/lib/Exceptions/CopyRecursiveException.php diff --git a/apps/files_trashbin/lib/expiration.php b/apps/files_trashbin/lib/Expiration.php similarity index 100% rename from apps/files_trashbin/lib/expiration.php rename to apps/files_trashbin/lib/Expiration.php diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/Helper.php similarity index 100% rename from apps/files_trashbin/lib/helper.php rename to apps/files_trashbin/lib/Helper.php diff --git a/apps/files_trashbin/lib/hooks.php b/apps/files_trashbin/lib/Hooks.php similarity index 100% rename from apps/files_trashbin/lib/hooks.php rename to apps/files_trashbin/lib/Hooks.php diff --git a/apps/files_trashbin/lib/storage.php b/apps/files_trashbin/lib/Storage.php similarity index 100% rename from apps/files_trashbin/lib/storage.php rename to apps/files_trashbin/lib/Storage.php diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/Trashbin.php similarity index 100% rename from apps/files_trashbin/lib/trashbin.php rename to apps/files_trashbin/lib/Trashbin.php diff --git a/apps/files_trashbin/tests/backgroundjob/expiretrash.php b/apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php similarity index 91% rename from apps/files_trashbin/tests/backgroundjob/expiretrash.php rename to apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php index c98a555c929..0d4d95ac298 100644 --- a/apps/files_trashbin/tests/backgroundjob/expiretrash.php +++ b/apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php @@ -19,11 +19,11 @@ * */ -namespace OCA\Files_Trashbin\Tests\BackgroundJob\ExpireTrash; +namespace OCA\Files_Trashbin\Tests\BackgroundJob; use \OCA\Files_Trashbin\BackgroundJob\ExpireTrash; -class ExpireTrash_Test extends \Test\TestCase { +class ExpireTrashTest extends \Test\TestCase { public function testConstructAndRun() { $backgroundJob = new ExpireTrash( $this->getMock('OCP\IUserManager'), diff --git a/apps/files_trashbin/tests/command/cleanuptest.php b/apps/files_trashbin/tests/Command/CleanUpTest.php similarity index 100% rename from apps/files_trashbin/tests/command/cleanuptest.php rename to apps/files_trashbin/tests/Command/CleanUpTest.php diff --git a/apps/files_trashbin/tests/command/expiretest.php b/apps/files_trashbin/tests/Command/ExpireTest.php similarity index 100% rename from apps/files_trashbin/tests/command/expiretest.php rename to apps/files_trashbin/tests/Command/ExpireTest.php diff --git a/apps/files_trashbin/tests/expiration.php b/apps/files_trashbin/tests/ExpirationTest.php similarity index 98% rename from apps/files_trashbin/tests/expiration.php rename to apps/files_trashbin/tests/ExpirationTest.php index 420d255947e..246409e24f4 100644 --- a/apps/files_trashbin/tests/expiration.php +++ b/apps/files_trashbin/tests/ExpirationTest.php @@ -20,9 +20,10 @@ * */ -use \OCA\Files_Trashbin\Expiration; +use OCA\Files_Trashbin\Expiration; +use \OCA\Files_Trashbin\Tests; -class Expiration_Test extends \PHPUnit_Framework_TestCase { +class ExpirationTest extends \Test\TestCase { const SECONDS_PER_DAY = 86400; //60*60*24 const FAKE_TIME_NOW = 1000000; diff --git a/apps/files_trashbin/tests/storage.php b/apps/files_trashbin/tests/StorageTest.php similarity index 99% rename from apps/files_trashbin/tests/storage.php rename to apps/files_trashbin/tests/StorageTest.php index 5c631770da3..1ba80caf183 100644 --- a/apps/files_trashbin/tests/storage.php +++ b/apps/files_trashbin/tests/StorageTest.php @@ -24,7 +24,7 @@ * */ -namespace OCA\Files_trashbin\Tests\Storage; +namespace OCA\Files_Trashbin\Tests; use OC\Files\Storage\Temporary; use OC\Files\Filesystem; @@ -34,9 +34,9 @@ use OC\Files\Filesystem; * * @group DB * - * @package OCA\Files_trashbin\Tests\Storage + * @package OCA\Files_Trashbin\Tests */ -class Storage extends \Test\TestCase { +class StorageTest extends \Test\TestCase { /** * @var string */ diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/TrashbinTest.php similarity index 97% rename from apps/files_trashbin/tests/trashbin.php rename to apps/files_trashbin/tests/TrashbinTest.php index 7087da37266..98d55020dce 100644 --- a/apps/files_trashbin/tests/trashbin.php +++ b/apps/files_trashbin/tests/TrashbinTest.php @@ -26,14 +26,14 @@ * */ -use OCA\Files_Trashbin; +use OCA\Files_Trashbin\Tests; /** * Class Test_Encryption * * @group DB */ -class Test_Trashbin extends \Test\TestCase { +class TrashbinTest extends \Test\TestCase { const TEST_TRASHBIN_USER1 = "test-trashbin-user1"; const TEST_TRASHBIN_USER2 = "test-trashbin-user2"; @@ -74,11 +74,11 @@ class Test_Trashbin extends \Test\TestCase { $config = \OC::$server->getConfig(); //configure trashbin - self::$rememberRetentionObligation = $config->getSystemValue('trashbin_retention_obligation', Files_Trashbin\Expiration::DEFAULT_RETENTION_OBLIGATION); + self::$rememberRetentionObligation = $config->getSystemValue('trashbin_retention_obligation', \OCA\Files_Trashbin\Expiration::DEFAULT_RETENTION_OBLIGATION); $config->setSystemValue('trashbin_retention_obligation', 'auto, 2'); // register hooks - Files_Trashbin\Trashbin::registerHooks(); + \OCA\Files_Trashbin\Trashbin::registerHooks(); // create test user self::loginHelper(self::TEST_TRASHBIN_USER2, true); @@ -675,7 +675,7 @@ class Test_Trashbin extends \Test\TestCase { // just a dummy class to make protected methods available for testing -class TrashbinForTesting extends Files_Trashbin\Trashbin { +class TrashbinForTesting extends \OCA\Files_Trashbin\Trashbin { /** * @param OCP\Files\FileInfo[] $files @@ -683,7 +683,7 @@ class TrashbinForTesting extends Files_Trashbin\Trashbin { */ public function dummyDeleteExpiredFiles($files, $limit) { // dummy value for $retention_obligation because it is not needed here - return parent::deleteExpiredFiles($files, \Test_Trashbin::TEST_TRASHBIN_USER1, $limit, 0); + return parent::deleteExpiredFiles($files, TrashbinTest::TEST_TRASHBIN_USER1, $limit, 0); } /** @@ -691,6 +691,6 @@ class TrashbinForTesting extends Files_Trashbin\Trashbin { * @param integer $availableSpace */ public function dummyDeleteFiles($files, $availableSpace) { - return parent::deleteFiles($files, \Test_Trashbin::TEST_TRASHBIN_USER1, $availableSpace); + return parent::deleteFiles($files, TrashbinTest::TEST_TRASHBIN_USER1, $availableSpace); } }