nextcloud / server

apps/user_ldap/lib/Mapping/GroupMapping.php

Indentation +8 added lines, -8 removed lines

@@ -29,12 +29,12 @@
  */
 class GroupMapping extends AbstractMapping {
 
-	/**
-	 * returns the DB table name which holds the mappings
-	 * @return string
-	 */
-	protected function getTableName(bool $includePrefix = true) {
-		$p = $includePrefix ? '*PREFIX*' : '';
-		return $p . 'ldap_group_mapping';
-	}
+    /**
+     * returns the DB table name which holds the mappings
+     * @return string
+     */
+    protected function getTableName(bool $includePrefix = true) {
+        $p = $includePrefix ? '*PREFIX*' : '';
+        return $p . 'ldap_group_mapping';
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -35,6 +35,6 @@
 	 */
 	protected function getTableName(bool $includePrefix = true) {
 		$p = $includePrefix ? '*PREFIX*' : '';
-		return $p . 'ldap_group_mapping';
+		return $p.'ldap_group_mapping';
 	}
 }

apps/user_ldap/lib/Proxy.php

Spacing +3 added lines, -3 removed lines

@@ -107,7 +107,7 @@ 
 	 * @return string
 	 */
 	protected function getUserCacheKey($uid) {
-		return 'user-' . $uid . '-lastSeenOn';
+		return 'user-'.$uid.'-lastSeenOn';
 	}
 
 	/**
@@ -115,7 +115,7 @@ 
 	 * @return string
 	 */
 	protected function getGroupCacheKey($gid) {
-		return 'group-' . $gid . '-lastSeenOn';
+		return 'group-'.$gid.'-lastSeenOn';
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 		if ($key === null) {
 			return $prefix;
 		}
-		return $prefix . hash('sha256', $key);
+		return $prefix.hash('sha256', $key);
 	}
 
 	/**

Indentation +187 added lines, -187 removed lines

@@ -17,191 +17,191 @@
  * @template T
  */
 abstract class Proxy {
-	/** @var array<string,Access> */
-	private static array $accesses = [];
-	private ?bool $isSingleBackend = null;
-	private ?ICache $cache = null;
-
-	/** @var T[] */
-	protected array $backends = [];
-	/** @var ?T */
-	protected $refBackend = null;
-
-	protected bool $isSetUp = false;
-
-	public function __construct(
-		private Helper $helper,
-		private ILDAPWrapper $ldap,
-		private AccessFactory $accessFactory,
-	) {
-		$memcache = Server::get(ICacheFactory::class);
-		if ($memcache->isAvailable()) {
-			$this->cache = $memcache->createDistributed();
-		}
-	}
-
-	protected function setup(): void {
-		if ($this->isSetUp) {
-			return;
-		}
-
-		$serverConfigPrefixes = $this->helper->getServerConfigurationPrefixes(true);
-		foreach ($serverConfigPrefixes as $configPrefix) {
-			$this->backends[$configPrefix] = $this->newInstance($configPrefix);
-
-			if (is_null($this->refBackend)) {
-				$this->refBackend = $this->backends[$configPrefix];
-			}
-		}
-
-		$this->isSetUp = true;
-	}
-
-	/**
-	 * @return T
-	 */
-	abstract protected function newInstance(string $configPrefix): object;
-
-	/**
-	 * @return T
-	 */
-	public function getBackend(string $configPrefix): object {
-		$this->setup();
-		return $this->backends[$configPrefix];
-	}
-
-	private function addAccess(string $configPrefix): void {
-		$userMap = Server::get(UserMapping::class);
-		$groupMap = Server::get(GroupMapping::class);
-
-		$connector = new Connection($this->ldap, $configPrefix);
-		$access = $this->accessFactory->get($connector);
-		$access->setUserMapper($userMap);
-		$access->setGroupMapper($groupMap);
-		self::$accesses[$configPrefix] = $access;
-	}
-
-	protected function getAccess(string $configPrefix): Access {
-		if (!isset(self::$accesses[$configPrefix])) {
-			$this->addAccess($configPrefix);
-		}
-		return self::$accesses[$configPrefix];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getUserCacheKey($uid) {
-		return 'user-' . $uid . '-lastSeenOn';
-	}
-
-	/**
-	 * @param string $gid
-	 * @return string
-	 */
-	protected function getGroupCacheKey($gid) {
-		return 'group-' . $gid . '-lastSeenOn';
-	}
-
-	/**
-	 * @param string $id
-	 * @param string $method
-	 * @param array $parameters
-	 * @param bool $passOnWhen
-	 * @return mixed
-	 */
-	abstract protected function callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
-
-	/**
-	 * @param string $id
-	 * @param string $method
-	 * @param array $parameters
-	 * @return mixed
-	 */
-	abstract protected function walkBackends($id, $method, $parameters);
-
-	/**
-	 * @param string $id
-	 * @return Access
-	 */
-	abstract public function getLDAPAccess($id);
-
-	abstract protected function activeBackends(): int;
-
-	protected function isSingleBackend(): bool {
-		if ($this->isSingleBackend === null) {
-			$this->isSingleBackend = $this->activeBackends() === 1;
-		}
-		return $this->isSingleBackend;
-	}
-
-	/**
-	 * Takes care of the request to the User backend
-	 *
-	 * @param string $id
-	 * @param string $method string, the method of the user backend that shall be called
-	 * @param array $parameters an array of parameters to be passed
-	 * @param bool $passOnWhen
-	 * @return mixed the result of the specified method
-	 */
-	protected function handleRequest($id, $method, $parameters, $passOnWhen = false) {
-		if (!$this->isSingleBackend()) {
-			$result = $this->callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
-		}
-		if (!isset($result) || $result === $passOnWhen) {
-			$result = $this->walkBackends($id, $method, $parameters);
-		}
-		return $result;
-	}
-
-	/**
-	 * @param string|null $key
-	 * @return string
-	 */
-	private function getCacheKey($key) {
-		$prefix = 'LDAP-Proxy-';
-		if ($key === null) {
-			return $prefix;
-		}
-		return $prefix . hash('sha256', $key);
-	}
-
-	/**
-	 * @param string $key
-	 * @return mixed|null
-	 */
-	public function getFromCache($key) {
-		if ($this->cache === null) {
-			return null;
-		}
-
-		$key = $this->getCacheKey($key);
-		$value = $this->cache->get($key);
-		if ($value === null) {
-			return null;
-		}
-
-		return json_decode(base64_decode($value));
-	}
-
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	public function writeToCache($key, $value) {
-		if ($this->cache === null) {
-			return;
-		}
-		$key = $this->getCacheKey($key);
-		$value = base64_encode(json_encode($value));
-		$this->cache->set($key, $value, 2592000);
-	}
-
-	public function clearCache() {
-		if ($this->cache === null) {
-			return;
-		}
-		$this->cache->clear($this->getCacheKey(null));
-	}
+    /** @var array<string,Access> */
+    private static array $accesses = [];
+    private ?bool $isSingleBackend = null;
+    private ?ICache $cache = null;
+
+    /** @var T[] */
+    protected array $backends = [];
+    /** @var ?T */
+    protected $refBackend = null;
+
+    protected bool $isSetUp = false;
+
+    public function __construct(
+        private Helper $helper,
+        private ILDAPWrapper $ldap,
+        private AccessFactory $accessFactory,
+    ) {
+        $memcache = Server::get(ICacheFactory::class);
+        if ($memcache->isAvailable()) {
+            $this->cache = $memcache->createDistributed();
+        }
+    }
+
+    protected function setup(): void {
+        if ($this->isSetUp) {
+            return;
+        }
+
+        $serverConfigPrefixes = $this->helper->getServerConfigurationPrefixes(true);
+        foreach ($serverConfigPrefixes as $configPrefix) {
+            $this->backends[$configPrefix] = $this->newInstance($configPrefix);
+
+            if (is_null($this->refBackend)) {
+                $this->refBackend = $this->backends[$configPrefix];
+            }
+        }
+
+        $this->isSetUp = true;
+    }
+
+    /**
+     * @return T
+     */
+    abstract protected function newInstance(string $configPrefix): object;
+
+    /**
+     * @return T
+     */
+    public function getBackend(string $configPrefix): object {
+        $this->setup();
+        return $this->backends[$configPrefix];
+    }
+
+    private function addAccess(string $configPrefix): void {
+        $userMap = Server::get(UserMapping::class);
+        $groupMap = Server::get(GroupMapping::class);
+
+        $connector = new Connection($this->ldap, $configPrefix);
+        $access = $this->accessFactory->get($connector);
+        $access->setUserMapper($userMap);
+        $access->setGroupMapper($groupMap);
+        self::$accesses[$configPrefix] = $access;
+    }
+
+    protected function getAccess(string $configPrefix): Access {
+        if (!isset(self::$accesses[$configPrefix])) {
+            $this->addAccess($configPrefix);
+        }
+        return self::$accesses[$configPrefix];
+    }
+
+    /**
+     * @param string $uid
+     * @return string
+     */
+    protected function getUserCacheKey($uid) {
+        return 'user-' . $uid . '-lastSeenOn';
+    }
+
+    /**
+     * @param string $gid
+     * @return string
+     */
+    protected function getGroupCacheKey($gid) {
+        return 'group-' . $gid . '-lastSeenOn';
+    }
+
+    /**
+     * @param string $id
+     * @param string $method
+     * @param array $parameters
+     * @param bool $passOnWhen
+     * @return mixed
+     */
+    abstract protected function callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
+
+    /**
+     * @param string $id
+     * @param string $method
+     * @param array $parameters
+     * @return mixed
+     */
+    abstract protected function walkBackends($id, $method, $parameters);
+
+    /**
+     * @param string $id
+     * @return Access
+     */
+    abstract public function getLDAPAccess($id);
+
+    abstract protected function activeBackends(): int;
+
+    protected function isSingleBackend(): bool {
+        if ($this->isSingleBackend === null) {
+            $this->isSingleBackend = $this->activeBackends() === 1;
+        }
+        return $this->isSingleBackend;
+    }
+
+    /**
+     * Takes care of the request to the User backend
+     *
+     * @param string $id
+     * @param string $method string, the method of the user backend that shall be called
+     * @param array $parameters an array of parameters to be passed
+     * @param bool $passOnWhen
+     * @return mixed the result of the specified method
+     */
+    protected function handleRequest($id, $method, $parameters, $passOnWhen = false) {
+        if (!$this->isSingleBackend()) {
+            $result = $this->callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
+        }
+        if (!isset($result) || $result === $passOnWhen) {
+            $result = $this->walkBackends($id, $method, $parameters);
+        }
+        return $result;
+    }
+
+    /**
+     * @param string|null $key
+     * @return string
+     */
+    private function getCacheKey($key) {
+        $prefix = 'LDAP-Proxy-';
+        if ($key === null) {
+            return $prefix;
+        }
+        return $prefix . hash('sha256', $key);
+    }
+
+    /**
+     * @param string $key
+     * @return mixed|null
+     */
+    public function getFromCache($key) {
+        if ($this->cache === null) {
+            return null;
+        }
+
+        $key = $this->getCacheKey($key);
+        $value = $this->cache->get($key);
+        if ($value === null) {
+            return null;
+        }
+
+        return json_decode(base64_decode($value));
+    }
+
+    /**
+     * @param string $key
+     * @param mixed $value
+     */
+    public function writeToCache($key, $value) {
+        if ($this->cache === null) {
+            return;
+        }
+        $key = $this->getCacheKey($key);
+        $value = base64_encode(json_encode($value));
+        $this->cache->set($key, $value, 2592000);
+    }
+
+    public function clearCache() {
+        if ($this->cache === null) {
+            return;
+        }
+        $this->cache->clear($this->getCacheKey(null));
+    }
 }

lib/private/AppFramework/Services/InitialState.php

Indentation +14 added lines, -14 removed lines

@@ -29,22 +29,22 @@
 use OCP\IInitialStateService;
 
 class InitialState implements IInitialState {
-	/** @var IInitialStateService */
-	private $state;
+    /** @var IInitialStateService */
+    private $state;
 
-	/** @var string */
-	private $appName;
+    /** @var string */
+    private $appName;
 
-	public function __construct(IInitialStateService $state, string $appName) {
-		$this->state = $state;
-		$this->appName = $appName;
-	}
+    public function __construct(IInitialStateService $state, string $appName) {
+        $this->state = $state;
+        $this->appName = $appName;
+    }
 
-	public function provideInitialState(string $key, $data): void {
-		$this->state->provideInitialState($this->appName, $key, $data);
-	}
+    public function provideInitialState(string $key, $data): void {
+        $this->state->provideInitialState($this->appName, $key, $data);
+    }
 
-	public function provideLazyInitialState(string $key, \Closure $closure): void {
-		$this->state->provideLazyInitialState($this->appName, $key, $closure);
-	}
+    public function provideLazyInitialState(string $key, \Closure $closure): void {
+        $this->state->provideLazyInitialState($this->appName, $key, $closure);
+    }
 }

lib/private/AppFramework/Middleware/NotModifiedMiddleware.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 
 	public function afterController($controller, $methodName, Response $response) {
 		$etagHeader = $this->request->getHeader('IF_NONE_MATCH');
-		if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"' . $response->getETag() . '"') {
+		if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"'.$response->getETag().'"') {
 			$response->setStatus(Http::STATUS_NOT_MODIFIED);
 			return $response;
 		}

Indentation +22 added lines, -22 removed lines

@@ -14,26 +14,26 @@
 use OCP\IRequest;
 
 class NotModifiedMiddleware extends Middleware {
-	/** @var IRequest */
-	private $request;
-
-	public function __construct(IRequest $request) {
-		$this->request = $request;
-	}
-
-	public function afterController($controller, $methodName, Response $response) {
-		$etagHeader = $this->request->getHeader('IF_NONE_MATCH');
-		if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"' . $response->getETag() . '"') {
-			$response->setStatus(Http::STATUS_NOT_MODIFIED);
-			return $response;
-		}
-
-		$modifiedSinceHeader = $this->request->getHeader('IF_MODIFIED_SINCE');
-		if ($modifiedSinceHeader !== '' && $response->getLastModified() !== null && trim($modifiedSinceHeader) === $response->getLastModified()->format(\DateTimeInterface::RFC7231)) {
-			$response->setStatus(Http::STATUS_NOT_MODIFIED);
-			return $response;
-		}
-
-		return $response;
-	}
+    /** @var IRequest */
+    private $request;
+
+    public function __construct(IRequest $request) {
+        $this->request = $request;
+    }
+
+    public function afterController($controller, $methodName, Response $response) {
+        $etagHeader = $this->request->getHeader('IF_NONE_MATCH');
+        if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"' . $response->getETag() . '"') {
+            $response->setStatus(Http::STATUS_NOT_MODIFIED);
+            return $response;
+        }
+
+        $modifiedSinceHeader = $this->request->getHeader('IF_MODIFIED_SINCE');
+        if ($modifiedSinceHeader !== '' && $response->getLastModified() !== null && trim($modifiedSinceHeader) === $response->getLastModified()->format(\DateTimeInterface::RFC7231)) {
+            $response->setStatus(Http::STATUS_NOT_MODIFIED);
+            return $response;
+        }
+
+        return $response;
+    }
 }

