nextcloud / server

lib/private/App/AppStore/Fetcher/AppFetcher.php

Indentation +103 added lines, -103 removed lines

@@ -39,118 +39,118 @@
 
 class AppFetcher extends Fetcher {
 
-	/** @var CompareVersion */
-	private $compareVersion;
+    /** @var CompareVersion */
+    private $compareVersion;
 
-	/** @var bool */
-	private $ignoreMaxVersion;
+    /** @var bool */
+    private $ignoreMaxVersion;
 
-	/**
-	 * @param Factory $appDataFactory
-	 * @param IClientService $clientService
-	 * @param ITimeFactory $timeFactory
-	 * @param IConfig $config
-	 * @param CompareVersion $compareVersion
-	 * @param ILogger $logger
-	 */
-	public function __construct(Factory $appDataFactory,
-								IClientService $clientService,
-								ITimeFactory $timeFactory,
-								IConfig $config,
-								CompareVersion $compareVersion,
-								ILogger $logger) {
-		parent::__construct(
-			$appDataFactory,
-			$clientService,
-			$timeFactory,
-			$config,
-			$logger
-		);
+    /**
+     * @param Factory $appDataFactory
+     * @param IClientService $clientService
+     * @param ITimeFactory $timeFactory
+     * @param IConfig $config
+     * @param CompareVersion $compareVersion
+     * @param ILogger $logger
+     */
+    public function __construct(Factory $appDataFactory,
+                                IClientService $clientService,
+                                ITimeFactory $timeFactory,
+                                IConfig $config,
+                                CompareVersion $compareVersion,
+                                ILogger $logger) {
+        parent::__construct(
+            $appDataFactory,
+            $clientService,
+            $timeFactory,
+            $config,
+            $logger
+        );
 
-		$this->fileName = 'apps.json';
-		$this->endpointName = 'apps.json';
-		$this->compareVersion = $compareVersion;
-		$this->ignoreMaxVersion = true;
-	}
+        $this->fileName = 'apps.json';
+        $this->endpointName = 'apps.json';
+        $this->compareVersion = $compareVersion;
+        $this->ignoreMaxVersion = true;
+    }
 
-	/**
-	 * Only returns the latest compatible app release in the releases array
-	 *
-	 * @param string $ETag
-	 * @param string $content
-	 *
-	 * @return array
-	 */
-	protected function fetch($ETag, $content) {
-		/** @var mixed[] $response */
-		$response = parent::fetch($ETag, $content);
+    /**
+     * Only returns the latest compatible app release in the releases array
+     *
+     * @param string $ETag
+     * @param string $content
+     *
+     * @return array
+     */
+    protected function fetch($ETag, $content) {
+        /** @var mixed[] $response */
+        $response = parent::fetch($ETag, $content);
 
-		$allowPreReleases = $this->getChannel() === 'beta' || $this->getChannel() === 'daily';
-		$allowNightly = $this->getChannel() === 'daily';
+        $allowPreReleases = $this->getChannel() === 'beta' || $this->getChannel() === 'daily';
+        $allowNightly = $this->getChannel() === 'daily';
 
-		foreach($response['data'] as $dataKey => $app) {
-			$releases = [];
+        foreach($response['data'] as $dataKey => $app) {
+            $releases = [];
 
-			// Filter all compatible releases
-			foreach($app['releases'] as $release) {
-				// Exclude all nightly and pre-releases if required
-				if (($allowNightly || $release['isNightly'] === false)
-					&& ($allowPreReleases || strpos($release['version'], '-') === false)) {
-					// Exclude all versions not compatible with the current version
-					try {
-						$versionParser = new VersionParser();
-						$version = $versionParser->getVersion($release['rawPlatformVersionSpec']);
-						$ncVersion = $this->getVersion();
-						$min = $version->getMinimumVersion();
-						$max = $version->getMaximumVersion();
-						$minFulfilled = $this->compareVersion->isCompatible($ncVersion, $min, '>=');
-						$maxFulfilled = $max !== '' &&
-							$this->compareVersion->isCompatible($ncVersion, $max, '<=');
-						if ($minFulfilled && ($this->ignoreMaxVersion || $maxFulfilled)) {
-							$releases[] = $release;
-						}
-					} catch (\InvalidArgumentException $e) {
-						$this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::WARN]);
-					}
-				}
-			}
+            // Filter all compatible releases
+            foreach($app['releases'] as $release) {
+                // Exclude all nightly and pre-releases if required
+                if (($allowNightly || $release['isNightly'] === false)
+                    && ($allowPreReleases || strpos($release['version'], '-') === false)) {
+                    // Exclude all versions not compatible with the current version
+                    try {
+                        $versionParser = new VersionParser();
+                        $version = $versionParser->getVersion($release['rawPlatformVersionSpec']);
+                        $ncVersion = $this->getVersion();
+                        $min = $version->getMinimumVersion();
+                        $max = $version->getMaximumVersion();
+                        $minFulfilled = $this->compareVersion->isCompatible($ncVersion, $min, '>=');
+                        $maxFulfilled = $max !== '' &&
+                            $this->compareVersion->isCompatible($ncVersion, $max, '<=');
+                        if ($minFulfilled && ($this->ignoreMaxVersion || $maxFulfilled)) {
+                            $releases[] = $release;
+                        }
+                    } catch (\InvalidArgumentException $e) {
+                        $this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::WARN]);
+                    }
+                }
+            }
 
-			if (empty($releases)) {
-				// Remove apps that don't have a matching release
-				$response['data'][$dataKey] = [];
-				continue;
-			}
+            if (empty($releases)) {
+                // Remove apps that don't have a matching release
+                $response['data'][$dataKey] = [];
+                continue;
+            }
 
-			// Get the highest version
-			$versions = [];
-			foreach($releases as $release) {
-				$versions[] = $release['version'];
-			}
-			usort($versions, 'version_compare');
-			$versions = array_reverse($versions);
-			if(isset($versions[0])) {
-				$highestVersion = $versions[0];
-				foreach ($releases as $release) {
-					if ((string)$release['version'] === (string)$highestVersion) {
-						$response['data'][$dataKey]['releases'] = [$release];
-						break;
-					}
-				}
-			}
-		}
+            // Get the highest version
+            $versions = [];
+            foreach($releases as $release) {
+                $versions[] = $release['version'];
+            }
+            usort($versions, 'version_compare');
+            $versions = array_reverse($versions);
+            if(isset($versions[0])) {
+                $highestVersion = $versions[0];
+                foreach ($releases as $release) {
+                    if ((string)$release['version'] === (string)$highestVersion) {
+                        $response['data'][$dataKey]['releases'] = [$release];
+                        break;
+                    }
+                }
+            }
+        }
 
