diff options
author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2020-07-13 13:33:20 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-13 13:33:20 +0300 |
commit | de9a9818a460ee1a153a9d60f1b0ee93bff296b5 (patch) | |
tree | 6a022614bdd43d77ae5f7fcecae5fb55855418fb /lib | |
parent | d2b703347b02ec0e109287f2dc8ac0abbb11ee7f (diff) | |
parent | b8f714a62a2d16205f24edc4760cb20a572f1f14 (diff) |
Merge pull request #388 from nextcloud/enh/use-webpack-global-config
Diffstat (limited to 'lib')
-rw-r--r-- | lib/AppInfo/Application.php | 6 | ||||
-rw-r--r-- | lib/Controller/AlbumsController.php | 3 | ||||
-rw-r--r-- | lib/Controller/PageController.php | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 8125d4d5..d6906d20 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2019 John Molakvoæ <skjnldsv@protonmail.com> @@ -27,10 +28,9 @@ namespace OCA\Photos\AppInfo; use OCP\AppFramework\App; class Application extends App { + public const APP_ID = 'photos'; - const APP_ID = 'photos'; - - const MIMES = [ + public const MIMES = [ // 'image/png', // too rarely used for photos 'image/jpeg', // 'image/gif', // too rarely used for photos diff --git a/lib/Controller/AlbumsController.php b/lib/Controller/AlbumsController.php index fc3044b5..648ea0b2 100644 --- a/lib/Controller/AlbumsController.php +++ b/lib/Controller/AlbumsController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2019, Roeland Jago Douma <roeland@famdouma.nl> @@ -109,7 +110,7 @@ class AlbumsController extends Controller { return $result; } - private function scanCurrentFolder(Folder $folder, bool $shared): iterable { + private function scanCurrentFolder(Folder $folder, bool $shared): iterable { $nodes = $folder->getDirectoryListing(); // add current folder to iterable set diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index b4b0e99a..effb3e07 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2019 John Molakvoæ <skjnldsv@protonmail.com> @@ -37,7 +38,6 @@ use OCP\IConfig; use OCP\App\IAppManager; class PageController extends Controller { - protected $appName; /** @var IEventDispatcher */ @@ -62,7 +62,6 @@ class PageController extends Controller { $this->eventDispatcher = $eventDispatcher; $this->initialStateService = $initialStateService; $this->config = $config; - } /** @@ -79,7 +78,7 @@ class PageController extends Controller { $this->initialStateService->provideInitialState($this->appName, 'mimes', Application::MIMES); $this->initialStateService->provideInitialState($this->appName, 'maps', $this->appManager->isEnabledForUser('maps') === true); - Util::addScript($this->appName, 'photos'); + Util::addScript($this->appName, 'photos-main'); Util::addStyle($this->appName, 'icons'); $response = new TemplateResponse($this->appName, 'main'); |