nextcloud / server

lib/public/Federation/Events/TrustedServerRemovedEvent.php

Indentation +14 added lines, -14 removed lines

@@ -29,20 +29,20 @@
  * @since 25.0.0
  */
 class TrustedServerRemovedEvent extends Event {
-	private string $urlHash;
+    private string $urlHash;
 
-	/**
-	 * @since 25.0.0
-	 */
-	public function __construct(string $urlHash) {
-		parent::__construct();
-		$this->urlHash = $urlHash;
-	}
+    /**
+     * @since 25.0.0
+     */
+    public function __construct(string $urlHash) {
+        parent::__construct();
+        $this->urlHash = $urlHash;
+    }
 
-	/**
-	 * @since 25.0.0
-	 */
-	public function getUrlHash(): string {
-		return $this->urlHash;
-	}
+    /**
+     * @since 25.0.0
+     */
+    public function getUrlHash(): string {
+        return $this->urlHash;
+    }
 }

lib/private/User/Listeners/UserChangedListener.php

Indentation +22 added lines, -22 removed lines

@@ -33,30 +33,30 @@
  * @template-implements IEventListener<UserChangedEvent>
  */
 class UserChangedListener implements IEventListener {
-	private IAvatarManager $avatarManager;
+    private IAvatarManager $avatarManager;
 
-	public function __construct(IAvatarManager $avatarManager) {
-		$this->avatarManager = $avatarManager;
-	}
+    public function __construct(IAvatarManager $avatarManager) {
+        $this->avatarManager = $avatarManager;
+    }
 
-	public function handle(Event $event): void {
-		if (!($event instanceof UserChangedEvent)) {
-			return;
-		}
+    public function handle(Event $event): void {
+        if (!($event instanceof UserChangedEvent)) {
+            return;
+        }
 		
-		$user = $event->getUser();
-		$feature = $event->getFeature();
-		$oldValue = $event->getOldValue();
-		$value = $event->getValue();
+        $user = $event->getUser();
+        $feature = $event->getFeature();
+        $oldValue = $event->getOldValue();
+        $value = $event->getValue();
 
-		// We only change the avatar on display name changes
-		if ($feature === 'displayName') {
-			try {
-				$avatar = $this->avatarManager->getAvatar($user->getUID());
-				$avatar->userChanged($feature, $oldValue, $value);
-			} catch (NotFoundException $e) {
-				// no avatar to remove
-			}
-		}
-	}
+        // We only change the avatar on display name changes
+        if ($feature === 'displayName') {
+            try {
+                $avatar = $this->avatarManager->getAvatar($user->getUID());
+                $avatar->userChanged($feature, $oldValue, $value);
+            } catch (NotFoundException $e) {
+                // no avatar to remove
+            }
+        }
+    }
 }

lib/private/App/CompareVersion.php

Indentation +57 added lines, -57 removed lines

