nextcloud / server

lib/public/Files/Cache/IPropagator.php

Indentation +24 added lines, -24 removed lines

@@ -27,30 +27,30 @@
  * @since 9.0.0
  */
 interface IPropagator {
-	/**
-	 * Mark the beginning of a propagation batch
-	 *
-	 * Note that not all cache setups support propagation in which case this will be a noop
-	 *
-	 * Batching for cache setups that do support it has to be explicit since the cache state is not fully consistent
-	 * before the batch is committed.
-	 *
-	 * @since 9.1.0
-	 */
-	public function beginBatch();
+    /**
+     * Mark the beginning of a propagation batch
+     *
+     * Note that not all cache setups support propagation in which case this will be a noop
+     *
+     * Batching for cache setups that do support it has to be explicit since the cache state is not fully consistent
+     * before the batch is committed.
+     *
+     * @since 9.1.0
+     */
+    public function beginBatch();
 
-	/**
-	 * Commit the active propagation batch
-	 *
-	 * @since 9.1.0
-	 */
-	public function commitBatch();
+    /**
+     * Commit the active propagation batch
+     *
+     * @since 9.1.0
+     */
+    public function commitBatch();
 
-	/**
-	 * @param string $internalPath
-	 * @param int $time
-	 * @param int $sizeDifference
-	 * @since 9.0.0
-	 */
-	public function propagateChange($internalPath, $time, $sizeDifference = 0);
+    /**
+     * @param string $internalPath
+     * @param int $time
+     * @param int $sizeDifference
+     * @since 9.0.0
+     */
+    public function propagateChange($internalPath, $time, $sizeDifference = 0);
 }

lib/public/Files/Search/ISearchOperator.php

Indentation +17 added lines, -17 removed lines

@@ -26,22 +26,22 @@
  * @since 12.0.0
  */
 interface ISearchOperator {
-	/**
-	 * Get a query builder hint by name
-	 *
-	 * @param string $name
-	 * @param $default
-	 * @return mixed
-	 * @since 23.0.0
-	 */
-	public function getQueryHint(string $name, $default);
+    /**
+     * Get a query builder hint by name
+     *
+     * @param string $name
+     * @param $default
+     * @return mixed
+     * @since 23.0.0
+     */
+    public function getQueryHint(string $name, $default);
 
-	/**
-	 * Get a query builder hint
-	 *
-	 * @param string $name
-	 * @param $value
-	 * @since 23.0.0
-	 */
-	public function setQueryHint(string $name, $value): void;
+    /**
+     * Get a query builder hint
+     *
+     * @param string $name
+     * @param $value
+     * @since 23.0.0
+     */
+    public function setQueryHint(string $name, $value): void;
 }

lib/public/EventDispatcher/GenericEvent.php

Indentation +143 added lines, -143 removed lines

