Update php styling for 7.4

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>

3 files changed, 42 insertions, 66 deletions

diff --git a/lib/Controller/AlbumsController.php b/lib/Controller/AlbumsController.php
index bf242f0a..ce8dde16 100644
--- a/lib/Controller/AlbumsController.php
+++ b/lib/Controller/AlbumsController.php
@@ -40,20 +40,16 @@ use OCP\IPreview;
 use OCP\IRequest;
 
 class AlbumsController extends Controller {
-
-	/** @var string */
-	private $userId;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IPreview */
-	private $previewManager;
-
-	public function __construct(string $userId,
-								IRequest $request,
-								IRootFolder $rootFolder,
-								IPreview $previewManager) {
+	private string $userId;
+	private IRootFolder $rootFolder;
+	private IPreview $previewManager;
+
+	public function __construct(
+		string $userId,
+		IRequest $request,
+		IRootFolder $rootFolder,
+		IPreview $previewManager
+	) {
 		parent::__construct(Application::APP_ID, $request);
 
 		$this->userId = $userId;
diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php
index c063e865..aadbe8ad 100644
--- a/lib/Controller/ApiController.php
+++ b/lib/Controller/ApiController.php
@@ -36,16 +36,14 @@ use OCP\IRequest;
 use OCP\IUserSession;
 
 class ApiController extends Controller {
+	private IConfig $config;
+	private IUserSession $userSession;
 
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	public function __construct(IRequest $request,
-								IConfig $config,
-								IUserSession $userSession) {
+	public function __construct(
+		IRequest $request,
+		IConfig $config,
+		IUserSession $userSession
+	) {
 		parent::__construct(Application::APP_ID, $request);
 
 		$this->config = $config;
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index cac27c2c..ddfbc50f 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -27,8 +27,6 @@ namespace OCA\Photos\Controller;
 
 use OC\Files\Search\SearchBinaryOperator;
 use OC\Files\Search\SearchComparison;
-use OCP\Files\Search\ISearchBinaryOperator;
-use OCP\Files\Search\ISearchComparison;
 use OC\Files\Search\SearchQuery;
 use OC\User\NoUserException;
 use OCA\Files\Event\LoadSidebar;
@@ -36,14 +34,17 @@ use OCA\Photos\AppInfo\Application;
 use OCA\Viewer\Event\LoadViewer;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\ContentSecurityPolicy;
+use OCP\AppFramework\Http\TemplateResponse;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\InvalidPathException;
 use OCP\Files\IRootFolder;
 use OCP\Files\Node;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
+use OCP\Files\Search\ISearchBinaryOperator;
+use OCP\Files\Search\ISearchComparison;
+use OCP\ICache;
 use OCP\ICacheFactory;
 use OCP\IConfig;
 use OCP\IInitialStateService;
@@ -53,46 +54,27 @@ use OCP\Util;
 use Psr\Log\LoggerInterface;
 
 class PageController extends Controller {
-	/** @var IAppManager */
-	private $appManager;
-
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IInitialStateService */
-	private $initialStateService;
-
-	/** @var IUserSession */
-	private $userSession;
-	/**
-	 * @var \OCP\Files\IRootFolder
-	 */
-	private $rootFolder;
-	/**
-	 * @var \OCP\ICacheFactory
-	 */
-	private $cacheFactory;
-	/**
-	 * @var \OCP\ICache
-	 */
-	private $nomediaPathsCache;
-	/**
-	 * @var \Psr\Log\LoggerInterface
-	 */
-	private $logger;
-
-	public function __construct(IRequest             $request,
-								IAppManager          $appManager,
-								IEventDispatcher     $eventDispatcher,
-								IConfig              $config,
-								IInitialStateService $initialStateService,
-								IUserSession         $userSession,
-								IRootFolder          $rootFolder,
-								ICacheFactory $cacheFactory,
-								LoggerInterface $logger) {
+	private IAppManager $appManager;
+	private IEventDispatcher $eventDispatcher;
+	private IConfig $config;
+	private IInitialStateService $initialStateService;
+	private IUserSession $userSession;
+	private IRootFolder $rootFolder;
+	private ICacheFactory $cacheFactory;
+	private ICache $nomediaPathsCache;
+	private LoggerInterface $logger;
+
+	public function __construct(
+		IRequest $request,
+		IAppManager $appManager,
+		IEventDispatcher $eventDispatcher,
+		IConfig $config,
+		IInitialStateService $initialStateService,
+		IUserSession $userSession,
+		IRootFolder $rootFolder,
+		ICacheFactory $cacheFactory,
+		LoggerInterface $logger
+	) {
 		parent::__construct(Application::APP_ID, $request);
 
 		$this->appManager = $appManager;