nextcloud / server

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

Spacing +7 added lines, -7 removed lines

@@ -78,13 +78,13 @@ 
 		/** @var mixed[] $response */
 		$response = parent::fetch($ETag, $content);
 
-		foreach($response['data'] as $dataKey => $app) {
+		foreach ($response['data'] as $dataKey => $app) {
 			$releases = [];
 
 			// Filter all compatible releases
-			foreach($app['releases'] as $release) {
+			foreach ($app['releases'] as $release) {
 				// Exclude all nightly and pre-releases
-				if($release['isNightly'] === false
+				if ($release['isNightly'] === false
 					&& strpos($release['version'], '-') === false) {
 					// Exclude all versions not compatible with the current version
 					$versionParser = new VersionParser();
@@ -100,23 +100,23 @@ 
 
 			// Get the highest version
 			$versions = [];
-			foreach($releases as $release) {
+			foreach ($releases as $release) {
 				$versions[] = $release['version'];
 			}
 			usort($versions, 'version_compare');
 			$versions = array_reverse($versions);
 			$compatible = false;
-			if(isset($versions[0])) {
+			if (isset($versions[0])) {
 				$highestVersion = $versions[0];
 				foreach ($releases as $release) {
-					if ((string)$release['version'] === (string)$highestVersion) {
+					if ((string) $release['version'] === (string) $highestVersion) {
 						$compatible = true;
 						$response['data'][$dataKey]['releases'] = [$release];
 						break;
 					}
 				}
 			}
-			if(!$compatible) {
+			if (!$compatible) {
 				unset($response['data'][$dataKey]);
 			}
 		}

Indentation +102 added lines, -102 removed lines

@@ -36,115 +36,115 @@
 
 class AppFetcher extends Fetcher {
 
-	/** @var CompareVersion */
-	private $compareVersion;
+    /** @var CompareVersion */
+    private $compareVersion;
 
-	/**
-	 * @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->setEndpoint();
-		$this->compareVersion = $compareVersion;
-	}
+        $this->fileName = 'apps.json';
+        $this->setEndpoint();
+        $this->compareVersion = $compareVersion;
+    }
 
-	/**
-	 * 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);
 
-		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($release['isNightly'] === false
-					&& strpos($release['version'], '-') === false) {
-					// Exclude all versions not compatible with the current version
-					$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 && $maxFulfilled) {
-						$releases[] = $release;
-					}
-				}
-			}
+            // Filter all compatible releases
+            foreach($app['releases'] as $release) {
+                // Exclude all nightly and pre-releases
+                if($release['isNightly'] === false
+                    && strpos($release['version'], '-') === false) {
+                    // Exclude all versions not compatible with the current version
+                    $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 && $maxFulfilled) {
+                        $releases[] = $release;
+                    }
+                }
+            }
 
-			// Get the highest version
-			$versions = [];
-			foreach($releases as $release) {
-				$versions[] = $release['version'];
-			}
-			usort($versions, 'version_compare');
-			$versions = array_reverse($versions);
-			$compatible = false;
-			if(isset($versions[0])) {
-				$highestVersion = $versions[0];
-				foreach ($releases as $release) {
-					if ((string)$release['version'] === (string)$highestVersion) {
-						$compatible = true;
-						$response['data'][$dataKey]['releases'] = [$release];
-						break;
-					}
-				}
-			}
-			if(!$compatible) {
-				unset($response['data'][$dataKey]);
-			}
-		}
+            // Get the highest version
+            $versions = [];
+            foreach($releases as $release) {
+                $versions[] = $release['version'];
+            }
+            usort($versions, 'version_compare');
+            $versions = array_reverse($versions);
+            $compatible = false;
+            if(isset($versions[0])) {
+                $highestVersion = $versions[0];
+                foreach ($releases as $release) {
+                    if ((string)$release['version'] === (string)$highestVersion) {
+                        $compatible = true;
+                        $response['data'][$dataKey]['releases'] = [$release];
+                        break;
+                    }
+                }
+            }
+            if(!$compatible) {
+                unset($response['data'][$dataKey]);
+            }
+        }
 
-		$response['data'] = array_values($response['data']);
-		return $response;
-	}
+        $response['data'] = array_values($response['data']);
+        return $response;
+    }
 
-	private function setEndpoint() {
-		$versionArray = explode('.', $this->getVersion());
-		$this->endpointUrl = sprintf(
-			'https://apps.nextcloud.com/api/v1/platform/%d.%d.%d/apps.json',
-			$versionArray[0],
-			$versionArray[1],
-			$versionArray[2]
-		);
-	}
+    private function setEndpoint() {
+        $versionArray = explode('.', $this->getVersion());
+        $this->endpointUrl = sprintf(
+            'https://apps.nextcloud.com/api/v1/platform/%d.%d.%d/apps.json',
+            $versionArray[0],
+            $versionArray[1],
+            $versionArray[2]
+        );
+    }
 
-	/**
-	 * @param string $version
-	 * @param string $filename
-	 */
-	public function setVersion(string $version, string $fileName = 'apps.json') {
-		parent::setVersion($version);
-		$this->fileName = $fileName;
-		$this->setEndpoint();
-	}
+    /**
+     * @param string $version
+     * @param string $filename
+     */
+    public function setVersion(string $version, string $fileName = 'apps.json') {
+        parent::setVersion($version);
+        $this->fileName = $fileName;
+        $this->setEndpoint();
+    }
 }

lib/private/App/CompareVersion.php

Indentation +56 added lines, -56 removed lines

@@ -28,70 +28,70 @@
 
 class CompareVersion {
 
-	const REGEX_MAJOR = '/^\d+$/';
-	const REGEX_MAJOR_MINOR = '/^\d+.\d+$/';
-	const REGEX_MAJOR_MINOR_PATCH = '/^\d+.\d+.\d+$/';
-	const REGEX_SERVER = '/^\d+.\d+.\d+(.\d+)?$/';
+    const REGEX_MAJOR = '/^\d+$/';
+    const REGEX_MAJOR_MINOR = '/^\d+.\d+$/';
+    const REGEX_MAJOR_MINOR_PATCH = '/^\d+.\d+.\d+$/';
+    const REGEX_SERVER = '/^\d+.\d+.\d+(.\d+)?$/';
 
-	/**
-	 * Checks if the given server version fulfills the given (app) version requirements.
-	 *
-	 * Version requirements can be 'major.minor.patch', 'major.minor' or just 'major',
-	 * so '13.0.1', '13.0' and '13' are valid.
-	 *
-	 * @param string $actual version as major.minor.patch notation
-	 * @param string $required version where major is requried and minor and patch are optional
-	 * @param string $comparator passed to `version_compare`
-	 * @return bool whether the requirement is fulfilled
-	 * @throws InvalidArgumentException if versions specified in an invalid format
-	 */
-	public function isCompatible(string $actual, string $required,
-		string $comparator = '>='): bool {
+    /**
+     * Checks if the given server version fulfills the given (app) version requirements.
+     *
+     * Version requirements can be 'major.minor.patch', 'major.minor' or just 'major',
+     * so '13.0.1', '13.0' and '13' are valid.
+     *
+     * @param string $actual version as major.minor.patch notation
+     * @param string $required version where major is requried and minor and patch are optional
+     * @param string $comparator passed to `version_compare`
+     * @return bool whether the requirement is fulfilled
+     * @throws InvalidArgumentException if versions specified in an invalid format
+     */
+    public function isCompatible(string $actual, string $required,
+        string $comparator = '>='): bool {
 
-		if (!preg_match(self::REGEX_SERVER, $actual)) {
-			throw new InvalidArgumentException('server version is invalid');
-		}
+        if (!preg_match(self::REGEX_SERVER, $actual)) {
+            throw new InvalidArgumentException('server version is invalid');
+        }
 
-		if (preg_match(self::REGEX_MAJOR, $required) === 1) {
-			return $this->compareMajor($actual, $required, $comparator);
-		} else if (preg_match(self::REGEX_MAJOR_MINOR, $required) === 1) {
-			return $this->compareMajorMinor($actual, $required, $comparator);
-		} else if (preg_match(self::REGEX_MAJOR_MINOR_PATCH, $required) === 1) {
-			return $this->compareMajorMinorPatch($actual, $required, $comparator);
-		} else {
-			throw new InvalidArgumentException('required version is invalid');
-		}
-	}
+        if (preg_match(self::REGEX_MAJOR, $required) === 1) {
+            return $this->compareMajor($actual, $required, $comparator);
+        } else if (preg_match(self::REGEX_MAJOR_MINOR, $required) === 1) {
+            return $this->compareMajorMinor($actual, $required, $comparator);
+        } else if (preg_match(self::REGEX_MAJOR_MINOR_PATCH, $required) === 1) {
+            return $this->compareMajorMinorPatch($actual, $required, $comparator);
+        } else {
+            throw new InvalidArgumentException('required version is invalid');
+        }
+    }
 
-	private function compareMajor(string $actual, string $required,
-		string $comparator) {
-		$actualMajor = explode('.', $actual)[0];
-		$requiredMajor = explode('.', $required)[0];
+    private function compareMajor(string $actual, string $required,
+        string $comparator) {
+        $actualMajor = explode('.', $actual)[0];
+        $requiredMajor = explode('.', $required)[0];
 
-		return version_compare($actualMajor, $requiredMajor, $comparator);
-	}
+        return version_compare($actualMajor, $requiredMajor, $comparator);
+    }
 
-	private function compareMajorMinor(string $actual, string $required,
-		string $comparator) {
-		$actualMajor = explode('.', $actual)[0];
-		$actualMinor = explode('.', $actual)[1];
-		$requiredMajor = explode('.', $required)[0];
-		$requiredMinor = explode('.', $required)[1];
+    private function compareMajorMinor(string $actual, string $required,
+        string $comparator) {
+        $actualMajor = explode('.', $actual)[0];
+        $actualMinor = explode('.', $actual)[1];
+        $requiredMajor = explode('.', $required)[0];
+        $requiredMinor = explode('.', $required)[1];
 
-		return version_compare("$actualMajor.$actualMinor",
-			"$requiredMajor.$requiredMinor", $comparator);
-	}
+        return version_compare("$actualMajor.$actualMinor",
+            "$requiredMajor.$requiredMinor", $comparator);
+    }
 
-	private function compareMajorMinorPatch($actual, $required, $comparator) {
-		$actualMajor = explode('.', $actual)[0];
-		$actualMinor = explode('.', $actual)[1];
-		$actualPatch = explode('.', $actual)[2];
-		$requiredMajor = explode('.', $required)[0];
-		$requiredMinor = explode('.', $required)[1];
-		$requiredPatch = explode('.', $required)[2];
+    private function compareMajorMinorPatch($actual, $required, $comparator) {
+        $actualMajor = explode('.', $actual)[0];
+        $actualMinor = explode('.', $actual)[1];
+        $actualPatch = explode('.', $actual)[2];
+        $requiredMajor = explode('.', $required)[0];
+        $requiredMinor = explode('.', $required)[1];
+        $requiredPatch = explode('.', $required)[2];
 
-		return version_compare("$actualMajor.$actualMinor.$actualPatch",
-			"$requiredMajor.$requiredMinor.$requiredPatch", $comparator);
-	}
+        return version_compare("$actualMajor.$actualMinor.$actualPatch",
+            "$requiredMajor.$requiredMinor.$requiredPatch", $comparator);
+    }
 
 }