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 --- apps/theming/tests/Controller/IconControllerTest.php | 10 +++++----- apps/theming/tests/Controller/ThemingControllerTest.php | 3 ++- apps/theming/tests/IconBuilderTest.php | 1 + apps/theming/tests/ImageManagerTest.php | 7 ++++--- apps/theming/tests/ThemingDefaultsTest.php | 3 ++- apps/theming/tests/UtilTest.php | 3 ++- 6 files changed, 16 insertions(+), 11 deletions(-) (limited to 'apps/theming/tests') diff --git a/apps/theming/tests/Controller/IconControllerTest.php b/apps/theming/tests/Controller/IconControllerTest.php index e749a1dbd44..85259b9abe7 100644 --- a/apps/theming/tests/Controller/IconControllerTest.php +++ b/apps/theming/tests/Controller/IconControllerTest.php @@ -23,25 +23,25 @@ * along with this program. If not, see . * */ + namespace OCA\Theming\Tests\Controller; use OC\Files\SimpleFS\SimpleFile; use OC\IntegrityCheck\Helpers\FileAccessHelper; +use OCA\Theming\Controller\IconController; use OCA\Theming\IconBuilder; use OCA\Theming\ImageManager; use OCA\Theming\ThemingDefaults; +use OCA\Theming\Util; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataDisplayResponse; +use OCP\AppFramework\Http\FileDisplayResponse; +use OCP\AppFramework\Utility\ITimeFactory; use OCP\Files\NotFoundException; use OCP\IConfig; use OCP\IRequest; use Test\TestCase; -use OCA\Theming\Util; -use OCA\Theming\Controller\IconController; -use OCP\AppFramework\Http\FileDisplayResponse; -use OCP\AppFramework\Utility\ITimeFactory; - class IconControllerTest extends TestCase { /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php index 93a1e040b4b..63e5d1e285a 100644 --- a/apps/theming/tests/Controller/ThemingControllerTest.php +++ b/apps/theming/tests/Controller/ThemingControllerTest.php @@ -28,6 +28,7 @@ * along with this program. If not, see . * */ + namespace OCA\Theming\Tests\Controller; use OC\Files\AppData\Factory; @@ -35,6 +36,7 @@ use OC\L10N\L10N; use OC\Template\SCSSCacher; use OCA\Theming\Controller\ThemingController; use OCA\Theming\ImageManager; +use OCA\Theming\ThemingDefaults; use OCA\Theming\Util; use OCP\App\IAppManager; use OCP\AppFramework\Http; @@ -52,7 +54,6 @@ use OCP\IRequest; use OCP\ITempManager; use OCP\IURLGenerator; use Test\TestCase; -use OCA\Theming\ThemingDefaults; class ThemingControllerTest extends TestCase { /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ diff --git a/apps/theming/tests/IconBuilderTest.php b/apps/theming/tests/IconBuilderTest.php index 994e0e4a045..69ec6495605 100644 --- a/apps/theming/tests/IconBuilderTest.php +++ b/apps/theming/tests/IconBuilderTest.php @@ -23,6 +23,7 @@ * along with this program. If not, see . * */ + namespace OCA\Theming\Tests; use OC\Files\AppData\AppData; diff --git a/apps/theming/tests/ImageManagerTest.php b/apps/theming/tests/ImageManagerTest.php index fc9eac7f143..0f03c565e91 100644 --- a/apps/theming/tests/ImageManagerTest.php +++ b/apps/theming/tests/ImageManagerTest.php @@ -21,19 +21,20 @@ * along with this program. If not, see . * */ + namespace OCA\Theming\Tests; use OCA\Theming\ImageManager; use OCA\Theming\ThemingDefaults; +use OCP\Files\IAppData; +use OCP\Files\NotFoundException; use OCP\Files\SimpleFS\ISimpleFile; +use OCP\Files\SimpleFS\ISimpleFolder; use OCP\ICacheFactory; use OCP\IConfig; use OCP\ILogger; use OCP\IURLGenerator; use Test\TestCase; -use OCP\Files\SimpleFS\ISimpleFolder; -use OCP\Files\IAppData; -use OCP\Files\NotFoundException; class ImageManagerTest extends TestCase { diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php index ea8ab6975ef..3c69490bef5 100644 --- a/apps/theming/tests/ThemingDefaultsTest.php +++ b/apps/theming/tests/ThemingDefaultsTest.php @@ -27,13 +27,14 @@ * along with this program. If not, see . * */ + namespace OCA\Theming\Tests; use OCA\Theming\ImageManager; use OCA\Theming\ThemingDefaults; +use OCA\Theming\Util; use OCP\App\IAppManager; use OCP\Files\IAppData; -use OCA\Theming\Util; use OCP\Files\NotFoundException; use OCP\Files\SimpleFS\ISimpleFile; use OCP\Files\SimpleFS\ISimpleFolder; diff --git a/apps/theming/tests/UtilTest.php b/apps/theming/tests/UtilTest.php index a36c7330681..9fa5dd91da8 100644 --- a/apps/theming/tests/UtilTest.php +++ b/apps/theming/tests/UtilTest.php @@ -22,16 +22,17 @@ * along with this program. If not, see . * */ + namespace OCA\Theming\Tests; use OCA\Theming\Util; use OCP\App\IAppManager; use OCP\Files\IAppData; +use OCP\Files\IRootFolder; use OCP\Files\NotFoundException; use OCP\Files\SimpleFS\ISimpleFile; use OCP\Files\SimpleFS\ISimpleFolder; use OCP\IConfig; -use OCP\Files\IRootFolder; use Test\TestCase; class UtilTest extends TestCase { -- cgit v1.2.3