resources/update-locales.php

Indentation +9 added lines, -9 removed lines

@@ -25,28 +25,28 @@
  */
 
 if (!extension_loaded('intl')) {
-	echo 'Intl extension is required to run this script.';
-	exit(1);
+    echo 'Intl extension is required to run this script.';
+    exit(1);
 }
 
 require '../3rdparty/autoload.php';
 
 $locales = array_map(static function (string $localeCode) {
-	return [
-		'code' => $localeCode,
-		'name' => Locale::getDisplayName($localeCode, 'en')
-	];
+    return [
+        'code' => $localeCode,
+        'name' => Locale::getDisplayName($localeCode, 'en')
+    ];
 }, ResourceBundle::getLocales(''));
 
 $locales = array_filter($locales, static function (array $locale) {
-	return is_array(Punic\Data::explodeLocale($locale['code']));
+    return is_array(Punic\Data::explodeLocale($locale['code']));
 });
 
 $locales = array_values($locales);
 
 if (file_put_contents(__DIR__ . '/locales.json', json_encode($locales, JSON_PRETTY_PRINT)) === false) {
-	echo 'Failed to update locales.json';
-	exit(1);
+    echo 'Failed to update locales.json';
+    exit(1);
 }
 
 echo 'Updated locales.json. Don\'t forget to commit the result.';