@@ -43,147 +43,147 @@
  * @deprecated 22.0.0 use \OCP\EventDispatcher\Event
  */
 class GenericEvent extends Event implements ArrayAccess, IteratorAggregate {
-	/** @deprecated 22.0.0 */
-	protected $subject;
-
-	/** @deprecated 22.0.0 */
-	protected $arguments;
-
-	/**
-	 * Encapsulate an event with $subject and $args.
-	 *
-	 * @since 18.0.0
-	 * @deprecated 22.0.0
-	 */
-	public function __construct($subject = null, array $arguments = []) {
-		parent::__construct();
-		$this->subject = $subject;
-		$this->arguments = $arguments;
-	}
-
-	/**
-	 * Getter for subject property.
-	 *
-	 * @since 18.0.0
-	 * @deprecated 22.0.0
-	 */
-	public function getSubject() {
-		return $this->subject;
-	}
-
-	/**
-	 * Get argument by key.
-	 *
-	 * @throws InvalidArgumentException if key is not found
-	 * @since 18.0.0
-	 * @deprecated 22.0.0
-	 */
-	public function getArgument(string $key) {
-		if ($this->hasArgument($key)) {
-			return $this->arguments[$key];
-		}
-
-		throw new InvalidArgumentException(sprintf('Argument "%s" not found.', $key));
-	}
-
-	/**
-	 * Add argument to event.
-	 *
-	 * @since 18.0.0
-	 * @deprecated 22.0.0
-	 */
-	public function setArgument($key, $value): GenericEvent {
-		$this->arguments[$key] = $value;
-		return $this;
-	}
-
-	/**
-	 * Getter for all arguments.
-	 *
-	 * @since 18.0.0
-	 * @deprecated 22.0.0
-	 */
-	public function getArguments(): array {
-		return $this->arguments;
-	}
-
-	/**
-	 * Set args property.
-	 *
-	 * @since 18.0.0
-	 * @deprecated 22.0.0
-	 */
-	public function setArguments(array $args = []): GenericEvent {
-		$this->arguments = $args;
-		return $this;
-	}
-
-	/**
-	 * Has argument.
-	 *
-	 * @since 18.0.0
-	 * @deprecated 22.0.0
-	 */
-	public function hasArgument($key): bool {
-		return array_key_exists($key, $this->arguments);
-	}
-
-	/**
-	 * Retrieve an external iterator
-	 *
-	 * @link https://php.net/manual/en/iteratoraggregate.getiterator.php
-	 * @since 18.0.0
-	 * @deprecated 22.0.0
-	 */
-	public function getIterator(): Traversable {
-		return new ArrayIterator($this->arguments);
-	}
-
-	/**
-	 * Whether a offset exists
-	 *
-	 * @link https://php.net/manual/en/arrayaccess.offsetexists.php
-	 * @since 18.0.0
-	 * @deprecated 22.0.0
-	 */
-	public function offsetExists($offset): bool {
-		return $this->hasArgument($offset);
-	}
-
-	/**
-	 * Offset to retrieve
-	 *
-	 * @link https://php.net/manual/en/arrayaccess.offsetget.php
-	 * @since 18.0.0
-	 * @deprecated 22.0.0
-	 * @return mixed
-	 */
-	#[\ReturnTypeWillChange]
-	public function offsetGet($offset) {
-		return $this->arguments[$offset];
-	}
-
-	/**
-	 * Offset to set
-	 *
-	 * @link https://php.net/manual/en/arrayaccess.offsetset.php
-	 * @since 18.0.0
-	 * @deprecated 22.0.0
-	 */
-	public function offsetSet($offset, $value): void {
-		$this->setArgument($offset, $value);
-	}
-
-	/**
-	 * Offset to unset
-	 *
-	 * @link https://php.net/manual/en/arrayaccess.offsetunset.php
-	 * @since 18.0.0
-	 * @deprecated 22.0.0
-	 */
-	public function offsetUnset($offset): void {
-		if ($this->hasArgument($offset)) {
-			unset($this->arguments[$offset]);
-		}
-	}
+    /** @deprecated 22.0.0 */
+    protected $subject;
+
+    /** @deprecated 22.0.0 */
+    protected $arguments;
+
+    /**
+     * Encapsulate an event with $subject and $args.
+     *
+     * @since 18.0.0
+     * @deprecated 22.0.0
+     */
+    public function __construct($subject = null, array $arguments = []) {
+        parent::__construct();
+        $this->subject = $subject;
+        $this->arguments = $arguments;
+    }
+
+    /**
+     * Getter for subject property.
+     *
+     * @since 18.0.0
+     * @deprecated 22.0.0
+     */
+    public function getSubject() {
+        return $this->subject;
+    }
+
+    /**
+     * Get argument by key.
+     *
+     * @throws InvalidArgumentException if key is not found
+     * @since 18.0.0
+     * @deprecated 22.0.0
+     */
+    public function getArgument(string $key) {
+        if ($this->hasArgument($key)) {
+            return $this->arguments[$key];
+        }
+
+        throw new InvalidArgumentException(sprintf('Argument "%s" not found.', $key));
+    }
+
+    /**
+     * Add argument to event.
+     *
+     * @since 18.0.0
+     * @deprecated 22.0.0
+     */
+    public function setArgument($key, $value): GenericEvent {
+        $this->arguments[$key] = $value;
+        return $this;
+    }
+
+    /**
+     * Getter for all arguments.
+     *
+     * @since 18.0.0
+     * @deprecated 22.0.0
+     */
+    public function getArguments(): array {
+        return $this->arguments;
+    }
+
+    /**
+     * Set args property.
+     *
+     * @since 18.0.0
+     * @deprecated 22.0.0
+     */
+    public function setArguments(array $args = []): GenericEvent {
+        $this->arguments = $args;
+        return $this;
+    }
+
+    /**
+     * Has argument.
+     *
+     * @since 18.0.0
+     * @deprecated 22.0.0
+     */
+    public function hasArgument($key): bool {
+        return array_key_exists($key, $this->arguments);
+    }
+
+    /**
+     * Retrieve an external iterator
+     *
+     * @link https://php.net/manual/en/iteratoraggregate.getiterator.php
+     * @since 18.0.0
+     * @deprecated 22.0.0
+     */
+    public function getIterator(): Traversable {
+        return new ArrayIterator($this->arguments);
+    }
+
+    /**
+     * Whether a offset exists
+     *
+     * @link https://php.net/manual/en/arrayaccess.offsetexists.php
+     * @since 18.0.0
+     * @deprecated 22.0.0
+     */
+    public function offsetExists($offset): bool {
+        return $this->hasArgument($offset);
+    }
+
+    /**
+     * Offset to retrieve
+     *
+     * @link https://php.net/manual/en/arrayaccess.offsetget.php
+     * @since 18.0.0
+     * @deprecated 22.0.0
+     * @return mixed
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetGet($offset) {
+        return $this->arguments[$offset];
+    }
+
+    /**
+     * Offset to set
+     *
+     * @link https://php.net/manual/en/arrayaccess.offsetset.php
+     * @since 18.0.0
+     * @deprecated 22.0.0
+     */
+    public function offsetSet($offset, $value): void {
+        $this->setArgument($offset, $value);
+    }
+
+    /**
+     * Offset to unset
+     *
+     * @link https://php.net/manual/en/arrayaccess.offsetunset.php
+     * @since 18.0.0
+     * @deprecated 22.0.0
+     */
+    public function offsetUnset($offset): void {
+        if ($this->hasArgument($offset)) {
+            unset($this->arguments[$offset]);
+        }
+    }
 }

