From 68748d4f85dd23238aaafb787b1c341f0f2f0419 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 22 Nov 2019 20:52:10 +0100 Subject: Some php-cs fixes * Order the imports * No leading slash on imports * Empty line before namespace * One line per import * Empty after imports * Emmpty line at bottom of file Signed-off-by: Roeland Jago Douma --- tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php | 1 - tests/Core/Command/Encryption/DecryptAllTest.php | 1 - tests/Core/Command/Encryption/EncryptAllTest.php | 1 - tests/Core/Command/Group/AddTest.php | 1 + tests/Core/Command/Group/AddUserTest.php | 1 + tests/Core/Command/Group/DeleteTest.php | 1 + tests/Core/Command/Group/ListCommandTest.php | 1 + tests/Core/Command/Group/RemoveUserTest.php | 1 + tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php | 4 ++-- tests/Core/Command/Maintenance/UpdateTheme.php | 4 ++-- tests/Core/Command/User/DisableTest.php | 1 + tests/Core/Command/User/EnableTest.php | 1 + tests/Core/Controller/AvatarControllerTest.php | 2 +- tests/Core/Controller/ChangePasswordControllerTest.php | 3 ++- tests/Core/Controller/ClientFlowLoginV2ControllerTest.php | 1 - tests/Core/Controller/CssControllerTest.php | 1 + tests/Core/Controller/JsControllerTest.php | 1 + tests/Core/Controller/NavigationControllerTest.php | 1 + tests/Core/Controller/OCSControllerTest.php | 1 + tests/Core/Controller/PreviewControllerTest.php | 1 + tests/Core/Controller/UserControllerTest.php | 1 + tests/Core/Middleware/TwoFactorMiddlewareTest.php | 2 +- 22 files changed, 21 insertions(+), 11 deletions(-) (limited to 'tests/Core') diff --git a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php index 4ecea745cfa..811b64029c6 100644 --- a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php +++ b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php @@ -19,7 +19,6 @@ * */ - namespace Tests\Core\Command\Encryption; diff --git a/tests/Core/Command/Encryption/DecryptAllTest.php b/tests/Core/Command/Encryption/DecryptAllTest.php index af97a4b4a79..508d5da95f7 100644 --- a/tests/Core/Command/Encryption/DecryptAllTest.php +++ b/tests/Core/Command/Encryption/DecryptAllTest.php @@ -19,7 +19,6 @@ * */ - namespace Tests\Core\Command\Encryption; diff --git a/tests/Core/Command/Encryption/EncryptAllTest.php b/tests/Core/Command/Encryption/EncryptAllTest.php index c6af7e38722..7fa4b5e5bbe 100644 --- a/tests/Core/Command/Encryption/EncryptAllTest.php +++ b/tests/Core/Command/Encryption/EncryptAllTest.php @@ -19,7 +19,6 @@ * */ - namespace Tests\Core\Command\Encryption; diff --git a/tests/Core/Command/Group/AddTest.php b/tests/Core/Command/Group/AddTest.php index 8aa2f040de1..c7010e53e58 100644 --- a/tests/Core/Command/Group/AddTest.php +++ b/tests/Core/Command/Group/AddTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Core\Command\Group; use OC\Core\Command\Group\Add; diff --git a/tests/Core/Command/Group/AddUserTest.php b/tests/Core/Command/Group/AddUserTest.php index af860e244d6..7660aad1192 100644 --- a/tests/Core/Command/Group/AddUserTest.php +++ b/tests/Core/Command/Group/AddUserTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Core\Command\Group; use OC\Core\Command\Group\AddUser; diff --git a/tests/Core/Command/Group/DeleteTest.php b/tests/Core/Command/Group/DeleteTest.php index 708e10b0581..f9b1cbbe3a8 100644 --- a/tests/Core/Command/Group/DeleteTest.php +++ b/tests/Core/Command/Group/DeleteTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Core\Command\Group; use OC\Core\Command\Group\Delete; diff --git a/tests/Core/Command/Group/ListCommandTest.php b/tests/Core/Command/Group/ListCommandTest.php index ac872e74ac8..ab089c93422 100644 --- a/tests/Core/Command/Group/ListCommandTest.php +++ b/tests/Core/Command/Group/ListCommandTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Core\Command\Group; use OC\Core\Command\Group\ListCommand; diff --git a/tests/Core/Command/Group/RemoveUserTest.php b/tests/Core/Command/Group/RemoveUserTest.php index ec7b0f2d714..8a75571e3cb 100644 --- a/tests/Core/Command/Group/RemoveUserTest.php +++ b/tests/Core/Command/Group/RemoveUserTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Core\Command\Group; use OC\Core\Command\Group\RemoveUser; diff --git a/tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php b/tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php index 8c023274da5..77757008633 100644 --- a/tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php +++ b/tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php @@ -24,11 +24,11 @@ namespace Tests\Core\Command\Maintenance\Mimetype; use OC\Core\Command\Maintenance\Mimetype\UpdateDB; use OC\Files\Type\Detection; use OC\Files\Type\Loader; +use OCP\Files\IMimeTypeDetector; +use OCP\Files\IMimeTypeLoader; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; -use OCP\Files\IMimeTypeDetector; -use OCP\Files\IMimeTypeLoader; class UpdateDBTest extends TestCase { /** @var IMimeTypeDetector */ diff --git a/tests/Core/Command/Maintenance/UpdateTheme.php b/tests/Core/Command/Maintenance/UpdateTheme.php index cbc417dbdba..73141cefcbd 100644 --- a/tests/Core/Command/Maintenance/UpdateTheme.php +++ b/tests/Core/Command/Maintenance/UpdateTheme.php @@ -27,13 +27,13 @@ use OC\Core\Command\Maintenance\Mimetype\UpdateDB; use OC\Core\Command\Maintenance\UpdateTheme; use OC\Files\Type\Detection; use OC\Files\Type\Loader; +use OCP\Files\IMimeTypeDetector; +use OCP\Files\IMimeTypeLoader; use OCP\ICache; use OCP\ICacheFactory; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; -use OCP\Files\IMimeTypeDetector; -use OCP\Files\IMimeTypeLoader; class UpdateThemeTest extends TestCase { /** @var IMimeTypeDetector */ diff --git a/tests/Core/Command/User/DisableTest.php b/tests/Core/Command/User/DisableTest.php index 758020acc71..019fedc1da9 100644 --- a/tests/Core/Command/User/DisableTest.php +++ b/tests/Core/Command/User/DisableTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Tests\Core\Command\User; diff --git a/tests/Core/Command/User/EnableTest.php b/tests/Core/Command/User/EnableTest.php index 60b415ae79d..9a3df13efe0 100644 --- a/tests/Core/Command/User/EnableTest.php +++ b/tests/Core/Command/User/EnableTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Tests\Core\Command\User; diff --git a/tests/Core/Controller/AvatarControllerTest.php b/tests/Core/Controller/AvatarControllerTest.php index 5fce8fc6359..6f82607dc02 100644 --- a/tests/Core/Controller/AvatarControllerTest.php +++ b/tests/Core/Controller/AvatarControllerTest.php @@ -34,13 +34,13 @@ namespace Tests\Core\Controller; use OC\AppFramework\Utility\TimeFactory; use OC\Core\Controller\AvatarController; use OCP\AppFramework\Http; -use OCP\ICache; use OCP\Files\File; use OCP\Files\IRootFolder; use OCP\Files\NotFoundException; use OCP\Files\NotPermittedException; use OCP\IAvatar; use OCP\IAvatarManager; +use OCP\ICache; use OCP\IL10N; use OCP\ILogger; use OCP\IRequest; diff --git a/tests/Core/Controller/ChangePasswordControllerTest.php b/tests/Core/Controller/ChangePasswordControllerTest.php index e171b46d86d..55f05c975ed 100644 --- a/tests/Core/Controller/ChangePasswordControllerTest.php +++ b/tests/Core/Controller/ChangePasswordControllerTest.php @@ -19,11 +19,12 @@ * along with this program. If not, see . * */ + namespace Tests\Core\Controller; use OC\HintException; -use OCA\Settings\Controller\ChangePasswordController; use OC\User\Session; +use OCA\Settings\Controller\ChangePasswordController; use OCP\App\IAppManager; use OCP\AppFramework\Http\JSONResponse; use OCP\IGroupManager; diff --git a/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php b/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php index 911a4923675..c3ed740432c 100644 --- a/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php +++ b/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php @@ -318,4 +318,3 @@ class ClientFlowLoginV2ControllerTest extends TestCase { $this->assertTrue($clearedState); } } - diff --git a/tests/Core/Controller/CssControllerTest.php b/tests/Core/Controller/CssControllerTest.php index f4e6e83201e..faab89db40c 100644 --- a/tests/Core/Controller/CssControllerTest.php +++ b/tests/Core/Controller/CssControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Tests\Core\Controller; use OC\Core\Controller\CssController; diff --git a/tests/Core/Controller/JsControllerTest.php b/tests/Core/Controller/JsControllerTest.php index 307ef837786..e05f5bf5ded 100644 --- a/tests/Core/Controller/JsControllerTest.php +++ b/tests/Core/Controller/JsControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Tests\Core\Controller; use OC\Core\Controller\JsController; diff --git a/tests/Core/Controller/NavigationControllerTest.php b/tests/Core/Controller/NavigationControllerTest.php index 4095526fc0b..71730a8f8b9 100644 --- a/tests/Core/Controller/NavigationControllerTest.php +++ b/tests/Core/Controller/NavigationControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Tests\Core\Controller; use OC\Core\Controller\NavigationController; diff --git a/tests/Core/Controller/OCSControllerTest.php b/tests/Core/Controller/OCSControllerTest.php index a22c3bdc5e0..241c3b12477 100644 --- a/tests/Core/Controller/OCSControllerTest.php +++ b/tests/Core/Controller/OCSControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace OC\Core\Controller; use OC\CapabilitiesManager; diff --git a/tests/Core/Controller/PreviewControllerTest.php b/tests/Core/Controller/PreviewControllerTest.php index df1af6a0802..7b66d32f61e 100644 --- a/tests/Core/Controller/PreviewControllerTest.php +++ b/tests/Core/Controller/PreviewControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Tests\Core\Controller; use OC\Core\Controller\PreviewController; diff --git a/tests/Core/Controller/UserControllerTest.php b/tests/Core/Controller/UserControllerTest.php index d15bbf7f871..7a089d5e57e 100644 --- a/tests/Core/Controller/UserControllerTest.php +++ b/tests/Core/Controller/UserControllerTest.php @@ -20,6 +20,7 @@ * along with this program. If not, see . * */ + namespace Test\Core\Controller; use OC\Core\Controller\UserController; diff --git a/tests/Core/Middleware/TwoFactorMiddlewareTest.php b/tests/Core/Middleware/TwoFactorMiddlewareTest.php index 06aea147a23..994599212f9 100644 --- a/tests/Core/Middleware/TwoFactorMiddlewareTest.php +++ b/tests/Core/Middleware/TwoFactorMiddlewareTest.php @@ -22,13 +22,13 @@ namespace Test\Core\Middleware; +use OC\AppFramework\Http\Request; use OC\Authentication\Exceptions\TwoFactorAuthRequiredException; use OC\Authentication\Exceptions\UserAlreadyLoggedInException; use OC\Authentication\TwoFactorAuth\Manager; use OC\Authentication\TwoFactorAuth\ProviderSet; use OC\Core\Controller\TwoFactorChallengeController; use OC\Core\Middleware\TwoFactorMiddleware; -use OC\AppFramework\Http\Request; use OC\User\Session; use OCP\AppFramework\Controller; use OCP\AppFramework\Utility\IControllerMethodReflector; -- cgit v1.2.3