@@ -29,69 +29,69 @@
 use function explode;
 
 class CompareVersion {
-	private const REGEX_MAJOR = '/^\d+$/';
-	private const REGEX_MAJOR_MINOR = '/^\d+\.\d+$/';
-	private const REGEX_MAJOR_MINOR_PATCH = '/^\d+\.\d+\.\d+(?!\.\d+)/';
-	private const REGEX_ACTUAL = '/^\d+(\.\d+){1,2}/';
+    private const REGEX_MAJOR = '/^\d+$/';
+    private const REGEX_MAJOR_MINOR = '/^\d+\.\d+$/';
+    private const REGEX_MAJOR_MINOR_PATCH = '/^\d+\.\d+\.\d+(?!\.\d+)/';
+    private const REGEX_ACTUAL = '/^\d+(\.\d+){1,2}/';
 
-	/**
-	 * 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 required 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_ACTUAL, $actual, $matches)) {
-			throw new InvalidArgumentException("version specification $actual is invalid");
-		}
-		$cleanActual = $matches[0];
+    /**
+     * 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 required 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_ACTUAL, $actual, $matches)) {
+            throw new InvalidArgumentException("version specification $actual is invalid");
+        }
+        $cleanActual = $matches[0];
 
-		if (preg_match(self::REGEX_MAJOR, $required) === 1) {
-			return $this->compareMajor($cleanActual, $required, $comparator);
-		} elseif (preg_match(self::REGEX_MAJOR_MINOR, $required) === 1) {
-			return $this->compareMajorMinor($cleanActual, $required, $comparator);
-		} elseif (preg_match(self::REGEX_MAJOR_MINOR_PATCH, $required) === 1) {
-			return $this->compareMajorMinorPatch($cleanActual, $required, $comparator);
-		} else {
-			throw new InvalidArgumentException("required version $required is invalid");
-		}
-	}
+        if (preg_match(self::REGEX_MAJOR, $required) === 1) {
+            return $this->compareMajor($cleanActual, $required, $comparator);
+        } elseif (preg_match(self::REGEX_MAJOR_MINOR, $required) === 1) {
+            return $this->compareMajorMinor($cleanActual, $required, $comparator);
+        } elseif (preg_match(self::REGEX_MAJOR_MINOR_PATCH, $required) === 1) {
+            return $this->compareMajorMinorPatch($cleanActual, $required, $comparator);
+        } else {
+            throw new InvalidArgumentException("required version $required 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);
+    }
 }

lib/private/App/AppStore/Bundles/HubBundle.php

Indentation +17 added lines, -17 removed lines

@@ -27,24 +27,24 @@
 namespace OC\App\AppStore\Bundles;
 
 class HubBundle extends Bundle {
-	public function getName() {
-		return $this->l10n->t('Hub bundle');
-	}
+    public function getName() {
+        return $this->l10n->t('Hub bundle');
+    }
 
-	public function getAppIdentifiers() {
-		$hubApps = [
-			'spreed',
-			'contacts',
-			'calendar',
-			'mail',
-		];
+    public function getAppIdentifiers() {
+        $hubApps = [
+            'spreed',
+            'contacts',
+            'calendar',
+            'mail',
+        ];
 
-		$architecture = function_exists('php_uname') ? php_uname('m') : null;
-		if (isset($architecture) && PHP_OS_FAMILY === 'Linux' && in_array($architecture, ['x86_64', 'aarch64'])) {
-			$hubApps[] = 'richdocuments';
-			$hubApps[] = 'richdocumentscode' . ($architecture === 'aarch64' ? '_arm64' : '');
-		}
+        $architecture = function_exists('php_uname') ? php_uname('m') : null;
+        if (isset($architecture) && PHP_OS_FAMILY === 'Linux' && in_array($architecture, ['x86_64', 'aarch64'])) {
+            $hubApps[] = 'richdocuments';
+            $hubApps[] = 'richdocumentscode' . ($architecture === 'aarch64' ? '_arm64' : '');
+        }
 
-		return $hubApps;
-	}
+        return $hubApps;
+    }
 }

lib/private/Memcache/Memcached.php

Indentation +158 added lines, -158 removed lines

@@ -35,162 +35,162 @@
 use OCP\IMemcache;
 
 class Memcached extends Cache implements IMemcache {
-	use CASTrait;
-
-	/**
-	 * @var \Memcached $cache
-	 */
-	private static $cache = null;
-
-	use CADTrait;
-
-	public function __construct($prefix = '') {
-		parent::__construct($prefix);
-		if (is_null(self::$cache)) {
-			self::$cache = new \Memcached();
-
-			$defaultOptions = [
-				\Memcached::OPT_CONNECT_TIMEOUT => 50,
-				\Memcached::OPT_RETRY_TIMEOUT => 50,
-				\Memcached::OPT_SEND_TIMEOUT => 50,
-				\Memcached::OPT_RECV_TIMEOUT => 50,
-				\Memcached::OPT_POLL_TIMEOUT => 50,
-
-				// Enable compression
-				\Memcached::OPT_COMPRESSION => true,
-
-				// Turn on consistent hashing
-				\Memcached::OPT_LIBKETAMA_COMPATIBLE => true,
-
-				// Enable Binary Protocol
-				\Memcached::OPT_BINARY_PROTOCOL => true,
-			];
-			/**
-			 * By default enable igbinary serializer if available
-			 *
-			 * Psalm checks depend on if igbinary is installed or not with memcached
-			 * @psalm-suppress RedundantCondition
-			 * @psalm-suppress TypeDoesNotContainType
-			 */
-			if (\Memcached::HAVE_IGBINARY) {
-				$defaultOptions[\Memcached::OPT_SERIALIZER] =
-					\Memcached::SERIALIZER_IGBINARY;
-			}
-			$options = \OC::$server->getConfig()->getSystemValue('memcached_options', []);
-			if (is_array($options)) {
-				$options = $options + $defaultOptions;
-				self::$cache->setOptions($options);
-			} else {
-				throw new HintException("Expected 'memcached_options' config to be an array, got $options");
-			}
-
-			$servers = \OC::$server->getSystemConfig()->getValue('memcached_servers');
-			if (!$servers) {
-				$server = \OC::$server->getSystemConfig()->getValue('memcached_server');
-				if ($server) {
-					$servers = [$server];
-				} else {
-					$servers = [['localhost', 11211]];
-				}
-			}
-			self::$cache->addServers($servers);
-		}
-	}
-
-	/**
-	 * entries in XCache gets namespaced to prevent collisions between owncloud instances and users
-	 */
-	protected function getNameSpace() {
-		return $this->prefix;
-	}
-
-	public function get($key) {
-		$result = self::$cache->get($this->getNameSpace() . $key);
-		if ($result === false and self::$cache->getResultCode() == \Memcached::RES_NOTFOUND) {
-			return null;
-		} else {
-			return $result;
-		}
-	}
-
-	public function set($key, $value, $ttl = 0) {
-		if ($ttl > 0) {
-			$result = self::$cache->set($this->getNameSpace() . $key, $value, $ttl);
-		} else {
-			$result = self::$cache->set($this->getNameSpace() . $key, $value);
-		}
-		return $result || $this->isSuccess();
-	}
-
-	public function hasKey($key) {
-		self::$cache->get($this->getNameSpace() . $key);
-		return self::$cache->getResultCode() === \Memcached::RES_SUCCESS;
-	}
-
-	public function remove($key) {
-		$result = self::$cache->delete($this->getNameSpace() . $key);
-		return $result || $this->isSuccess() || self::$cache->getResultCode() === \Memcached::RES_NOTFOUND;
-	}
-
-	public function clear($prefix = '') {
-		// Newer Memcached doesn't like getAllKeys(), flush everything
-		self::$cache->flush();
-		return true;
-	}
-
-	/**
-	 * Set a value in the cache if it's not already stored
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
-	 * @return bool
-	 */
-	public function add($key, $value, $ttl = 0) {
-		$result = self::$cache->add($this->getPrefix() . $key, $value, $ttl);
-		return $result || $this->isSuccess();
-	}
-
-	/**
-	 * Increase a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function inc($key, $step = 1) {
-		$this->add($key, 0);
-		$result = self::$cache->increment($this->getPrefix() . $key, $step);
-
-		if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
-			return false;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Decrease a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function dec($key, $step = 1) {
-		$result = self::$cache->decrement($this->getPrefix() . $key, $step);
-
-		if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
-			return false;
-		}
-
-		return $result;
-	}
-
-	public static function isAvailable(): bool {
-		return extension_loaded('memcached');
-	}
-
-	private function isSuccess(): bool {
-		return self::$cache->getResultCode() === \Memcached::RES_SUCCESS;
-	}
+    use CASTrait;
+
+    /**
+     * @var \Memcached $cache
+     */
+    private static $cache = null;
+
+    use CADTrait;
+
+    public function __construct($prefix = '') {
+        parent::__construct($prefix);
+        if (is_null(self::$cache)) {
+            self::$cache = new \Memcached();
+
+            $defaultOptions = [
+                \Memcached::OPT_CONNECT_TIMEOUT => 50,
+                \Memcached::OPT_RETRY_TIMEOUT => 50,
+                \Memcached::OPT_SEND_TIMEOUT => 50,
+                \Memcached::OPT_RECV_TIMEOUT => 50,
+                \Memcached::OPT_POLL_TIMEOUT => 50,
+
+                // Enable compression
+                \Memcached::OPT_COMPRESSION => true,
+
+                // Turn on consistent hashing
+                \Memcached::OPT_LIBKETAMA_COMPATIBLE => true,
+
+                // Enable Binary Protocol
+                \Memcached::OPT_BINARY_PROTOCOL => true,
+            ];
+            /**
+             * By default enable igbinary serializer if available
+             *
+             * Psalm checks depend on if igbinary is installed or not with memcached
+             * @psalm-suppress RedundantCondition
+             * @psalm-suppress TypeDoesNotContainType
+             */
+            if (\Memcached::HAVE_IGBINARY) {
+                $defaultOptions[\Memcached::OPT_SERIALIZER] =
+                    \Memcached::SERIALIZER_IGBINARY;
+            }
+            $options = \OC::$server->getConfig()->getSystemValue('memcached_options', []);
+            if (is_array($options)) {
+                $options = $options + $defaultOptions;
+                self::$cache->setOptions($options);
+            } else {
+                throw new HintException("Expected 'memcached_options' config to be an array, got $options");
+            }
+
+            $servers = \OC::$server->getSystemConfig()->getValue('memcached_servers');
+            if (!$servers) {
+                $server = \OC::$server->getSystemConfig()->getValue('memcached_server');
+                if ($server) {
+                    $servers = [$server];
+                } else {
+                    $servers = [['localhost', 11211]];
+                }
+            }
+            self::$cache->addServers($servers);
+        }
+    }
+
+    /**
+     * entries in XCache gets namespaced to prevent collisions between owncloud instances and users
+     */
+    protected function getNameSpace() {
+        return $this->prefix;
+    }
+
+    public function get($key) {
+        $result = self::$cache->get($this->getNameSpace() . $key);
+        if ($result === false and self::$cache->getResultCode() == \Memcached::RES_NOTFOUND) {
+            return null;
+        } else {
+            return $result;
+        }
+    }
+
+    public function set($key, $value, $ttl = 0) {
+        if ($ttl > 0) {
+            $result = self::$cache->set($this->getNameSpace() . $key, $value, $ttl);
+        } else {
+            $result = self::$cache->set($this->getNameSpace() . $key, $value);
+        }
+        return $result || $this->isSuccess();
+    }
+
+    public function hasKey($key) {
+        self::$cache->get($this->getNameSpace() . $key);
+        return self::$cache->getResultCode() === \Memcached::RES_SUCCESS;
+    }
+
+    public function remove($key) {
+        $result = self::$cache->delete($this->getNameSpace() . $key);
+        return $result || $this->isSuccess() || self::$cache->getResultCode() === \Memcached::RES_NOTFOUND;
+    }
+
+    public function clear($prefix = '') {
+        // Newer Memcached doesn't like getAllKeys(), flush everything
+        self::$cache->flush();
+        return true;
+    }
+
+    /**
+     * Set a value in the cache if it's not already stored
+     *
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
+     * @return bool
+     */
+    public function add($key, $value, $ttl = 0) {
+        $result = self::$cache->add($this->getPrefix() . $key, $value, $ttl);
+        return $result || $this->isSuccess();
+    }
+
+    /**
+     * Increase a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function inc($key, $step = 1) {
+        $this->add($key, 0);
+        $result = self::$cache->increment($this->getPrefix() . $key, $step);
+
+        if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
+            return false;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Decrease a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function dec($key, $step = 1) {
+        $result = self::$cache->decrement($this->getPrefix() . $key, $step);
+
+        if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
+            return false;
+        }
+
+        return $result;
+    }
+
+    public static function isAvailable(): bool {
+        return extension_loaded('memcached');
+    }
+
+    private function isSuccess(): bool {
+        return self::$cache->getResultCode() === \Memcached::RES_SUCCESS;
+    }
 }

core/templates/loginflowv2/authpicker.php

Indentation +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@
 	<h2><?php p($l->t('Connect to your account')) ?></h2>
 	<p class="info">
 		<?php print_unescaped($l->t('Please log in before granting %1$s access to your %2$s account.', [
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
-			\OCP\Util::sanitizeHTML($_['instanceName'])
-		])) ?>
+            '<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+            \OCP\Util::sanitizeHTML($_['instanceName'])
+        ])) ?>
 	</p>
 
 	<div class="notecard warning">

core/templates/loginflowv2/grant.php

Indentation +6 added lines, -6 removed lines

@@ -31,15 +31,15 @@
 	<h2><?php p($l->t('Account access')) ?></h2>
 	<p class="info">
 		<?php p($l->t('Currently logged in as %1$s (%2$s).', [
-			$_['userDisplayName'],
-			$_['userId'],
-		])) ?>
+            $_['userDisplayName'],
+            $_['userId'],
+        ])) ?>
 	</p>
 	<p class="info">
 		<?php print_unescaped($l->t('You are about to grant %1$s access to your %2$s account.', [
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
-			\OCP\Util::sanitizeHTML($_['instanceName'])
-		])) ?>
+            '<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+            \OCP\Util::sanitizeHTML($_['instanceName'])
+        ])) ?>
 	</p>
 
 	<br/>

lib/public/IBinaryFinder.php

Indentation +7 added lines, -7 removed lines

@@ -31,11 +31,11 @@
  * @since 25.0.0
  */
 interface IBinaryFinder {
-	/**
-	 * Try to find a program
-	 *
-	 * @return false|string
-	 * @since 25.0.0
-	 */
-	public function findBinaryPath(string $program);
+    /**
+     * Try to find a program
+     *
+     * @return false|string
+     * @since 25.0.0
+     */
+    public function findBinaryPath(string $program);
 }

lib/private/Preview/ProviderV1Adapter.php

Indentation +20 added lines, -20 removed lines

@@ -34,30 +34,30 @@
 use OCP\Preview\IProviderV2;
 
 class ProviderV1Adapter implements IProviderV2 {
-	private $providerV1;
+    private $providerV1;
 
-	public function __construct(IProvider $providerV1) {
-		$this->providerV1 = $providerV1;
-	}
+    public function __construct(IProvider $providerV1) {
+        $this->providerV1 = $providerV1;
+    }
 
-	public function getMimeType(): string {
-		return (string)$this->providerV1->getMimeType();
-	}
+    public function getMimeType(): string {
+        return (string)$this->providerV1->getMimeType();
+    }
 
-	public function isAvailable(FileInfo $file): bool {
-		return (bool)$this->providerV1->isAvailable($file);
-	}
+    public function isAvailable(FileInfo $file): bool {
+        return (bool)$this->providerV1->isAvailable($file);
+    }
 
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		[$view, $path] = $this->getViewAndPath($file);
-		$thumbnail = $this->providerV1->getThumbnail($path, $maxX, $maxY, false, $view);
-		return $thumbnail === false ? null: $thumbnail;
-	}
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        [$view, $path] = $this->getViewAndPath($file);
+        $thumbnail = $this->providerV1->getThumbnail($path, $maxX, $maxY, false, $view);
+        return $thumbnail === false ? null: $thumbnail;
+    }
 
-	private function getViewAndPath(File $file) {
-		$view = new View(dirname($file->getPath()));
-		$path = $file->getName();
+    private function getViewAndPath(File $file) {
+        $view = new View(dirname($file->getPath()));
+        $path = $file->getName();
 
-		return [$view, $path];
-	}
+        return [$view, $path];
+    }
 }