lib/public/Settings/IDelegatedSettings.php

Indentation +22 added lines, -22 removed lines

@@ -28,27 +28,27 @@
  * @since 23.0.0
  */
 interface IDelegatedSettings extends ISettings {
-	/**
-	 * Get the name of the settings to differentiate settings inside a section or
-	 * null if only the section name should be displayed.
-	 * @since 23.0.0
-	 */
-	public function getName(): ?string;
+    /**
+     * Get the name of the settings to differentiate settings inside a section or
+     * null if only the section name should be displayed.
+     * @since 23.0.0
+     */
+    public function getName(): ?string;
 
-	/**
-	 * Get a list of authorized app config that this setting is allowed to modify.
-	 * The format of the array is the following:
-	 * ```php
-	 * <?php
-	 * [
-	 * 		'app_name' => [
-	 * 			'/simple_key/', # value
-	 * 			'/s[a-z]*ldap/', # regex
-	 * 		],
-	 * 		'another_app_name => [ ... ],
-	 * ]
-	 * ```
-	 * @since 23.0.0
-	 */
-	public function getAuthorizedAppConfig(): array;
+    /**
+     * Get a list of authorized app config that this setting is allowed to modify.
+     * The format of the array is the following:
+     * ```php
+     * <?php
+     * [
+     * 		'app_name' => [
+     * 			'/simple_key/', # value
+     * 			'/s[a-z]*ldap/', # regex
+     * 		],
+     * 		'another_app_name => [ ... ],
+     * ]
+     * ```
+     * @since 23.0.0
+     */
+    public function getAuthorizedAppConfig(): array;
 }

lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php

Indentation +16 added lines, -16 removed lines