Spacing +3 added lines, -3 removed lines

@@ -31,20 +31,20 @@
 
 require '../3rdparty/autoload.php';
 
-$locales = array_map(static function (string $localeCode) {
+$locales = array_map(static function(string $localeCode) {
 	return [
 		'code' => $localeCode,
 		'name' => Locale::getDisplayName($localeCode, 'en')
 	];
 }, ResourceBundle::getLocales(''));
 
-$locales = array_filter($locales, static function (array $locale) {
+$locales = array_filter($locales, static function(array $locale) {
 	return is_array(Punic\Data::explodeLocale($locale['code']));
 });
 
 $locales = array_values($locales);
 
-if (file_put_contents(__DIR__ . '/locales.json', json_encode($locales, JSON_PRETTY_PRINT)) === false) {
+if (file_put_contents(__DIR__.'/locales.json', json_encode($locales, JSON_PRETTY_PRINT)) === false) {
 	echo 'Failed to update locales.json';
 	exit(1);
 }

apps/files_external/lib/Lib/Storage/SFTPWriteStream.php

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 		if (isset($context[$name])) {
 			$context = $context[$name];
 		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+			throw new \BadMethodCallException('Invalid context, "'.$name.'" options not set');
 		}
 		if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) {
 			$this->sftp = $context['session'];
@@ -82,7 +82,7 @@ 
 
 	public function stream_open($path, $mode, $options, &$opened_path) {
 		[, $path] = explode('://', $path);
-		$path = '/' . ltrim($path);
+		$path = '/'.ltrim($path);
 		$path = str_replace('//', '/', $path);
 
 		$this->loadContext('sftp');

Indentation +150 added lines, -150 removed lines

@@ -12,154 +12,154 @@
 use phpseclib\Net\SSH2;
 
 class SFTPWriteStream implements File {
-	/** @var resource */
-	public $context;
-
-	/** @var \phpseclib\Net\SFTP */
-	private $sftp;
-
-	/** @var string */
-	private $handle;
-
-	/** @var int */
-	private $internalPosition = 0;
-
-	/** @var int */
-	private $writePosition = 0;
-
-	/** @var bool */
-	private $eof = false;
-
-	private $buffer = '';
-
-	public static function register($protocol = 'sftpwrite') {
-		if (in_array($protocol, stream_get_wrappers(), true)) {
-			return false;
-		}
-		return stream_wrapper_register($protocol, get_called_class());
-	}
-
-	/**
-	 * Load the source from the stream context and return the context options
-	 *
-	 * @throws \BadMethodCallException
-	 */
-	protected function loadContext(string $name) {
-		$context = stream_context_get_options($this->context);
-		if (isset($context[$name])) {
-			$context = $context[$name];
-		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
-		}
-		if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) {
-			$this->sftp = $context['session'];
-		} else {
-			throw new \BadMethodCallException('Invalid context, session not set');
-		}
-		return $context;
-	}
-
-	public function stream_open($path, $mode, $options, &$opened_path) {
-		[, $path] = explode('://', $path);
-		$path = '/' . ltrim($path);
-		$path = str_replace('//', '/', $path);
-
-		$this->loadContext('sftp');
-
-		if (!($this->sftp->bitmap & SSH2::MASK_LOGIN)) {
-			return false;
-		}
-
-		$remote_file = $this->sftp->_realpath($path);
-		if ($remote_file === false) {
-			return false;
-		}
-
-		$packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE | NET_SFTP_OPEN_TRUNCATE, 0);
-		if (!$this->sftp->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
-			return false;
-		}
-
-		$response = $this->sftp->_get_sftp_packet();
-		switch ($this->sftp->packet_type) {
-			case NET_SFTP_HANDLE:
-				$this->handle = substr($response, 4);
-				break;
-			case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-				$this->sftp->_logError($response);
-				return false;
-			default:
-				user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
-				return false;
-		}
-
-		return true;
-	}
-
-	public function stream_seek($offset, $whence = SEEK_SET) {
-		return false;
-	}
-
-	public function stream_tell() {
-		return $this->writePosition;
-	}
-
-	public function stream_read($count) {
-		return false;
-	}
-
-	public function stream_write($data) {
-		$written = strlen($data);
-		$this->writePosition += $written;
-
-		$this->buffer .= $data;
-
-		if (strlen($this->buffer) > 64 * 1024) {
-			if (!$this->stream_flush()) {
-				return false;
-			}
-		}
-
-		return $written;
-	}
-
-	public function stream_set_option($option, $arg1, $arg2) {
-		return false;
-	}
-
-	public function stream_truncate($size) {
-		return false;
-	}
-
-	public function stream_stat() {
-		return false;
-	}
-
-	public function stream_lock($operation) {
-		return false;
-	}
-
-	public function stream_flush() {
-		$size = strlen($this->buffer);
-		$packet = pack('Na*N3a*', strlen($this->handle), $this->handle, $this->internalPosition / 4294967296, $this->internalPosition, $size, $this->buffer);
-		if (!$this->sftp->_send_sftp_packet(NET_SFTP_WRITE, $packet)) {
-			return false;
-		}
-		$this->internalPosition += $size;
-		$this->buffer = '';
-
-		return $this->sftp->_read_put_responses(1);
-	}
-
-	public function stream_eof() {
-		return $this->eof;
-	}
-
-	public function stream_close() {
-		$this->stream_flush();
-		if (!$this->sftp->_close_handle($this->handle)) {
-			return false;
-		}
-		return true;
-	}
+    /** @var resource */
+    public $context;
+
+    /** @var \phpseclib\Net\SFTP */
+    private $sftp;
+
+    /** @var string */
+    private $handle;
+
+    /** @var int */
+    private $internalPosition = 0;
+
+    /** @var int */
+    private $writePosition = 0;
+
+    /** @var bool */
+    private $eof = false;
+
+    private $buffer = '';
+
+    public static function register($protocol = 'sftpwrite') {
+        if (in_array($protocol, stream_get_wrappers(), true)) {
+            return false;
+        }
+        return stream_wrapper_register($protocol, get_called_class());
+    }
+
+    /**
+     * Load the source from the stream context and return the context options
+     *
+     * @throws \BadMethodCallException
+     */
+    protected function loadContext(string $name) {
+        $context = stream_context_get_options($this->context);
+        if (isset($context[$name])) {
+            $context = $context[$name];
+        } else {
+            throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+        }
+        if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) {
+            $this->sftp = $context['session'];
+        } else {
+            throw new \BadMethodCallException('Invalid context, session not set');
+        }
+        return $context;
+    }
+
+    public function stream_open($path, $mode, $options, &$opened_path) {
+        [, $path] = explode('://', $path);
+        $path = '/' . ltrim($path);
+        $path = str_replace('//', '/', $path);
+
+        $this->loadContext('sftp');
+
+        if (!($this->sftp->bitmap & SSH2::MASK_LOGIN)) {
+            return false;
+        }
+
+        $remote_file = $this->sftp->_realpath($path);
+        if ($remote_file === false) {
+            return false;
+        }
+
+        $packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE | NET_SFTP_OPEN_TRUNCATE, 0);
+        if (!$this->sftp->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
+            return false;
+        }
+
+        $response = $this->sftp->_get_sftp_packet();
+        switch ($this->sftp->packet_type) {
+            case NET_SFTP_HANDLE:
+                $this->handle = substr($response, 4);
+                break;
+            case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
+                $this->sftp->_logError($response);
+                return false;
+            default:
+                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
+                return false;
+        }
+
+        return true;
+    }
+
+    public function stream_seek($offset, $whence = SEEK_SET) {
+        return false;
+    }
+
+    public function stream_tell() {
+        return $this->writePosition;
+    }
+
+    public function stream_read($count) {
+        return false;
+    }
+
+    public function stream_write($data) {
+        $written = strlen($data);
+        $this->writePosition += $written;
+
+        $this->buffer .= $data;
+
+        if (strlen($this->buffer) > 64 * 1024) {
+            if (!$this->stream_flush()) {
+                return false;
+            }
+        }
+
+        return $written;
+    }
+
+    public function stream_set_option($option, $arg1, $arg2) {
+        return false;
+    }
+
+    public function stream_truncate($size) {
+        return false;
+    }
+
+    public function stream_stat() {
+        return false;
+    }
+
+    public function stream_lock($operation) {
+        return false;
+    }
+
+    public function stream_flush() {
+        $size = strlen($this->buffer);
+        $packet = pack('Na*N3a*', strlen($this->handle), $this->handle, $this->internalPosition / 4294967296, $this->internalPosition, $size, $this->buffer);
+        if (!$this->sftp->_send_sftp_packet(NET_SFTP_WRITE, $packet)) {
+            return false;
+        }
+        $this->internalPosition += $size;
+        $this->buffer = '';
+
+        return $this->sftp->_read_put_responses(1);
+    }
+
+    public function stream_eof() {
+        return $this->eof;
+    }
+
+    public function stream_close() {
+        $this->stream_flush();
+        if (!$this->sftp->_close_handle($this->handle)) {
+            return false;
+        }
+        return true;
+    }
 }

apps/files_external/lib/Lib/Storage/SFTPReadStream.php

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 		if (isset($context[$name])) {
 			$context = $context[$name];
 		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+			throw new \BadMethodCallException('Invalid context, "'.$name.'" options not set');
 		}
 		if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) {
 			$this->sftp = $context['session'];
@@ -82,7 +82,7 @@ 
 
 	public function stream_open($path, $mode, $options, &$opened_path) {
 		[, $path] = explode('://', $path);
-		$path = '/' . ltrim($path);
+		$path = '/'.ltrim($path);
 		$path = str_replace('//', '/', $path);
 
 		$this->loadContext('sftp');

Indentation +202 added lines, -202 removed lines

@@ -12,206 +12,206 @@
 use phpseclib\Net\SSH2;
 
 class SFTPReadStream implements File {
-	/** @var resource */
-	public $context;
-
-	/** @var \phpseclib\Net\SFTP */
-	private $sftp;
-
-	/** @var string */
-	private $handle;
-
-	/** @var int */
-	private $internalPosition = 0;
-
-	/** @var int */
-	private $readPosition = 0;
-
-	/** @var bool */
-	private $eof = false;
-
-	private $buffer = '';
-	private bool $pendingRead = false;
-	private int $size = 0;
-
-	public static function register($protocol = 'sftpread') {
-		if (in_array($protocol, stream_get_wrappers(), true)) {
-			return false;
-		}
-		return stream_wrapper_register($protocol, get_called_class());
-	}
-
-	/**
-	 * Load the source from the stream context and return the context options
-	 *
-	 * @throws \BadMethodCallException
-	 */
-	protected function loadContext(string $name) {
-		$context = stream_context_get_options($this->context);
-		if (isset($context[$name])) {
-			$context = $context[$name];
-		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
-		}
-		if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) {
-			$this->sftp = $context['session'];
-		} else {
-			throw new \BadMethodCallException('Invalid context, session not set');
-		}
-		if (isset($context['size'])) {
-			$this->size = $context['size'];
-		}
-		return $context;
-	}
-
-	public function stream_open($path, $mode, $options, &$opened_path) {
-		[, $path] = explode('://', $path);
-		$path = '/' . ltrim($path);
-		$path = str_replace('//', '/', $path);
-
-		$this->loadContext('sftp');
-
-		if (!($this->sftp->bitmap & SSH2::MASK_LOGIN)) {
-			return false;
-		}
-
-		$remote_file = $this->sftp->_realpath($path);
-		if ($remote_file === false) {
-			return false;
-		}
-
-		$packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_READ, 0);
-		if (!$this->sftp->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
-			return false;
-		}
-
-		$response = $this->sftp->_get_sftp_packet();
-		switch ($this->sftp->packet_type) {
-			case NET_SFTP_HANDLE:
-				$this->handle = substr($response, 4);
-				break;
-			case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-				$this->sftp->_logError($response);
-				return false;
-			default:
-				user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
-				return false;
-		}
-
-		$this->request_chunk(256 * 1024);
-
-		return true;
-	}
-
-	public function stream_seek($offset, $whence = SEEK_SET) {
-		switch ($whence) {
-			case SEEK_SET:
-				$this->seekTo($offset);
-				break;
-			case SEEK_CUR:
-				$this->seekTo($this->readPosition + $offset);
-				break;
-			case SEEK_END:
-				$this->seekTo($this->size + $offset);
-				break;
-		}
-		return true;
-	}
-
-	private function seekTo(int $offset): void {
-		$this->internalPosition = $offset;
-		$this->readPosition = $offset;
-		$this->buffer = '';
-		$this->request_chunk(256 * 1024);
-	}
-
-	public function stream_tell() {
-		return $this->readPosition;
-	}
-
-	public function stream_read($count) {
-		if (!$this->eof && strlen($this->buffer) < $count) {
-			$chunk = $this->read_chunk();
-			$this->buffer .= $chunk;
-			if (!$this->eof) {
-				$this->request_chunk(256 * 1024);
-			}
-		}
-
-		$data = substr($this->buffer, 0, $count);
-		$this->buffer = substr($this->buffer, $count);
-		$this->readPosition += strlen($data);
-
-		return $data;
-	}
-
-	private function request_chunk(int $size) {
-		if ($this->pendingRead) {
-			$this->sftp->_get_sftp_packet();
-		}
-
-		$packet = pack('Na*N3', strlen($this->handle), $this->handle, $this->internalPosition / 4294967296, $this->internalPosition, $size);
-		$this->pendingRead = true;
-		return $this->sftp->_send_sftp_packet(NET_SFTP_READ, $packet);
-	}
-
-	private function read_chunk() {
-		$this->pendingRead = false;
-		$response = $this->sftp->_get_sftp_packet();
-
-		switch ($this->sftp->packet_type) {
-			case NET_SFTP_DATA:
-				$temp = substr($response, 4);
-				$len = strlen($temp);
-				$this->internalPosition += $len;
-				return $temp;
-			case NET_SFTP_STATUS:
-				[1 => $status] = unpack('N', substr($response, 0, 4));
-				if ($status == NET_SFTP_STATUS_EOF) {
-					$this->eof = true;
-				}
-				return '';
-			default:
-				return '';
-		}
-	}
-
-	public function stream_write($data) {
-		return false;
-	}
-
-	public function stream_set_option($option, $arg1, $arg2) {
-		return false;
-	}
-
-	public function stream_truncate($size) {
-		return false;
-	}
-
-	public function stream_stat() {
-		return false;
-	}
-
-	public function stream_lock($operation) {
-		return false;
-	}
-
-	public function stream_flush() {
-		return false;
-	}
-
-	public function stream_eof() {
-		return $this->eof;
-	}
-
-	public function stream_close() {
-		// we still have a read request incoming that needs to be handled before we can close
-		if ($this->pendingRead) {
-			$this->sftp->_get_sftp_packet();
-		}
-		if (!$this->sftp->_close_handle($this->handle)) {
-			return false;
-		}
-		return true;
-	}
+    /** @var resource */
+    public $context;
+
+    /** @var \phpseclib\Net\SFTP */
+    private $sftp;
+
+    /** @var string */
+    private $handle;
+
+    /** @var int */
+    private $internalPosition = 0;
+
+    /** @var int */
+    private $readPosition = 0;
+
+    /** @var bool */
+    private $eof = false;
+
+    private $buffer = '';
+    private bool $pendingRead = false;
+    private int $size = 0;
+
+    public static function register($protocol = 'sftpread') {
+        if (in_array($protocol, stream_get_wrappers(), true)) {
+            return false;
+        }
+        return stream_wrapper_register($protocol, get_called_class());
+    }
+
+    /**
+     * Load the source from the stream context and return the context options
+     *
+     * @throws \BadMethodCallException
+     */
+    protected function loadContext(string $name) {
+        $context = stream_context_get_options($this->context);
+        if (isset($context[$name])) {
+            $context = $context[$name];
+        } else {
+            throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+        }
+        if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) {
+            $this->sftp = $context['session'];
+        } else {
+            throw new \BadMethodCallException('Invalid context, session not set');
+        }
+        if (isset($context['size'])) {
+            $this->size = $context['size'];
+        }
+        return $context;
+    }
+
+    public function stream_open($path, $mode, $options, &$opened_path) {
+        [, $path] = explode('://', $path);
+        $path = '/' . ltrim($path);
+        $path = str_replace('//', '/', $path);
+
+        $this->loadContext('sftp');
+
+        if (!($this->sftp->bitmap & SSH2::MASK_LOGIN)) {
+            return false;
+        }
+
+        $remote_file = $this->sftp->_realpath($path);
+        if ($remote_file === false) {
+            return false;
+        }
+
+        $packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_READ, 0);
+        if (!$this->sftp->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
+            return false;
+        }
+
+        $response = $this->sftp->_get_sftp_packet();
+        switch ($this->sftp->packet_type) {
+            case NET_SFTP_HANDLE:
+                $this->handle = substr($response, 4);
+                break;
+            case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
+                $this->sftp->_logError($response);
+                return false;
+            default:
+                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
+                return false;
+        }
+
+        $this->request_chunk(256 * 1024);
+
+        return true;
+    }
+
+    public function stream_seek($offset, $whence = SEEK_SET) {
+        switch ($whence) {
+            case SEEK_SET:
+                $this->seekTo($offset);
+                break;
+            case SEEK_CUR:
+                $this->seekTo($this->readPosition + $offset);
+                break;
+            case SEEK_END:
+                $this->seekTo($this->size + $offset);
+                break;
+        }
+        return true;
+    }
+
+    private function seekTo(int $offset): void {
+        $this->internalPosition = $offset;
+        $this->readPosition = $offset;
+        $this->buffer = '';
+        $this->request_chunk(256 * 1024);
+    }
+
+    public function stream_tell() {
+        return $this->readPosition;
+    }
+
+    public function stream_read($count) {
+        if (!$this->eof && strlen($this->buffer) < $count) {
+            $chunk = $this->read_chunk();
+            $this->buffer .= $chunk;
+            if (!$this->eof) {
+                $this->request_chunk(256 * 1024);
+            }
+        }
+
+        $data = substr($this->buffer, 0, $count);
+        $this->buffer = substr($this->buffer, $count);
+        $this->readPosition += strlen($data);
+
+        return $data;
+    }
+
+    private function request_chunk(int $size) {
+        if ($this->pendingRead) {
+            $this->sftp->_get_sftp_packet();
+        }
+
+        $packet = pack('Na*N3', strlen($this->handle), $this->handle, $this->internalPosition / 4294967296, $this->internalPosition, $size);
+        $this->pendingRead = true;
+        return $this->sftp->_send_sftp_packet(NET_SFTP_READ, $packet);
+    }
+
+    private function read_chunk() {
+        $this->pendingRead = false;
+        $response = $this->sftp->_get_sftp_packet();
+
+        switch ($this->sftp->packet_type) {
+            case NET_SFTP_DATA:
+                $temp = substr($response, 4);
+                $len = strlen($temp);
+                $this->internalPosition += $len;
+                return $temp;
+            case NET_SFTP_STATUS:
+                [1 => $status] = unpack('N', substr($response, 0, 4));
+                if ($status == NET_SFTP_STATUS_EOF) {
+                    $this->eof = true;
+                }
+                return '';
+            default:
+                return '';
+        }
+    }
+
+    public function stream_write($data) {
+        return false;
+    }
+
+    public function stream_set_option($option, $arg1, $arg2) {
+        return false;
+    }
+
+    public function stream_truncate($size) {
+        return false;
+    }
+
+    public function stream_stat() {
+        return false;
+    }
+
+    public function stream_lock($operation) {
+        return false;
+    }
+
+    public function stream_flush() {
+        return false;
+    }
+
+    public function stream_eof() {
+        return $this->eof;
+    }
+
+    public function stream_close() {
+        // we still have a read request incoming that needs to be handled before we can close
+        if ($this->pendingRead) {
+            $this->sftp->_get_sftp_packet();
+        }
+        if (!$this->sftp->_close_handle($this->handle)) {
+            return false;
+        }
+        return true;
+    }
 }