-		$response['data'] = array_values(array_filter($response['data']));
-		return $response;
-	}
+        $response['data'] = array_values(array_filter($response['data']));
+        return $response;
+    }
 
-	/**
-	 * @param string $version
-	 * @param string $fileName
-	 * @param bool $ignoreMaxVersion
-	 */
-	public function setVersion(string $version, string $fileName = 'apps.json', bool $ignoreMaxVersion = true) {
-		parent::setVersion($version);
-		$this->fileName = $fileName;
-		$this->ignoreMaxVersion = $ignoreMaxVersion;
-	}
+    /**
+     * @param string $version
+     * @param string $fileName
+     * @param bool $ignoreMaxVersion
+     */
+    public function setVersion(string $version, string $fileName = 'apps.json', bool $ignoreMaxVersion = true) {
+        parent::setVersion($version);
+        $this->fileName = $fileName;
+        $this->ignoreMaxVersion = $ignoreMaxVersion;
+    }
 }

lib/private/App/AppStore/Fetcher/Fetcher.php

Indentation +183 added lines, -183 removed lines

@@ -40,187 +40,187 @@
 use OCP\Util;
 
 abstract class Fetcher {
-	const INVALIDATE_AFTER_SECONDS = 300;
-
-	/** @var IAppData */
-	protected $appData;
-	/** @var IClientService */
-	protected $clientService;
-	/** @var ITimeFactory */
-	protected $timeFactory;
-	/** @var IConfig */
-	protected $config;
-	/** @var Ilogger */
-	protected $logger;
-	/** @var string */
-	protected $fileName;
-	/** @var string */
-	protected $endpointName;
-	/** @var string */
-	protected $version;
-	/** @var string */
-	protected $channel;
-
-	/**
-	 * @param Factory $appDataFactory
-	 * @param IClientService $clientService
-	 * @param ITimeFactory $timeFactory
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 */
-	public function __construct(Factory $appDataFactory,
-								IClientService $clientService,
-								ITimeFactory $timeFactory,
-								IConfig $config,
-								ILogger $logger) {
-		$this->appData = $appDataFactory->get('appstore');
-		$this->clientService = $clientService;
-		$this->timeFactory = $timeFactory;
-		$this->config = $config;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * Fetches the response from the server
-	 *
-	 * @param string $ETag
-	 * @param string $content
-	 *
-	 * @return array
-	 */
-	protected function fetch($ETag, $content) {
-		$appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
-
-		if (!$appstoreenabled) {
-			return [];
-		}
-
-		$options = [
-			'timeout' => 10,
-		];
-
-		if ($ETag !== '') {
-			$options['headers'] = [
-				'If-None-Match' => $ETag,
-			];
-		}
-
-		$client = $this->clientService->newClient();
-		$response = $client->get($this->getEndpoint(), $options);
-
-		$responseJson = [];
-		if ($response->getStatusCode() === Http::STATUS_NOT_MODIFIED) {
-			$responseJson['data'] = json_decode($content, true);
-		} else {
-			$responseJson['data'] = json_decode($response->getBody(), true);
-			$ETag = $response->getHeader('ETag');
-		}
-
-		$responseJson['timestamp'] = $this->timeFactory->getTime();
-		$responseJson['ncversion'] = $this->getVersion();
-		if ($ETag !== '') {
-			$responseJson['ETag'] = $ETag;
-		}
-
-		return $responseJson;
-	}
-
-	/**
-	 * Returns the array with the categories on the appstore server
-	 *
-	 * @return array
-	 */
-	public function get() {
-		$appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
-		$internetavailable = $this->config->getSystemValue('has_internet_connection', true);
-
-		if (!$appstoreenabled || !$internetavailable) {
-			return [];
-		}
-
-		$rootFolder = $this->appData->getFolder('/');
-
-		$ETag = '';
-		$content = '';
-
-		try {
-			// File does already exists
-			$file = $rootFolder->getFile($this->fileName);
-			$jsonBlob = json_decode($file->getContent(), true);
-			if (is_array($jsonBlob)) {
-
-				// No caching when the version has been updated
-				if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) {
-
-					// If the timestamp is older than 300 seconds request the files new
-					if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
-						return $jsonBlob['data'];
-					}
-
-					if (isset($jsonBlob['ETag'])) {
-						$ETag = $jsonBlob['ETag'];
-						$content = json_encode($jsonBlob['data']);
-					}
-				}
-			}
-		} catch (NotFoundException $e) {
-			// File does not already exists
-			$file = $rootFolder->newFile($this->fileName);
-		}
-
-		// Refresh the file content
-		try {
-			$responseJson = $this->fetch($ETag, $content);
-			$file->putContent(json_encode($responseJson));
-			return json_decode($file->getContent(), true)['data'];
-		} catch (ConnectException $e) {
-			$this->logger->warning('Could not connect to appstore: ' . $e->getMessage(), ['app' => 'appstoreFetcher']);
-			return [];
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::WARN]);
-			return [];
-		}
-	}
-
-	/**
-	 * Get the currently Nextcloud version
-	 * @return string
-	 */
-	protected function getVersion() {
-		if ($this->version === null) {
-			$this->version = $this->config->getSystemValue('version', '0.0.0');
-		}
-		return $this->version;
-	}
-
-	/**
-	 * Set the current Nextcloud version
-	 * @param string $version
-	 */
-	public function setVersion(string $version) {
-		$this->version = $version;
-	}
-
-	/**
-	 * Get the currently Nextcloud update channel
-	 * @return string
-	 */
-	protected function getChannel() {
-		if ($this->channel === null) {
-			$this->channel = \OC_Util::getChannel();
-		}
-		return $this->channel;
-	}
-
-	/**
-	 * Set the current Nextcloud update channel
-	 * @param string $channel
-	 */
-	public function setChannel(string $channel) {
-		$this->channel = $channel;
-	}
-
-	protected function getEndpoint(): string {
-		return $this->config->getSystemValue('appstoreurl', 'https://apps.nextcloud.com/api/v1') . '/' . $this->endpointName;
-	}
+    const INVALIDATE_AFTER_SECONDS = 300;
+
+    /** @var IAppData */
+    protected $appData;
+    /** @var IClientService */
+    protected $clientService;
+    /** @var ITimeFactory */
+    protected $timeFactory;
+    /** @var IConfig */
+    protected $config;
+    /** @var Ilogger */
+    protected $logger;
+    /** @var string */
+    protected $fileName;
+    /** @var string */
+    protected $endpointName;
+    /** @var string */
+    protected $version;
+    /** @var string */
+    protected $channel;
+
+    /**
+     * @param Factory $appDataFactory
+     * @param IClientService $clientService
+     * @param ITimeFactory $timeFactory
+     * @param IConfig $config
+     * @param ILogger $logger
+     */
+    public function __construct(Factory $appDataFactory,
+                                IClientService $clientService,
+                                ITimeFactory $timeFactory,
+                                IConfig $config,
+                                ILogger $logger) {
+        $this->appData = $appDataFactory->get('appstore');
+        $this->clientService = $clientService;
+        $this->timeFactory = $timeFactory;
+        $this->config = $config;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Fetches the response from the server
+     *
+     * @param string $ETag
+     * @param string $content
+     *
+     * @return array
+     */
+    protected function fetch($ETag, $content) {
+        $appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
+
+        if (!$appstoreenabled) {
+            return [];
+        }
+
+        $options = [
+            'timeout' => 10,
+        ];
+
+        if ($ETag !== '') {
+            $options['headers'] = [
+                'If-None-Match' => $ETag,
+            ];
+        }
+
+        $client = $this->clientService->newClient();
+        $response = $client->get($this->getEndpoint(), $options);
+
+        $responseJson = [];
+        if ($response->getStatusCode() === Http::STATUS_NOT_MODIFIED) {
+            $responseJson['data'] = json_decode($content, true);
+        } else {
+            $responseJson['data'] = json_decode($response->getBody(), true);
+            $ETag = $response->getHeader('ETag');
+        }
+
+        $responseJson['timestamp'] = $this->timeFactory->getTime();
+        $responseJson['ncversion'] = $this->getVersion();
+        if ($ETag !== '') {
+            $responseJson['ETag'] = $ETag;
+        }
+
+        return $responseJson;
+    }
+
+    /**
+     * Returns the array with the categories on the appstore server
+     *
+     * @return array
+     */
+    public function get() {
+        $appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
+        $internetavailable = $this->config->getSystemValue('has_internet_connection', true);
+
+        if (!$appstoreenabled || !$internetavailable) {
+            return [];
+        }
+
+        $rootFolder = $this->appData->getFolder('/');
+
+        $ETag = '';
+        $content = '';
+
+        try {
+            // File does already exists
+            $file = $rootFolder->getFile($this->fileName);
+            $jsonBlob = json_decode($file->getContent(), true);
+            if (is_array($jsonBlob)) {
+
+                // No caching when the version has been updated
+                if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) {
+
+                    // If the timestamp is older than 300 seconds request the files new
+                    if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
+                        return $jsonBlob['data'];
+                    }
+
+                    if (isset($jsonBlob['ETag'])) {
+                        $ETag = $jsonBlob['ETag'];
+                        $content = json_encode($jsonBlob['data']);
+                    }
+                }
+            }
+        } catch (NotFoundException $e) {
+            // File does not already exists
+            $file = $rootFolder->newFile($this->fileName);
+        }
+
+        // Refresh the file content
+        try {
+            $responseJson = $this->fetch($ETag, $content);
+            $file->putContent(json_encode($responseJson));
+            return json_decode($file->getContent(), true)['data'];
+        } catch (ConnectException $e) {
+            $this->logger->warning('Could not connect to appstore: ' . $e->getMessage(), ['app' => 'appstoreFetcher']);
+            return [];
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::WARN]);
+            return [];
+        }
+    }
+
+    /**
+     * Get the currently Nextcloud version
+     * @return string
+     */
+    protected function getVersion() {
+        if ($this->version === null) {
+            $this->version = $this->config->getSystemValue('version', '0.0.0');
+        }
+        return $this->version;
+    }
+
+    /**
+     * Set the current Nextcloud version
+     * @param string $version
+     */
+    public function setVersion(string $version) {
+        $this->version = $version;
+    }
+
+    /**
+     * Get the currently Nextcloud update channel
+     * @return string
+     */
+    protected function getChannel() {
+        if ($this->channel === null) {
+            $this->channel = \OC_Util::getChannel();
+        }
+        return $this->channel;
+    }
+
+    /**
+     * Set the current Nextcloud update channel
+     * @param string $channel
+     */
+    public function setChannel(string $channel) {
+        $this->channel = $channel;
+    }
+
+    protected function getEndpoint(): string {
+        return $this->config->getSystemValue('appstoreurl', 'https://apps.nextcloud.com/api/v1') . '/' . $this->endpointName;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -153,7 +153,7 @@ 
 				if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) {
 
 					// If the timestamp is older than 300 seconds request the files new
-					if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
+					if ((int) $jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
 						return $jsonBlob['data'];
 					}
 
@@ -174,7 +174,7 @@ 
 			$file->putContent(json_encode($responseJson));
 			return json_decode($file->getContent(), true)['data'];
 		} catch (ConnectException $e) {
-			$this->logger->warning('Could not connect to appstore: ' . $e->getMessage(), ['app' => 'appstoreFetcher']);
+			$this->logger->warning('Could not connect to appstore: '.$e->getMessage(), ['app' => 'appstoreFetcher']);
 			return [];
 		} catch (\Exception $e) {
 			$this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::WARN]);