@@ -28,23 +28,23 @@
 use OCP\DB\QueryBuilder\IQueryFunction;
 
 class PgSqlFunctionBuilder extends FunctionBuilder {
-	public function concat($x, ...$expr): IQueryFunction {
-		$args = func_get_args();
-		$list = [];
-		foreach ($args as $item) {
-			$list[] = $this->queryBuilder->expr()->castColumn($item, IQueryBuilder::PARAM_STR);
-		}
-		return new QueryFunction(sprintf('(%s)', implode(' || ', $list)));
-	}
+    public function concat($x, ...$expr): IQueryFunction {
+        $args = func_get_args();
+        $list = [];
+        foreach ($args as $item) {
+            $list[] = $this->queryBuilder->expr()->castColumn($item, IQueryBuilder::PARAM_STR);
+        }
+        return new QueryFunction(sprintf('(%s)', implode(' || ', $list)));
+    }
 
-	public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
-		$castedExpression = $this->queryBuilder->expr()->castColumn($expr, IQueryBuilder::PARAM_STR);
+    public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
+        $castedExpression = $this->queryBuilder->expr()->castColumn($expr, IQueryBuilder::PARAM_STR);
 
-		if (is_null($separator)) {
-			return new QueryFunction('string_agg(' . $castedExpression . ')');
-		}
+        if (is_null($separator)) {
+            return new QueryFunction('string_agg(' . $castedExpression . ')');
+        }
 
-		$separator = $this->connection->quote($separator);
-		return new QueryFunction('string_agg(' . $castedExpression . ', ' . $separator . ')');
-	}
+        $separator = $this->connection->quote($separator);
+        return new QueryFunction('string_agg(' . $castedExpression . ', ' . $separator . ')');
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -41,10 +41,10 @@
 		$castedExpression = $this->queryBuilder->expr()->castColumn($expr, IQueryBuilder::PARAM_STR);
 
 		if (is_null($separator)) {
-			return new QueryFunction('string_agg(' . $castedExpression . ')');
+			return new QueryFunction('string_agg('.$castedExpression.')');
 		}
 
 		$separator = $this->connection->quote($separator);
-		return new QueryFunction('string_agg(' . $castedExpression . ', ' . $separator . ')');
+		return new QueryFunction('string_agg('.$castedExpression.', '.$separator.')');
 	}
 }

lib/private/AppScriptDependency.php

Indentation +60 added lines, -60 removed lines