core/Command/Db/Migrations/StatusCommand.php

Spacing +2 added lines, -2 removed lines

@@ -62,10 +62,10 @@
 			if (is_array($value)) {
 				$output->writeln("    <comment>>></comment> $key:");
 				foreach ($value as $subKey => $subValue) {
-					$output->writeln("        <comment>>></comment> $subKey: " . str_repeat(' ', 46 - strlen($subKey)) . $subValue);
+					$output->writeln("        <comment>>></comment> $subKey: ".str_repeat(' ', 46 - strlen($subKey)).$subValue);
 				}
 			} else {
-				$output->writeln("    <comment>>></comment> $key: " . str_repeat(' ', 50 - strlen($key)) . $value);
+				$output->writeln("    <comment>>></comment> $key: ".str_repeat(' ', 50 - strlen($key)).$value);
 			}
 		}
 		return 0;

Indentation +93 added lines, -93 removed lines

@@ -34,109 +34,109 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class StatusCommand extends Command implements CompletionAwareInterface {
-	public function __construct(
-		private Connection $connection,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        private Connection $connection,
+    ) {
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('migrations:status')
-			->setDescription('View the status of a set of migrations.')
-			->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on');
-	}
+    protected function configure() {
+        $this
+            ->setName('migrations:status')
+            ->setDescription('View the status of a set of migrations.')
+            ->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on');
+    }
 
-	public function execute(InputInterface $input, OutputInterface $output): int {
-		$appName = $input->getArgument('app');
-		$ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
+    public function execute(InputInterface $input, OutputInterface $output): int {
+        $appName = $input->getArgument('app');
+        $ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
 
-		$infos = $this->getMigrationsInfos($ms);
-		foreach ($infos as $key => $value) {
-			if (is_array($value)) {
-				$output->writeln("    <comment>>></comment> $key:");
-				foreach ($value as $subKey => $subValue) {
-					$output->writeln("        <comment>>></comment> $subKey: " . str_repeat(' ', 46 - strlen($subKey)) . $subValue);
-				}
-			} else {
-				$output->writeln("    <comment>>></comment> $key: " . str_repeat(' ', 50 - strlen($key)) . $value);
-			}
-		}
-		return 0;
-	}
+        $infos = $this->getMigrationsInfos($ms);
+        foreach ($infos as $key => $value) {
+            if (is_array($value)) {
+                $output->writeln("    <comment>>></comment> $key:");
+                foreach ($value as $subKey => $subValue) {
+                    $output->writeln("        <comment>>></comment> $subKey: " . str_repeat(' ', 46 - strlen($subKey)) . $subValue);
+                }
+            } else {
+                $output->writeln("    <comment>>></comment> $key: " . str_repeat(' ', 50 - strlen($key)) . $value);
+            }
+        }
+        return 0;
+    }
 
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
 
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			$allApps = \OC_App::getAllApps();
-			return array_diff($allApps, \OC_App::getEnabledApps(true, true));
-		}
-		return [];
-	}
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            $allApps = \OC_App::getAllApps();
+            return array_diff($allApps, \OC_App::getEnabledApps(true, true));
+        }
+        return [];
+    }
 