@@ -221,6 +221,6 @@ 
 	}
 
 	protected function getEndpoint(): string {
-		return $this->config->getSystemValue('appstoreurl', 'https://apps.nextcloud.com/api/v1') . '/' . $this->endpointName;
+		return $this->config->getSystemValue('appstoreurl', 'https://apps.nextcloud.com/api/v1').'/'.$this->endpointName;
 	}
 }

lib/private/App/AppStore/Fetcher/CategoryFetcher.php

Indentation +22 added lines, -22 removed lines

@@ -33,26 +33,26 @@
 use OCP\ILogger;
 
 class CategoryFetcher extends Fetcher {
-	/**
-	 * @param Factory $appDataFactory
-	 * @param IClientService $clientService
-	 * @param ITimeFactory $timeFactory
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 */
-	public function __construct(Factory $appDataFactory,
-								IClientService $clientService,
-								ITimeFactory $timeFactory,
-								IConfig $config,
-								ILogger $logger) {
-		parent::__construct(
-			$appDataFactory,
-			$clientService,
-			$timeFactory,
-			$config,
-			$logger
-		);
-		$this->fileName = 'categories.json';
-		$this->endpointName = 'categories.json';
-	}
+    /**
+     * @param Factory $appDataFactory
+     * @param IClientService $clientService
+     * @param ITimeFactory $timeFactory
+     * @param IConfig $config
+     * @param ILogger $logger
+     */
+    public function __construct(Factory $appDataFactory,
+                                IClientService $clientService,
+                                ITimeFactory $timeFactory,
+                                IConfig $config,
+                                ILogger $logger) {
+        parent::__construct(
+            $appDataFactory,
+            $clientService,
+            $timeFactory,
+            $config,
+            $logger
+        );
+        $this->fileName = 'categories.json';
+        $this->endpointName = 'categories.json';
+    }
 }