@@ -24,74 +24,74 @@
 namespace OC;
 
 class AppScriptDependency {
-	/** @var string */
-	private $id;
+    /** @var string */
+    private $id;
 
-	/** @var array */
-	private $deps;
+    /** @var array */
+    private $deps;
 
-	/** @var bool */
-	private $visited;
+    /** @var bool */
+    private $visited;
 
-	/**
-	 * @param string $id
-	 * @param array $deps
-	 * @param bool $visited
-	 */
-	public function __construct(string $id, array $deps = [], bool $visited = false) {
-		$this->setId($id);
-		$this->setDeps($deps);
-		$this->setVisited($visited);
-	}
+    /**
+     * @param string $id
+     * @param array $deps
+     * @param bool $visited
+     */
+    public function __construct(string $id, array $deps = [], bool $visited = false) {
+        $this->setId($id);
+        $this->setDeps($deps);
+        $this->setVisited($visited);
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getId(): string {
-		return $this->id;
-	}
+    /**
+     * @return string
+     */
+    public function getId(): string {
+        return $this->id;
+    }
 
-	/**
-	 * @param string $id
-	 */
-	public function setId(string $id): void {
-		$this->id = $id;
-	}
+    /**
+     * @param string $id
+     */
+    public function setId(string $id): void {
+        $this->id = $id;
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getDeps(): array {
-		return $this->deps;
-	}
+    /**
+     * @return array
+     */
+    public function getDeps(): array {
+        return $this->deps;
+    }
 
-	/**
-	 * @param array $deps
-	 */
-	public function setDeps(array $deps): void {
-		$this->deps = $deps;
-	}
+    /**
+     * @param array $deps
+     */
+    public function setDeps(array $deps): void {
+        $this->deps = $deps;
+    }
 
-	/**
-	 * @param string $dep
-	 */
-	public function addDep(string $dep): void {
-		if (!in_array($dep, $this->deps, true)) {
-			$this->deps[] = $dep;
-		}
-	}
+    /**
+     * @param string $dep
+     */
+    public function addDep(string $dep): void {
+        if (!in_array($dep, $this->deps, true)) {
+            $this->deps[] = $dep;
+        }
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function isVisited(): bool {
-		return $this->visited;
-	}
+    /**
+     * @return bool
+     */
+    public function isVisited(): bool {
+        return $this->visited;
+    }
 
-	/**
-	 * @param bool $visited
-	 */
-	public function setVisited(bool $visited): void {
-		$this->visited = $visited;
-	}
+    /**
+     * @param bool $visited
+     */
+    public function setVisited(bool $visited): void {
+        $this->visited = $visited;
+    }
 }

lib/private/Accounts/TAccountsHelper.php

Indentation +12 added lines, -12 removed lines

@@ -29,16 +29,16 @@
 use OCP\Accounts\IAccountManager;
 
 trait TAccountsHelper {
-	/**
-	 * returns whether the property is a collection
-	 */
-	protected function isCollection(string $propertyName): bool {
-		return in_array(
-			$propertyName,
-			[
-				IAccountManager::COLLECTION_EMAIL,
-			],
-			true
-		);
-	}
+    /**
+     * returns whether the property is a collection
+     */
+    protected function isCollection(string $propertyName): bool {
+        return in_array(
+            $propertyName,
+            [
+                IAccountManager::COLLECTION_EMAIL,
+            ],
+            true
+        );
+    }
 }

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

Spacing +3 added lines, -3 removed lines

@@ -151,14 +151,14 @@ 
 			foreach ($releases as $release) {
 				$versions[] = $release['version'];
 			}
-			usort($versions, function ($version1, $version2) {
+			usort($versions, function($version1, $version2) {
 				return version_compare($version1, $version2);
 			});
 			$versions = array_reverse($versions);
 			if (isset($versions[0])) {
 				$highestVersion = $versions[0];
 				foreach ($releases as $release) {
-					if ((string)$release['version'] === (string)$highestVersion) {
+					if ((string) $release['version'] === (string) $highestVersion) {
 						$response['data'][$dataKey]['releases'] = [$release];
 						break;
 					}
@@ -188,7 +188,7 @@ 
 
 		// If the admin specified a allow list, filter apps from the appstore
 		if (is_array($allowList) && $this->registry->delegateHasValidSubscription()) {
-			return array_filter($apps, function ($app) use ($allowList) {
+			return array_filter($apps, function($app) use ($allowList) {
 				return in_array($app['id'], $allowList);
 			});
 		}

Indentation +153 added lines, -153 removed lines

@@ -16,157 +16,157 @@
 use Psr\Log\LoggerInterface;
 
 class AppFetcher extends Fetcher {
-	/** @var bool */
-	private $ignoreMaxVersion;
-
-	public function __construct(
-		Factory $appDataFactory,
-		IClientService $clientService,
-		ITimeFactory $timeFactory,
-		IConfig $config,
-		private CompareVersion $compareVersion,
-		LoggerInterface $logger,
-		protected IRegistry $registry,
-	) {
-		parent::__construct(
-			$appDataFactory,
-			$clientService,
-			$timeFactory,
-			$config,
-			$logger,
-			$registry
-		);
-
-		$this->fileName = 'apps.json';
-		$this->endpointName = 'apps.json';
-		$this->ignoreMaxVersion = true;
-	}
-
-	/**
-	 * Only returns the latest compatible app release in the releases array
-	 *
-	 * @param string $ETag
-	 * @param string $content
-	 * @param bool [$allowUnstable] Allow unstable releases
-	 *
-	 * @return array
-	 */
-	protected function fetch($ETag, $content, $allowUnstable = false) {
-		/** @var mixed[] $response */
-		$response = parent::fetch($ETag, $content);
-
-		if (!isset($response['data']) || $response['data'] === null) {
-			$this->logger->warning('Response from appstore is invalid, apps could not be retrieved. Try again later.', ['app' => 'appstoreFetcher']);
-			return [];
-		}
-
-		$allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
-		$allowNightly = $allowUnstable || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
-
-		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 || !str_contains($release['version'], '-'))) {
-					// Exclude all versions not compatible with the current version
-					try {
-						$versionParser = new VersionParser();
-						$serverVersion = $versionParser->getVersion($release['rawPlatformVersionSpec']);
-						$ncVersion = $this->getVersion();
-						$minServerVersion = $serverVersion->getMinimumVersion();
-						$maxServerVersion = $serverVersion->getMaximumVersion();
-						$minFulfilled = $this->compareVersion->isCompatible($ncVersion, $minServerVersion, '>=');
-						$maxFulfilled = $maxServerVersion !== ''
-							&& $this->compareVersion->isCompatible($ncVersion, $maxServerVersion, '<=');
-						$isPhpCompatible = true;
-						if (($release['rawPhpVersionSpec'] ?? '*') !== '*') {
-							$phpVersion = $versionParser->getVersion($release['rawPhpVersionSpec']);
-							$minPhpVersion = $phpVersion->getMinimumVersion();
-							$maxPhpVersion = $phpVersion->getMaximumVersion();
-							$minPhpFulfilled = $minPhpVersion === '' || $this->compareVersion->isCompatible(
-								PHP_VERSION,
-								$minPhpVersion,
-								'>='
-							);
-							$maxPhpFulfilled = $maxPhpVersion === '' || $this->compareVersion->isCompatible(
-								PHP_VERSION,
-								$maxPhpVersion,
-								'<='
-							);
-
-							$isPhpCompatible = $minPhpFulfilled && $maxPhpFulfilled;
-						}
-						if ($minFulfilled && ($this->ignoreMaxVersion || $maxFulfilled) && $isPhpCompatible) {
-							$releases[] = $release;
-						}
-					} catch (\InvalidArgumentException $e) {
-						$this->logger->warning($e->getMessage(), [
-							'exception' => $e,
-						]);
-					}
-				}
-			}
-
-			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, function ($version1, $version2) {
-				return version_compare($version1, $version2);
-			});
-			$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;
-	}
-
-	/**
-	 * @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;
-	}
-
-	public function get($allowUnstable = false): array {
-		$allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
-
-		$apps = parent::get($allowPreReleases);
-		if (empty($apps)) {
-			return [];
-		}
-		$allowList = $this->config->getSystemValue('appsallowlist');
-
-		// If the admin specified a allow list, filter apps from the appstore
-		if (is_array($allowList) && $this->registry->delegateHasValidSubscription()) {
-			return array_filter($apps, function ($app) use ($allowList) {
-				return in_array($app['id'], $allowList);
-			});
-		}
-
-		return $apps;
-	}
+    /** @var bool */
+    private $ignoreMaxVersion;
+
+    public function __construct(
+        Factory $appDataFactory,
+        IClientService $clientService,
+        ITimeFactory $timeFactory,
+        IConfig $config,
+        private CompareVersion $compareVersion,
+        LoggerInterface $logger,
+        protected IRegistry $registry,
+    ) {
+        parent::__construct(
+            $appDataFactory,
+            $clientService,
+            $timeFactory,
+            $config,
+            $logger,
+            $registry
+        );
+
+        $this->fileName = 'apps.json';
+        $this->endpointName = 'apps.json';
+        $this->ignoreMaxVersion = true;
+    }
+
+    /**
+     * Only returns the latest compatible app release in the releases array
+     *
+     * @param string $ETag
+     * @param string $content
+     * @param bool [$allowUnstable] Allow unstable releases
+     *
+     * @return array
+     */
+    protected function fetch($ETag, $content, $allowUnstable = false) {
+        /** @var mixed[] $response */
+        $response = parent::fetch($ETag, $content);
+
+        if (!isset($response['data']) || $response['data'] === null) {
+            $this->logger->warning('Response from appstore is invalid, apps could not be retrieved. Try again later.', ['app' => 'appstoreFetcher']);
+            return [];
+        }
+
+        $allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
+        $allowNightly = $allowUnstable || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
+
+        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 || !str_contains($release['version'], '-'))) {
+                    // Exclude all versions not compatible with the current version
+                    try {
+                        $versionParser = new VersionParser();
+                        $serverVersion = $versionParser->getVersion($release['rawPlatformVersionSpec']);
+                        $ncVersion = $this->getVersion();
+                        $minServerVersion = $serverVersion->getMinimumVersion();
+                        $maxServerVersion = $serverVersion->getMaximumVersion();
+                        $minFulfilled = $this->compareVersion->isCompatible($ncVersion, $minServerVersion, '>=');
+                        $maxFulfilled = $maxServerVersion !== ''
+                            && $this->compareVersion->isCompatible($ncVersion, $maxServerVersion, '<=');
+                        $isPhpCompatible = true;
+                        if (($release['rawPhpVersionSpec'] ?? '*') !== '*') {
+                            $phpVersion = $versionParser->getVersion($release['rawPhpVersionSpec']);
+                            $minPhpVersion = $phpVersion->getMinimumVersion();
+                            $maxPhpVersion = $phpVersion->getMaximumVersion();
+                            $minPhpFulfilled = $minPhpVersion === '' || $this->compareVersion->isCompatible(
+                                PHP_VERSION,
+                                $minPhpVersion,
+                                '>='
+                            );
+                            $maxPhpFulfilled = $maxPhpVersion === '' || $this->compareVersion->isCompatible(
+                                PHP_VERSION,
+                                $maxPhpVersion,
+                                '<='
+                            );
+
+                            $isPhpCompatible = $minPhpFulfilled && $maxPhpFulfilled;
+                        }
+                        if ($minFulfilled && ($this->ignoreMaxVersion || $maxFulfilled) && $isPhpCompatible) {
+                            $releases[] = $release;
+                        }
+                    } catch (\InvalidArgumentException $e) {
+                        $this->logger->warning($e->getMessage(), [
+                            'exception' => $e,
+                        ]);
+                    }
+                }
+            }
+
+            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, function ($version1, $version2) {
+                return version_compare($version1, $version2);
+            });
+            $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;
+    }
+
+    /**
+     * @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;
+    }
+
+    public function get($allowUnstable = false): array {
+        $allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
+
+        $apps = parent::get($allowPreReleases);
+        if (empty($apps)) {
+            return [];
+        }
+        $allowList = $this->config->getSystemValue('appsallowlist');
+
+        // If the admin specified a allow list, filter apps from the appstore
+        if (is_array($allowList) && $this->registry->delegateHasValidSubscription()) {
+            return array_filter($apps, function ($app) use ($allowList) {
+                return in_array($app['id'], $allowList);
+            });
+        }
+
+        return $apps;
+    }
 }

lib/private/Profile/Actions/PhoneAction.php

Spacing +1 added lines, -1 removed lines

@@ -89,6 +89,6 @@
 		if (empty($this->value)) {
 			return null;
 		}
-		return 'tel:' . $this->value;
+		return 'tel:'.$this->value;
 	}
 }

Indentation +44 added lines, -44 removed lines

@@ -16,48 +16,48 @@
 use OCP\Profile\ILinkAction;
 
 class PhoneAction implements ILinkAction {
-	private string $value = '';
-
-	public function __construct(
-		private IAccountManager $accountManager,
-		private IFactory $l10nFactory,
-		private IURLGenerator $urlGenerator,
-	) {
-	}
-
-	public function preload(IUser $targetUser): void {
-		$account = $this->accountManager->getAccount($targetUser);
-		$this->value = $account->getProperty(IAccountManager::PROPERTY_PHONE)->getValue();
-	}
-
-	public function getAppId(): string {
-		return 'core';
-	}
-
-	public function getId(): string {
-		return IAccountManager::PROPERTY_PHONE;
-	}
-
-	public function getDisplayId(): string {
-		return $this->l10nFactory->get('lib')->t('Phone');
-	}
-
-	public function getTitle(): string {
-		return $this->l10nFactory->get('lib')->t('Call %s', [$this->value]);
-	}
-
-	public function getPriority(): int {
-		return 30;
-	}
-
-	public function getIcon(): string {
-		return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/phone.svg'));
-	}
-
-	public function getTarget(): ?string {
-		if (empty($this->value)) {
-			return null;
-		}
-		return 'tel:' . $this->value;
-	}
+    private string $value = '';
+
+    public function __construct(
+        private IAccountManager $accountManager,
+        private IFactory $l10nFactory,
+        private IURLGenerator $urlGenerator,
+    ) {
+    }
+
+    public function preload(IUser $targetUser): void {
+        $account = $this->accountManager->getAccount($targetUser);
+        $this->value = $account->getProperty(IAccountManager::PROPERTY_PHONE)->getValue();
+    }
+
+    public function getAppId(): string {
+        return 'core';
+    }
+
+    public function getId(): string {
+        return IAccountManager::PROPERTY_PHONE;
+    }
+
+    public function getDisplayId(): string {
+        return $this->l10nFactory->get('lib')->t('Phone');
+    }
+
+    public function getTitle(): string {
+        return $this->l10nFactory->get('lib')->t('Call %s', [$this->value]);
+    }
+
+    public function getPriority(): int {
+        return 30;
+    }
+
+    public function getIcon(): string {
+        return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/phone.svg'));
+    }
+
+    public function getTarget(): ?string {
+        if (empty($this->value)) {
+            return null;
+        }
+        return 'tel:' . $this->value;
+    }
 }