nextcloud / server

apps/updatenotification/lib/Controller/APIController.php

Indentation +127 added lines, -127 removed lines

@@ -39,131 +39,131 @@
 
 class APIController extends OCSController {
 
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IAppManager */
-	protected $appManager;
-
-	/** @var AppFetcher */
-	protected $appFetcher;
-
-	/** @var IFactory */
-	protected $l10nFactory;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/** @var string */
-	protected $language;
-
-	/**
-	 * List of apps that were in the appstore but are now shipped and don't have
-	 * a compatible update available.
-	 *
-	 * @var array<string, int>
-	 */
-	protected array $appsShippedInFutureVersion = [
-		'bruteforcesettings' => 25,
-		'suspicious_login' => 25,
-		'twofactor_totp' => 25,
-	];
-
-	public function __construct(string $appName,
-								IRequest $request,
-								IConfig $config,
-								IAppManager $appManager,
-								AppFetcher $appFetcher,
-								IFactory $l10nFactory,
-								IUserSession $userSession) {
-		parent::__construct($appName, $request);
-
-		$this->config = $config;
-		$this->appManager = $appManager;
-		$this->appFetcher = $appFetcher;
-		$this->l10nFactory = $l10nFactory;
-		$this->userSession = $userSession;
-	}
-
-	/**
-	 * @param string $newVersion
-	 * @return DataResponse
-	 */
-	public function getAppList(string $newVersion): DataResponse {
-		if (!$this->config->getSystemValue('appstoreenabled', true)) {
-			return new DataResponse([
-				'appstore_disabled' => true,
-			], Http::STATUS_NOT_FOUND);
-		}
-
-		// Get list of installed custom apps
-		$installedApps = $this->appManager->getInstalledApps();
-		$installedApps = array_filter($installedApps, function ($app) {
-			try {
-				$this->appManager->getAppPath($app);
-			} catch (AppPathNotFoundException $e) {
-				return false;
-			}
-			return !$this->appManager->isShipped($app) && !isset($this->appsShippedInFutureVersion[$app]);
-		});
-
-		if (empty($installedApps)) {
-			return new DataResponse([
-				'missing' => [],
-				'available' => [],
-			]);
-		}
-
-		$this->appFetcher->setVersion($newVersion, 'future-apps.json', false);
-
-		// Apps available on the app store for that version
-		$availableApps = array_map(static function (array $app) {
-			return $app['id'];
-		}, $this->appFetcher->get());
-
-		if (empty($availableApps)) {
-			return new DataResponse([
-				'appstore_disabled' => false,
-				'already_on_latest' => false,
-			], Http::STATUS_NOT_FOUND);
-		}
-
-		$this->language = $this->l10nFactory->getUserLanguage($this->userSession->getUser());
-
-		// Ignore apps that are deployed from git
-		$installedApps = array_filter($installedApps, function(string $appId) {
-			try {
-				return !file_exists($this->appManager->getAppPath($appId) . '/.git');
-			} catch (AppPathNotFoundException $e) {
-				return true;
-			}
-		});
-
-		$missing = array_diff($installedApps, $availableApps);
-		$missing = array_map([$this, 'getAppDetails'], $missing);
-		sort($missing);
-
-		$available = array_intersect($installedApps, $availableApps);
-		$available = array_map([$this, 'getAppDetails'], $available);
-		sort($available);
-
-		return new DataResponse([
-			'missing' => $missing,
-			'available' => $available,
-		]);
-	}
-
-	/**
-	 * Get translated app name
-	 *
-	 * @param string $appId
-	 * @return string[]
-	 */
-	protected function getAppDetails(string $appId): array {
-		$app = $this->appManager->getAppInfo($appId, false, $this->language);
-		return [
-			'appId' => $appId,
-			'appName' => $app['name'] ?? $appId,
-		];
-	}
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IAppManager */
+    protected $appManager;
+
+    /** @var AppFetcher */
+    protected $appFetcher;
+
+    /** @var IFactory */
+    protected $l10nFactory;
+
+    /** @var IUserSession */
+    protected $userSession;
+
+    /** @var string */
+    protected $language;
+
+    /**
+     * List of apps that were in the appstore but are now shipped and don't have
+     * a compatible update available.
+     *
+     * @var array<string, int>
+     */
+    protected array $appsShippedInFutureVersion = [
+        'bruteforcesettings' => 25,
+        'suspicious_login' => 25,
+        'twofactor_totp' => 25,
+    ];
+
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IConfig $config,
+                                IAppManager $appManager,
+                                AppFetcher $appFetcher,
+                                IFactory $l10nFactory,
+                                IUserSession $userSession) {
+        parent::__construct($appName, $request);
+
+        $this->config = $config;
+        $this->appManager = $appManager;
+        $this->appFetcher = $appFetcher;
+        $this->l10nFactory = $l10nFactory;
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * @param string $newVersion
+     * @return DataResponse
+     */
+    public function getAppList(string $newVersion): DataResponse {
+        if (!$this->config->getSystemValue('appstoreenabled', true)) {
+            return new DataResponse([
+                'appstore_disabled' => true,
+            ], Http::STATUS_NOT_FOUND);
+        }
+
+        // Get list of installed custom apps
+        $installedApps = $this->appManager->getInstalledApps();
+        $installedApps = array_filter($installedApps, function ($app) {
+            try {
+                $this->appManager->getAppPath($app);
+            } catch (AppPathNotFoundException $e) {
+                return false;
+            }
+            return !$this->appManager->isShipped($app) && !isset($this->appsShippedInFutureVersion[$app]);
+        });
+
+        if (empty($installedApps)) {
+            return new DataResponse([
+                'missing' => [],
+                'available' => [],
+            ]);
+        }
+
+        $this->appFetcher->setVersion($newVersion, 'future-apps.json', false);
+
+        // Apps available on the app store for that version
+        $availableApps = array_map(static function (array $app) {
+            return $app['id'];
+        }, $this->appFetcher->get());
+
+        if (empty($availableApps)) {
+            return new DataResponse([
+                'appstore_disabled' => false,
+                'already_on_latest' => false,
+            ], Http::STATUS_NOT_FOUND);
+        }
+
+        $this->language = $this->l10nFactory->getUserLanguage($this->userSession->getUser());
+
+        // Ignore apps that are deployed from git
+        $installedApps = array_filter($installedApps, function(string $appId) {
+            try {
+                return !file_exists($this->appManager->getAppPath($appId) . '/.git');
+            } catch (AppPathNotFoundException $e) {
+                return true;
+            }
+        });
+
+        $missing = array_diff($installedApps, $availableApps);
+        $missing = array_map([$this, 'getAppDetails'], $missing);
+        sort($missing);
+
+        $available = array_intersect($installedApps, $availableApps);
+        $available = array_map([$this, 'getAppDetails'], $available);
+        sort($available);
+
+        return new DataResponse([
+            'missing' => $missing,
+            'available' => $available,
+        ]);
+    }
+
+    /**
+     * Get translated app name
+     *
+     * @param string $appId
+     * @return string[]
+     */
+    protected function getAppDetails(string $appId): array {
+        $app = $this->appManager->getAppInfo($appId, false, $this->language);
+        return [
+            'appId' => $appId,
+            'appName' => $app['name'] ?? $appId,
+        ];
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -98,7 +98,7 @@ 
 
 		// Get list of installed custom apps
 		$installedApps = $this->appManager->getInstalledApps();
-		$installedApps = array_filter($installedApps, function ($app) {
+		$installedApps = array_filter($installedApps, function($app) {
 			try {
 				$this->appManager->getAppPath($app);
 			} catch (AppPathNotFoundException $e) {
@@ -117,7 +117,7 @@ 
 		$this->appFetcher->setVersion($newVersion, 'future-apps.json', false);
 
 		// Apps available on the app store for that version
-		$availableApps = array_map(static function (array $app) {
+		$availableApps = array_map(static function(array $app) {
 			return $app['id'];
 		}, $this->appFetcher->get());
 
@@ -133,7 +133,7 @@ 
 		// Ignore apps that are deployed from git
 		$installedApps = array_filter($installedApps, function(string $appId) {
 			try {
-				return !file_exists($this->appManager->getAppPath($appId) . '/.git');
+				return !file_exists($this->appManager->getAppPath($appId).'/.git');
 			} catch (AppPathNotFoundException $e) {
 				return true;
 			}