diff options
author | Roeland Jago Douma <roeland@famdouma.nl> | 2019-11-22 22:52:10 +0300 |
---|---|---|
committer | Roeland Jago Douma <roeland@famdouma.nl> | 2019-11-22 22:52:10 +0300 |
commit | 68748d4f85dd23238aaafb787b1c341f0f2f0419 (patch) | |
tree | 7aab3a925dda8dcd6ef4e8c6fe04063abbadd6af /apps/theming | |
parent | 21119633041d5ccae19975a58b0ae50ef5a8e33a (diff) |
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 <roeland@famdouma.nl>
Diffstat (limited to 'apps/theming')
-rw-r--r-- | apps/theming/lib/AppInfo/Application.php | 2 | ||||
-rw-r--r-- | apps/theming/lib/Controller/IconController.php | 5 | ||||
-rw-r--r-- | apps/theming/lib/Controller/ThemingController.php | 6 | ||||
-rw-r--r-- | apps/theming/lib/ImageManager.php | 7 | ||||
-rw-r--r-- | apps/theming/lib/Util.php | 2 | ||||
-rw-r--r-- | apps/theming/tests/Controller/IconControllerTest.php | 10 | ||||
-rw-r--r-- | apps/theming/tests/Controller/ThemingControllerTest.php | 3 | ||||
-rw-r--r-- | apps/theming/tests/IconBuilderTest.php | 1 | ||||
-rw-r--r-- | apps/theming/tests/ImageManagerTest.php | 7 | ||||
-rw-r--r-- | apps/theming/tests/ThemingDefaultsTest.php | 3 | ||||
-rw-r--r-- | apps/theming/tests/UtilTest.php | 3 |
11 files changed, 27 insertions, 22 deletions
diff --git a/apps/theming/lib/AppInfo/Application.php b/apps/theming/lib/AppInfo/Application.php index 519e49077f8..0942ca22311 100644 --- a/apps/theming/lib/AppInfo/Application.php +++ b/apps/theming/lib/AppInfo/Application.php @@ -25,4 +25,4 @@ class Application extends \OCP\AppFramework\App { public function __construct() { parent::__construct('theming', []); } -}
\ No newline at end of file +} diff --git a/apps/theming/lib/Controller/IconController.php b/apps/theming/lib/Controller/IconController.php index bffabf43dd7..68a309a4738 100644 --- a/apps/theming/lib/Controller/IconController.php +++ b/apps/theming/lib/Controller/IconController.php @@ -22,6 +22,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + namespace OCA\Theming\Controller; use OC\IntegrityCheck\Helpers\FileAccessHelper; @@ -30,9 +31,9 @@ use OCA\Theming\ImageManager; use OCA\Theming\ThemingDefaults; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; -use OCP\AppFramework\Http\NotFoundResponse; -use OCP\AppFramework\Http\FileDisplayResponse; use OCP\AppFramework\Http\DataDisplayResponse; +use OCP\AppFramework\Http\FileDisplayResponse; +use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Http\Response; use OCP\Files\NotFoundException; use OCP\IRequest; diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php index 47895335640..25c2273279e 100644 --- a/apps/theming/lib/Controller/ThemingController.php +++ b/apps/theming/lib/Controller/ThemingController.php @@ -35,11 +35,13 @@ namespace OCA\Theming\Controller; use OC\Template\SCSSCacher; use OCA\Theming\ImageManager; use OCA\Theming\ThemingDefaults; +use OCA\Theming\Util; +use OCP\App\IAppManager; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataDownloadResponse; -use OCP\AppFramework\Http\FileDisplayResponse; use OCP\AppFramework\Http\DataResponse; +use OCP\AppFramework\Http\FileDisplayResponse; use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Files\File; @@ -49,10 +51,8 @@ use OCP\Files\NotPermittedException; use OCP\IConfig; use OCP\IL10N; use OCP\IRequest; -use OCA\Theming\Util; use OCP\ITempManager; use OCP\IURLGenerator; -use OCP\App\IAppManager; /** * Class ThemingController diff --git a/apps/theming/lib/ImageManager.php b/apps/theming/lib/ImageManager.php index d377aa4f222..217d896adcb 100644 --- a/apps/theming/lib/ImageManager.php +++ b/apps/theming/lib/ImageManager.php @@ -21,16 +21,15 @@ * */ - namespace OCA\Theming; +use OCP\Files\IAppData; +use OCP\Files\NotFoundException; +use OCP\Files\NotPermittedException; use OCP\Files\SimpleFS\ISimpleFile; use OCP\Files\SimpleFS\ISimpleFolder; use OCP\ICacheFactory; use OCP\IConfig; -use OCP\Files\IAppData; -use OCP\Files\NotFoundException; -use OCP\Files\NotPermittedException; use OCP\ILogger; use OCP\IURLGenerator; diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php index dbcabfb8652..f7faf442a16 100644 --- a/apps/theming/lib/Util.php +++ b/apps/theming/lib/Util.php @@ -25,13 +25,13 @@ namespace OCA\Theming; +use Leafo\ScssPhp\Compiler; use OCP\App\AppPathNotFoundException; use OCP\App\IAppManager; use OCP\Files\IAppData; use OCP\Files\NotFoundException; use OCP\Files\SimpleFS\ISimpleFile; use OCP\IConfig; -use Leafo\ScssPhp\Compiler; class Util { 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 <http://www.gnu.org/licenses/>. * */ + 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 <http://www.gnu.org/licenses/>. * */ + 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 <http://www.gnu.org/licenses/>. * */ + 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 <http://www.gnu.org/licenses/>. * */ + 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 <http://www.gnu.org/licenses/>. * */ + 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 <http://www.gnu.org/licenses/>. * */ + 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 { |