-	/**
-	 * @param MigrationService $ms
-	 * @return array associative array of human readable info name as key and the actual information as value
-	 */
-	public function getMigrationsInfos(MigrationService $ms) {
-		$executedMigrations = $ms->getMigratedVersions();
-		$availableMigrations = $ms->getAvailableVersions();
-		$executedUnavailableMigrations = array_diff($executedMigrations, array_keys($availableMigrations));
+    /**
+     * @param MigrationService $ms
+     * @return array associative array of human readable info name as key and the actual information as value
+     */
+    public function getMigrationsInfos(MigrationService $ms) {
+        $executedMigrations = $ms->getMigratedVersions();
+        $availableMigrations = $ms->getAvailableVersions();
+        $executedUnavailableMigrations = array_diff($executedMigrations, array_keys($availableMigrations));
 
-		$numExecutedUnavailableMigrations = count($executedUnavailableMigrations);
-		$numNewMigrations = count(array_diff(array_keys($availableMigrations), $executedMigrations));
-		$pending = $ms->describeMigrationStep('lastest');
+        $numExecutedUnavailableMigrations = count($executedUnavailableMigrations);
+        $numNewMigrations = count(array_diff(array_keys($availableMigrations), $executedMigrations));
+        $pending = $ms->describeMigrationStep('lastest');
 
-		$infos = [
-			'App' => $ms->getApp(),
-			'Version Table Name' => $ms->getMigrationsTableName(),
-			'Migrations Namespace' => $ms->getMigrationsNamespace(),
-			'Migrations Directory' => $ms->getMigrationsDirectory(),
-			'Previous Version' => $this->getFormattedVersionAlias($ms, 'prev'),
-			'Current Version' => $this->getFormattedVersionAlias($ms, 'current'),
-			'Next Version' => $this->getFormattedVersionAlias($ms, 'next'),
-			'Latest Version' => $this->getFormattedVersionAlias($ms, 'latest'),
-			'Executed Migrations' => count($executedMigrations),
-			'Executed Unavailable Migrations' => $numExecutedUnavailableMigrations,
-			'Available Migrations' => count($availableMigrations),
-			'New Migrations' => $numNewMigrations,
-			'Pending Migrations' => count($pending) ? $pending : 'None'
-		];
+        $infos = [
+            'App' => $ms->getApp(),
+            'Version Table Name' => $ms->getMigrationsTableName(),
+            'Migrations Namespace' => $ms->getMigrationsNamespace(),
+            'Migrations Directory' => $ms->getMigrationsDirectory(),
+            'Previous Version' => $this->getFormattedVersionAlias($ms, 'prev'),
+            'Current Version' => $this->getFormattedVersionAlias($ms, 'current'),
+            'Next Version' => $this->getFormattedVersionAlias($ms, 'next'),
+            'Latest Version' => $this->getFormattedVersionAlias($ms, 'latest'),
+            'Executed Migrations' => count($executedMigrations),
+            'Executed Unavailable Migrations' => $numExecutedUnavailableMigrations,
+            'Available Migrations' => count($availableMigrations),
+            'New Migrations' => $numNewMigrations,
+            'Pending Migrations' => count($pending) ? $pending : 'None'
+        ];
 
-		return $infos;
-	}
+        return $infos;
+    }
 
