nextcloud / server

apps/files_external/lib/Lib/Backend/AmazonS3.php

Indentation +26 added lines, -26 removed lines

@@ -33,32 +33,32 @@
 
 class AmazonS3 extends Backend {
 
-	use LegacyDependencyCheckPolyfill;
+    use LegacyDependencyCheckPolyfill;
 
-	public function __construct(IL10N $l, AccessKey $legacyAuth) {
-		$this
-			->setIdentifier('amazons3')
-			->addIdentifierAlias('\OC\Files\Storage\AmazonS3') // legacy compat
-			->setStorageClass('\OCA\Files_External\Lib\Storage\AmazonS3')
-			->setText($l->t('Amazon S3'))
-			->addParameters([
-				new DefinitionParameter('bucket', $l->t('Bucket')),
-				(new DefinitionParameter('hostname', $l->t('Hostname')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('port', $l->t('Port')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('region', $l->t('Region')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('use_ssl', $l->t('Enable SSL')))
-					->setType(DefinitionParameter::VALUE_BOOLEAN),
-				(new DefinitionParameter('use_path_style', $l->t('Enable Path Style')))
-					->setType(DefinitionParameter::VALUE_BOOLEAN),
-				(new DefinitionParameter('legacy_auth', $l->t('Legacy (v2) authentication')))
-					->setType(DefinitionParameter::VALUE_BOOLEAN),
-			])
-			->addAuthScheme(AccessKey::SCHEME_AMAZONS3_ACCESSKEY)
-			->setLegacyAuthMechanism($legacyAuth)
-		;
-	}
+    public function __construct(IL10N $l, AccessKey $legacyAuth) {
+        $this
+            ->setIdentifier('amazons3')
+            ->addIdentifierAlias('\OC\Files\Storage\AmazonS3') // legacy compat
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\AmazonS3')
+            ->setText($l->t('Amazon S3'))
+            ->addParameters([
+                new DefinitionParameter('bucket', $l->t('Bucket')),
+                (new DefinitionParameter('hostname', $l->t('Hostname')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('port', $l->t('Port')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('region', $l->t('Region')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('use_ssl', $l->t('Enable SSL')))
+                    ->setType(DefinitionParameter::VALUE_BOOLEAN),
+                (new DefinitionParameter('use_path_style', $l->t('Enable Path Style')))
+                    ->setType(DefinitionParameter::VALUE_BOOLEAN),
+                (new DefinitionParameter('legacy_auth', $l->t('Legacy (v2) authentication')))
+                    ->setType(DefinitionParameter::VALUE_BOOLEAN),
+            ])
+            ->addAuthScheme(AccessKey::SCHEME_AMAZONS3_ACCESSKEY)
+            ->setLegacyAuthMechanism($legacyAuth)
+        ;
+    }
 
 }

apps/files_external/lib/Lib/Backend/SFTP.php

Indentation +16 added lines, -16 removed lines

@@ -29,21 +29,21 @@
 
 class SFTP extends Backend {
 
-	public function __construct(IL10N $l, Password $legacyAuth) {
-		$this
-			->setIdentifier('sftp')
-			->addIdentifierAlias('\OC\Files\Storage\SFTP') // legacy compat
-			->setStorageClass('\OCA\Files_External\Lib\Storage\SFTP')
-			->setText($l->t('SFTP'))
-			->addParameters([
-				new DefinitionParameter('host', $l->t('Host')),
-				(new DefinitionParameter('root', $l->t('Root')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-			])
-			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
-			->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
-			->setLegacyAuthMechanism($legacyAuth)
-		;
-	}
+    public function __construct(IL10N $l, Password $legacyAuth) {
+        $this
+            ->setIdentifier('sftp')
+            ->addIdentifierAlias('\OC\Files\Storage\SFTP') // legacy compat
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\SFTP')
+            ->setText($l->t('SFTP'))
+            ->addParameters([
+                new DefinitionParameter('host', $l->t('Host')),
+                (new DefinitionParameter('root', $l->t('Root')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+            ])
+            ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
+            ->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
+            ->setLegacyAuthMechanism($legacyAuth)
+        ;
+    }
 
 }

core/Command/User/Info.php

Indentation +50 added lines, -50 removed lines

@@ -34,57 +34,57 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Info extends Base {
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IGroupManager */
-	protected $groupManager;
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var IGroupManager */
+    protected $groupManager;
 
-	/**
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		parent::__construct();
-	}
+    /**
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('user:info')
-			->setDescription('show user info')
-			->addArgument(
-				'user',
-				InputArgument::REQUIRED,
-				'user to show'
-			)->addOption(
-				'output',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'Output format (plain, json or json_pretty, default is plain)',
-				$this->defaultOutputFormat
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('user:info')
+            ->setDescription('show user info')
+            ->addArgument(
+                'user',
+                InputArgument::REQUIRED,
+                'user to show'
+            )->addOption(
+                'output',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Output format (plain, json or json_pretty, default is plain)',
+                $this->defaultOutputFormat
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$user = $this->userManager->get($input->getArgument('user'));
-		if (is_null($user)) {
-			$output->writeln('<error>user not found</error>');
-			return 1;
-		}
-		$groups = $this->groupManager->getUserGroupIds($user);
-		$data = [
-			'user_id' => $user->getUID(),
-			'display_name' => $user->getDisplayName(),
-			'email' => $user->getEMailAddress() ? $user->getEMailAddress() : '',
-			'cloud_id' => $user->getCloudId(),
-			'enabled' => $user->isEnabled(),
-			'groups' => $groups,
-			'quota' => $user->getQuota(),
-			'last_seen' => date(\DateTime::ATOM, $user->getLastLogin()), // ISO-8601
-			'user_directory' => $user->getHome(),
-			'backend' => $user->getBackendClassName()
-		];
-		$this->writeArrayInOutputFormat($input, $output, $data);
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $user = $this->userManager->get($input->getArgument('user'));
+        if (is_null($user)) {
+            $output->writeln('<error>user not found</error>');
+            return 1;
+        }
+        $groups = $this->groupManager->getUserGroupIds($user);
+        $data = [
+            'user_id' => $user->getUID(),
+            'display_name' => $user->getDisplayName(),
+            'email' => $user->getEMailAddress() ? $user->getEMailAddress() : '',
+            'cloud_id' => $user->getCloudId(),
+            'enabled' => $user->isEnabled(),
+            'groups' => $groups,
+            'quota' => $user->getQuota(),
+            'last_seen' => date(\DateTime::ATOM, $user->getLastLogin()), // ISO-8601
+            'user_directory' => $user->getHome(),
+            'backend' => $user->getBackendClassName()
+        ];
+        $this->writeArrayInOutputFormat($input, $output, $data);
+    }
 }

lib/public/Files/SimpleFS/ISimpleRoot.php

Indentation +29 added lines, -29 removed lines

@@ -34,35 +34,35 @@
  * @since 11.0.0
  */
 interface ISimpleRoot {
-	/**
-	 * Get the folder with name $name
-	 *
-	 * @param string $name
-	 * @return ISimpleFolder
-	 * @throws NotFoundException
-	 * @throws \RuntimeException
-	 * @since 11.0.0
-	 */
-	public function getFolder(string $name): ISimpleFolder;
+    /**
+     * Get the folder with name $name
+     *
+     * @param string $name
+     * @return ISimpleFolder
+     * @throws NotFoundException
+     * @throws \RuntimeException
+     * @since 11.0.0
+     */
+    public function getFolder(string $name): ISimpleFolder;
 
-	/**
-	 * Get all the Folders
-	 *
-	 * @return ISimpleFolder[]
-	 * @throws NotFoundException
-	 * @throws \RuntimeException
-	 * @since 11.0.0
-	 */
-	public function getDirectoryListing(): array;
+    /**
+     * Get all the Folders
+     *
+     * @return ISimpleFolder[]
+     * @throws NotFoundException
+     * @throws \RuntimeException
+     * @since 11.0.0
+     */
+    public function getDirectoryListing(): array;
 
-	/**
-	 * Create a new folder named $name
-	 *
-	 * @param string $name
-	 * @return ISimpleFolder
-	 * @throws NotPermittedException
-	 * @throws \RuntimeException
-	 * @since 11.0.0
-	 */
-	public function newFolder(string $name): ISimpleFolder;
+    /**
+     * Create a new folder named $name
+     *
+     * @param string $name
+     * @return ISimpleFolder
+     * @throws NotPermittedException
+     * @throws \RuntimeException
+     * @since 11.0.0
+     */
+    public function newFolder(string $name): ISimpleFolder;
 }

apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php

Indentation +40 added lines, -40 removed lines

@@ -26,54 +26,54 @@
 
 class InvalidPath extends Exception {
 
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/**
-	 * @var bool
-	 */
-	private $retry;
+    /**
+     * @var bool
+     */
+    private $retry;
 
-	/**
-	 * @param string $message
-	 * @param bool $retry
-	 * @param \Exception|null $previous
-	 */
-	public function __construct($message, $retry = false, \Exception $previous = null) {
-		parent::__construct($message, 0, $previous);
-		$this->retry = $retry;
-	}
+    /**
+     * @param string $message
+     * @param bool $retry
+     * @param \Exception|null $previous
+     */
+    public function __construct($message, $retry = false, \Exception $previous = null) {
+        parent::__construct($message, 0, $previous);
+        $this->retry = $retry;
+    }
 
-	/**
-	 * Returns the HTTP status code for this exception
-	 *
-	 * @return int
-	 */
-	public function getHTTPCode() {
+    /**
+     * Returns the HTTP status code for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
 
-		return 400;
+        return 400;
 
-	}
+    }
 
-	/**
-	 * This method allows the exception to include additional information
-	 * into the WebDAV error response
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @param \DOMElement $errorNode
-	 * @return void
-	 */
-	public function serialize(\Sabre\DAV\Server $server,\DOMElement $errorNode) {
+    /**
+     * This method allows the exception to include additional information
+     * into the WebDAV error response
+     *
+     * @param \Sabre\DAV\Server $server
+     * @param \DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(\Sabre\DAV\Server $server,\DOMElement $errorNode) {
 
-		// set ownCloud namespace
-		$errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD);
+        // set ownCloud namespace
+        $errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD);
 
-		// adding the retry node
-		$error = $errorNode->ownerDocument->createElementNS('o:','o:retry', var_export($this->retry, true));
-		$errorNode->appendChild($error);
+        // adding the retry node
+        $error = $errorNode->ownerDocument->createElementNS('o:','o:retry', var_export($this->retry, true));
+        $errorNode->appendChild($error);
 
-		// adding the message node
-		$error = $errorNode->ownerDocument->createElementNS('o:','o:reason', $this->getMessage());
-		$errorNode->appendChild($error);
-	}
+        // adding the message node
+        $error = $errorNode->ownerDocument->createElementNS('o:','o:reason', $this->getMessage());
+        $errorNode->appendChild($error);
+    }
 
 }

core/Controller/OCJSController.php

Indentation +54 added lines, -54 removed lines

@@ -43,62 +43,62 @@
 
 class OCJSController extends Controller {
 
-	/** @var JSConfigHelper */
-	private $helper;
+    /** @var JSConfigHelper */
+    private $helper;
 
-	/**
-	 * OCJSController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IFactory $l10nFactory
-	 * @param Defaults $defaults
-	 * @param IAppManager $appManager
-	 * @param ISession $session
-	 * @param IUserSession $userSession
-	 * @param IConfig $config
-	 * @param IGroupManager $groupManager
-	 * @param IniGetWrapper $iniWrapper
-	 * @param IURLGenerator $urlGenerator
-	 * @param CapabilitiesManager $capabilitiesManager
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IFactory $l10nFactory,
-								Defaults $defaults,
-								IAppManager $appManager,
-								ISession $session,
-								IUserSession $userSession,
-								IConfig $config,
-								IGroupManager $groupManager,
-								IniGetWrapper $iniWrapper,
-								IURLGenerator $urlGenerator,
-								CapabilitiesManager $capabilitiesManager) {
-		parent::__construct($appName, $request);
+    /**
+     * OCJSController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IFactory $l10nFactory
+     * @param Defaults $defaults
+     * @param IAppManager $appManager
+     * @param ISession $session
+     * @param IUserSession $userSession
+     * @param IConfig $config
+     * @param IGroupManager $groupManager
+     * @param IniGetWrapper $iniWrapper
+     * @param IURLGenerator $urlGenerator
+     * @param CapabilitiesManager $capabilitiesManager
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IFactory $l10nFactory,
+                                Defaults $defaults,
+                                IAppManager $appManager,
+                                ISession $session,
+                                IUserSession $userSession,
+                                IConfig $config,
+                                IGroupManager $groupManager,
+                                IniGetWrapper $iniWrapper,
+                                IURLGenerator $urlGenerator,
+                                CapabilitiesManager $capabilitiesManager) {
+        parent::__construct($appName, $request);
 
-		$this->helper = new JSConfigHelper(
-			$l10nFactory->get('lib'),
-			$defaults,
-			$appManager,
-			$session,
-			$userSession->getUser(),
-			$config,
-			$groupManager,
-			$iniWrapper,
-			$urlGenerator,
-			$capabilitiesManager
-		);
-	}
+        $this->helper = new JSConfigHelper(
+            $l10nFactory->get('lib'),
+            $defaults,
+            $appManager,
+            $session,
+            $userSession->getUser(),
+            $config,
+            $groupManager,
+            $iniWrapper,
+            $urlGenerator,
+            $capabilitiesManager
+        );
+    }
 
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * @return DataDisplayResponse
-	 */
-	public function getConfig() {
-		$data = $this->helper->getConfig();
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * @return DataDisplayResponse
+     */
+    public function getConfig() {
+        $data = $this->helper->getConfig();
 
-		return new DataDisplayResponse($data, Http::STATUS_OK, ['Content-type' => 'text/javascript']);
-	}
+        return new DataDisplayResponse($data, Http::STATUS_OK, ['Content-type' => 'text/javascript']);
+    }
 }

lib/private/App/Platform.php

Indentation +53 added lines, -53 removed lines

@@ -35,65 +35,65 @@
  */
 class Platform {
 
-	/**
-	 * @param IConfig $config
-	 */
-	function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getPhpVersion() {
-		return phpversion();
-	}
+    /**
+     * @return string
+     */
+    public function getPhpVersion() {
+        return phpversion();
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getIntSize() {
-		return PHP_INT_SIZE;
-	}
+    /**
+     * @return int
+     */
+    public function getIntSize() {
+        return PHP_INT_SIZE;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getOcVersion() {
-		$v = \OCP\Util::getVersion();
-		return implode('.', $v);
-	}
+    /**
+     * @return string
+     */
+    public function getOcVersion() {
+        $v = \OCP\Util::getVersion();
+        return implode('.', $v);
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getDatabase() {
-		$dbType = $this->config->getSystemValue('dbtype', 'sqlite');
-		if ($dbType === 'sqlite3') {
-			$dbType = 'sqlite';
-		}
+    /**
+     * @return string
+     */
+    public function getDatabase() {
+        $dbType = $this->config->getSystemValue('dbtype', 'sqlite');
+        if ($dbType === 'sqlite3') {
+            $dbType = 'sqlite';
+        }
 
-		return $dbType;
-	}
+        return $dbType;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getOS() {
-		return php_uname('s');
-	}
+    /**
+     * @return string
+     */
+    public function getOS() {
+        return php_uname('s');
+    }
 
-	/**
-	 * @param $command
-	 * @return bool
-	 */
-	public function isCommandKnown($command) {
-		$path = \OC_Helper::findBinaryPath($command);
-		return ($path !== null);
-	}
+    /**
+     * @param $command
+     * @return bool
+     */
+    public function isCommandKnown($command) {
+        $path = \OC_Helper::findBinaryPath($command);
+        return ($path !== null);
+    }
 
-	public function getLibraryVersion($name) {
-		$repo = new PlatformRepository();
-		return $repo->findLibrary($name);
-	}
+    public function getLibraryVersion($name) {
+        $repo = new PlatformRepository();
+        return $repo->findLibrary($name);
+    }
 }

core/Command/Config/System/DeleteConfig.php

Indentation +73 added lines, -73 removed lines

@@ -29,89 +29,89 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class DeleteConfig extends Base {
-	/** * @var SystemConfig */
-	protected $systemConfig;
+    /** * @var SystemConfig */
+    protected $systemConfig;
 
-	/**
-	 * @param SystemConfig $systemConfig
-	 */
-	public function __construct(SystemConfig $systemConfig) {
-		parent::__construct();
-		$this->systemConfig = $systemConfig;
-	}
+    /**
+     * @param SystemConfig $systemConfig
+     */
+    public function __construct(SystemConfig $systemConfig) {
+        parent::__construct();
+        $this->systemConfig = $systemConfig;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('config:system:delete')
-			->setDescription('Delete a system config value')
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED | InputArgument::IS_ARRAY,
-				'Name of the config to delete, specify multiple for array parameter'
-			)
-			->addOption(
-				'error-if-not-exists',
-				null,
-				InputOption::VALUE_NONE,
-				'Checks whether the config exists before deleting it'
-			)
-		;
-	}
+        $this
+            ->setName('config:system:delete')
+            ->setDescription('Delete a system config value')
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED | InputArgument::IS_ARRAY,
+                'Name of the config to delete, specify multiple for array parameter'
+            )
+            ->addOption(
+                'error-if-not-exists',
+                null,
+                InputOption::VALUE_NONE,
+                'Checks whether the config exists before deleting it'
+            )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$configNames = $input->getArgument('name');
-		$configName = $configNames[0];
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $configNames = $input->getArgument('name');
+        $configName = $configNames[0];
 
-		if (count($configNames) > 1) {
-			if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
-				$output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
-				return 1;
-			}
+        if (count($configNames) > 1) {
+            if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
+                $output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
+                return 1;
+            }
 
-			$value = $this->systemConfig->getValue($configName);
+            $value = $this->systemConfig->getValue($configName);
 
-			try {
-				$value = $this->removeSubValue(array_slice($configNames, 1), $value, $input->hasParameterOption('--error-if-not-exists'));
-			}
-			catch (\UnexpectedValueException $e) {
-				$output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
-				return 1;
-			}
+            try {
+                $value = $this->removeSubValue(array_slice($configNames, 1), $value, $input->hasParameterOption('--error-if-not-exists'));
+            }
+            catch (\UnexpectedValueException $e) {
+                $output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
+                return 1;
+            }
 
-			$this->systemConfig->setValue($configName, $value);
-			$output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' deleted</info>');
-			return 0;
-		} else {
-			if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
-				$output->writeln('<error>System config ' . $configName . ' could not be deleted because it did not exist</error>');
-				return 1;
-			}
+            $this->systemConfig->setValue($configName, $value);
+            $output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' deleted</info>');
+            return 0;
+        } else {
+            if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
+                $output->writeln('<error>System config ' . $configName . ' could not be deleted because it did not exist</error>');
+                return 1;
+            }
 
-			$this->systemConfig->deleteValue($configName);
-			$output->writeln('<info>System config value ' . $configName . ' deleted</info>');
-			return 0;
-		}
-	}
+            $this->systemConfig->deleteValue($configName);
+            $output->writeln('<info>System config value ' . $configName . ' deleted</info>');
+            return 0;
+        }
+    }
 
-	protected function removeSubValue($keys, $currentValue, $throwError) {
-		$nextKey = array_shift($keys);
+    protected function removeSubValue($keys, $currentValue, $throwError) {
+        $nextKey = array_shift($keys);
 
-		if (is_array($currentValue)) {
-			if (isset($currentValue[$nextKey])) {
-				if (empty($keys)) {
-					unset($currentValue[$nextKey]);
-				} else {
-					$currentValue[$nextKey] = $this->removeSubValue($keys, $currentValue[$nextKey], $throwError);
-				}
-			} else if ($throwError) {
-				throw new \UnexpectedValueException('Config parameter does not exist');
-			}
-		} else if ($throwError) {
-			throw new \UnexpectedValueException('Config parameter does not exist');
-		}
+        if (is_array($currentValue)) {
+            if (isset($currentValue[$nextKey])) {
+                if (empty($keys)) {
+                    unset($currentValue[$nextKey]);
+                } else {
+                    $currentValue[$nextKey] = $this->removeSubValue($keys, $currentValue[$nextKey], $throwError);
+                }
+            } else if ($throwError) {
+                throw new \UnexpectedValueException('Config parameter does not exist');
+            }
+        } else if ($throwError) {
+            throw new \UnexpectedValueException('Config parameter does not exist');
+        }
 
-		return $currentValue;
-	}
+        return $currentValue;
+    }
 }

core/Command/Config/System/SetConfig.php

Indentation +176 added lines, -176 removed lines

@@ -31,180 +31,180 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SetConfig extends Base {
-	/** * @var SystemConfig */
-	protected $systemConfig;
-
-	/**
-	 * @param SystemConfig $systemConfig
-	 */
-	public function __construct(SystemConfig $systemConfig) {
-		parent::__construct();
-		$this->systemConfig = $systemConfig;
-	}
-
-	protected function configure() {
-		parent::configure();
-
-		$this
-			->setName('config:system:set')
-			->setDescription('Set a system config value')
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED | InputArgument::IS_ARRAY,
-				'Name of the config parameter, specify multiple for array parameter'
-			)
-			->addOption(
-				'type',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'Value type [string, integer, double, boolean]',
-				'string'
-			)
-			->addOption(
-				'value',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'The new value of the config'
-			)
-			->addOption(
-				'update-only',
-				null,
-				InputOption::VALUE_NONE,
-				'Only updates the value, if it is not set before, it is not being added'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$configNames = $input->getArgument('name');
-		$configName = $configNames[0];
-		$configValue = $this->castValue($input->getOption('value'), $input->getOption('type'));
-		$updateOnly = $input->getOption('update-only');
-
-		if (count($configNames) > 1) {
-			$existingValue = $this->systemConfig->getValue($configName);
-
-			$newValue = $this->mergeArrayValue(
-				array_slice($configNames, 1), $existingValue, $configValue['value'], $updateOnly
-			);
-
-			$this->systemConfig->setValue($configName, $newValue);
-		} else {
-			if ($updateOnly && !in_array($configName, $this->systemConfig->getKeys(), true)) {
-				throw new \UnexpectedValueException('Config parameter does not exist');
-			}
-
-			$this->systemConfig->setValue($configName, $configValue['value']);
-		}
-
-		$output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' set to ' . $configValue['readable-value'] . '</info>');
-		return 0;
-	}
-
-	/**
-	 * @param string $value
-	 * @param string $type
-	 * @return mixed
-	 * @throws \InvalidArgumentException
-	 */
-	protected function castValue($value, $type) {
-		switch ($type) {
-			case 'integer':
-			case 'int':
-				if (!is_numeric($value)) {
-					throw new \InvalidArgumentException('Non-numeric value specified');
-				}
-				return [
-					'value' => (int) $value,
-					'readable-value' => 'integer ' . (int) $value,
-				];
-
-			case 'double':
-			case 'float':
-				if (!is_numeric($value)) {
-					throw new \InvalidArgumentException('Non-numeric value specified');
-				}
-				return [
-					'value' => (double) $value,
-					'readable-value' => 'double ' . (double) $value,
-				];
-
-			case 'boolean':
-			case 'bool':
-				$value = strtolower($value);
-				switch ($value) {
-					case 'true':
-						return [
-							'value' => true,
-							'readable-value' => 'boolean ' . $value,
-						];
-
-					case 'false':
-						return [
-							'value' => false,
-							'readable-value' => 'boolean ' . $value,
-						];
-
-					default:
-						throw new \InvalidArgumentException('Unable to parse value as boolean');
-				}
-
-			case 'null':
-				return [
-					'value' => null,
-					'readable-value' => 'null',
-				];
-
-			case 'string':
-				$value = (string) $value;
-				return [
-					'value' => $value,
-					'readable-value' => ($value === '') ? 'empty string' : 'string ' . $value,
-				];
-
-			default:
-				throw new \InvalidArgumentException('Invalid type');
-		}
-	}
-
-	/**
-	 * @param array $configNames
-	 * @param mixed $existingValues
-	 * @param mixed $value
-	 * @param bool $updateOnly
-	 * @return array merged value
-	 * @throws \UnexpectedValueException
-	 */
-	protected function mergeArrayValue(array $configNames, $existingValues, $value, $updateOnly) {
-		$configName = array_shift($configNames);
-		if (!is_array($existingValues)) {
-			$existingValues = [];
-		}
-		if (!empty($configNames)) {
-			if (isset($existingValues[$configName])) {
-				$existingValue = $existingValues[$configName];
-			} else {
-				$existingValue = [];
-			}
-			$existingValues[$configName] = $this->mergeArrayValue($configNames, $existingValue, $value, $updateOnly);
-		} else {
-			if (!isset($existingValues[$configName]) && $updateOnly) {
-				throw new \UnexpectedValueException('Config parameter does not exist');
-			}
-			$existingValues[$configName] = $value;
-		}
-		return $existingValues;
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		if ($optionName === 'type') {
-			return ['string', 'integer', 'double', 'boolean'];
-		}
-		return parent::completeOptionValues($optionName, $context);
-	}
+    /** * @var SystemConfig */
+    protected $systemConfig;
+
+    /**
+     * @param SystemConfig $systemConfig
+     */
+    public function __construct(SystemConfig $systemConfig) {
+        parent::__construct();
+        $this->systemConfig = $systemConfig;
+    }
+
+    protected function configure() {
+        parent::configure();
+
+        $this
+            ->setName('config:system:set')
+            ->setDescription('Set a system config value')
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED | InputArgument::IS_ARRAY,
+                'Name of the config parameter, specify multiple for array parameter'
+            )
+            ->addOption(
+                'type',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'Value type [string, integer, double, boolean]',
+                'string'
+            )
+            ->addOption(
+                'value',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'The new value of the config'
+            )
+            ->addOption(
+                'update-only',
+                null,
+                InputOption::VALUE_NONE,
+                'Only updates the value, if it is not set before, it is not being added'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $configNames = $input->getArgument('name');
+        $configName = $configNames[0];
+        $configValue = $this->castValue($input->getOption('value'), $input->getOption('type'));
+        $updateOnly = $input->getOption('update-only');
+
+        if (count($configNames) > 1) {
+            $existingValue = $this->systemConfig->getValue($configName);
+
+            $newValue = $this->mergeArrayValue(
+                array_slice($configNames, 1), $existingValue, $configValue['value'], $updateOnly
+            );
+
+            $this->systemConfig->setValue($configName, $newValue);
+        } else {
+            if ($updateOnly && !in_array($configName, $this->systemConfig->getKeys(), true)) {
+                throw new \UnexpectedValueException('Config parameter does not exist');
+            }
+
+            $this->systemConfig->setValue($configName, $configValue['value']);
+        }
+
+        $output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' set to ' . $configValue['readable-value'] . '</info>');
+        return 0;
+    }
+
+    /**
+     * @param string $value
+     * @param string $type
+     * @return mixed
+     * @throws \InvalidArgumentException
+     */
+    protected function castValue($value, $type) {
+        switch ($type) {
+            case 'integer':
+            case 'int':
+                if (!is_numeric($value)) {
+                    throw new \InvalidArgumentException('Non-numeric value specified');
+                }
+                return [
+                    'value' => (int) $value,
+                    'readable-value' => 'integer ' . (int) $value,
+                ];
+
+            case 'double':
+            case 'float':
+                if (!is_numeric($value)) {
+                    throw new \InvalidArgumentException('Non-numeric value specified');
+                }
+                return [
+                    'value' => (double) $value,
+                    'readable-value' => 'double ' . (double) $value,
+                ];
+
+            case 'boolean':
+            case 'bool':
+                $value = strtolower($value);
+                switch ($value) {
+                    case 'true':
+                        return [
+                            'value' => true,
+                            'readable-value' => 'boolean ' . $value,
+                        ];
+
+                    case 'false':
+                        return [
+                            'value' => false,
+                            'readable-value' => 'boolean ' . $value,
+                        ];
+
+                    default:
+                        throw new \InvalidArgumentException('Unable to parse value as boolean');
+                }
+
+            case 'null':
+                return [
+                    'value' => null,
+                    'readable-value' => 'null',
+                ];
+
+            case 'string':
+                $value = (string) $value;
+                return [
+                    'value' => $value,
+                    'readable-value' => ($value === '') ? 'empty string' : 'string ' . $value,
+                ];
+
+            default:
+                throw new \InvalidArgumentException('Invalid type');
+        }
+    }
+
+    /**
+     * @param array $configNames
+     * @param mixed $existingValues
+     * @param mixed $value
+     * @param bool $updateOnly
+     * @return array merged value
+     * @throws \UnexpectedValueException
+     */
+    protected function mergeArrayValue(array $configNames, $existingValues, $value, $updateOnly) {
+        $configName = array_shift($configNames);
+        if (!is_array($existingValues)) {
+            $existingValues = [];
+        }
+        if (!empty($configNames)) {
+            if (isset($existingValues[$configName])) {
+                $existingValue = $existingValues[$configName];
+            } else {
+                $existingValue = [];
+            }
+            $existingValues[$configName] = $this->mergeArrayValue($configNames, $existingValue, $value, $updateOnly);
+        } else {
+            if (!isset($existingValues[$configName]) && $updateOnly) {
+                throw new \UnexpectedValueException('Config parameter does not exist');
+            }
+            $existingValues[$configName] = $value;
+        }
+        return $existingValues;
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        if ($optionName === 'type') {
+            return ['string', 'integer', 'double', 'boolean'];
+        }
+        return parent::completeOptionValues($optionName, $context);
+    }
 }