-	/**
-	 * @param MigrationService $migrationService
-	 * @param string $alias
-	 * @return mixed|null|string
-	 */
-	private function getFormattedVersionAlias(MigrationService $migrationService, $alias) {
-		$migration = $migrationService->getMigration($alias);
-		//No version found
-		if ($migration === null) {
-			if ($alias === 'next') {
-				return 'Already at latest migration step';
-			}
+    /**
+     * @param MigrationService $migrationService
+     * @param string $alias
+     * @return mixed|null|string
+     */
+    private function getFormattedVersionAlias(MigrationService $migrationService, $alias) {
+        $migration = $migrationService->getMigration($alias);
+        //No version found
+        if ($migration === null) {
+            if ($alias === 'next') {
+                return 'Already at latest migration step';
+            }
 
-			if ($alias === 'prev') {
-				return 'Already at first migration step';
-			}
-		}
+            if ($alias === 'prev') {
+                return 'Already at first migration step';
+            }
+        }
 
-		return $migration;
-	}
+        return $migration;
+    }
 }

core/Command/Security/ListCertificates.php

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$outputType = $input->getOption('output');
 		if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-			$certificates = array_map(function (ICertificate $certificate) {
+			$certificates = array_map(function(ICertificate $certificate) {
 				return [
 					'name' => $certificate->getName(),
 					'common_name' => $certificate->getCommonName(),
@@ -79,7 +79,7 @@ 
 				'Issued By'
 			]);
 
-			$rows = array_map(function (ICertificate $certificate) {
+			$rows = array_map(function(ICertificate $certificate) {
 				return [
 					$certificate->getName(),
 					$certificate->getCommonName(),

Indentation +56 added lines, -56 removed lines

@@ -17,64 +17,64 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListCertificates extends Base {
-	protected IL10N $l;
+    protected IL10N $l;
 
-	public function __construct(
-		protected ICertificateManager $certificateManager,
-		IL10NFactory $l10nFactory,
-	) {
-		parent::__construct();
-		$this->l = $l10nFactory->get('core');
-	}
+    public function __construct(
+        protected ICertificateManager $certificateManager,
+        IL10NFactory $l10nFactory,
+    ) {
+        parent::__construct();
+        $this->l = $l10nFactory->get('core');
+    }
 
-	protected function configure() {
-		$this
-			->setName('security:certificates')
-			->setDescription('list trusted certificates');
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('security:certificates')
+            ->setDescription('list trusted certificates');
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$outputType = $input->getOption('output');
-		if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-			$certificates = array_map(function (ICertificate $certificate) {
-				return [
-					'name' => $certificate->getName(),
-					'common_name' => $certificate->getCommonName(),
-					'organization' => $certificate->getOrganization(),
-					'expire' => $certificate->getExpireDate()->format(\DateTimeInterface::ATOM),
-					'issuer' => $certificate->getIssuerName(),
-					'issuer_organization' => $certificate->getIssuerOrganization(),
-					'issue_date' => $certificate->getIssueDate()->format(\DateTimeInterface::ATOM)
-				];
-			}, $this->certificateManager->listCertificates());
-			if ($outputType === self::OUTPUT_FORMAT_JSON) {
-				$output->writeln(json_encode(array_values($certificates)));
-			} else {
-				$output->writeln(json_encode(array_values($certificates), JSON_PRETTY_PRINT));
-			}
-		} else {
-			$table = new Table($output);
-			$table->setHeaders([
-				'File Name',
-				'Common Name',
-				'Organization',
-				'Valid Until',
-				'Issued By'
-			]);
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $outputType = $input->getOption('output');
+        if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
+            $certificates = array_map(function (ICertificate $certificate) {
+                return [
+                    'name' => $certificate->getName(),
+                    'common_name' => $certificate->getCommonName(),
+                    'organization' => $certificate->getOrganization(),
+                    'expire' => $certificate->getExpireDate()->format(\DateTimeInterface::ATOM),
+                    'issuer' => $certificate->getIssuerName(),
+                    'issuer_organization' => $certificate->getIssuerOrganization(),
+                    'issue_date' => $certificate->getIssueDate()->format(\DateTimeInterface::ATOM)
+                ];
+            }, $this->certificateManager->listCertificates());
+            if ($outputType === self::OUTPUT_FORMAT_JSON) {
+                $output->writeln(json_encode(array_values($certificates)));
+            } else {
+                $output->writeln(json_encode(array_values($certificates), JSON_PRETTY_PRINT));
+            }
+        } else {
+            $table = new Table($output);
+            $table->setHeaders([
+                'File Name',
+                'Common Name',
+                'Organization',
+                'Valid Until',
+                'Issued By'
+            ]);
 
-			$rows = array_map(function (ICertificate $certificate) {
-				return [
-					$certificate->getName(),
-					$certificate->getCommonName(),
-					$certificate->getOrganization(),
-					$this->l->l('date', $certificate->getExpireDate()),
-					$certificate->getIssuerName()
-				];
-			}, $this->certificateManager->listCertificates());
-			$table->setRows($rows);
-			$table->render();
-		}
-		return 0;
-	}
+            $rows = array_map(function (ICertificate $certificate) {
+                return [
+                    $certificate->getName(),
+                    $certificate->getCommonName(),
+                    $certificate->getOrganization(),
+                    $this->l->l('date', $certificate->getExpireDate()),
+                    $certificate->getIssuerName()
+                ];
+            }, $this->certificateManager->listCertificates());
+            $table->setRows($rows);
+            $table->render();
+        }
+        return 0;
+    }
 }