nextcloud / server

lib/public/User.php

Indentation +35 added lines, -35 removed lines

@@ -47,42 +47,42 @@
  * @deprecated 13.0.0
  */
 class User {
-	/**
-	 * Get the user id of the user currently logged in.
-	 * @return string uid or false
-	 * @deprecated 8.0.0 Use \OC::$server->getUserSession()->getUser()->getUID()
-	 * @since 5.0.0
-	 */
-	public static function getUser() {
-		return \OC_User::getUser();
-	}
+    /**
+     * Get the user id of the user currently logged in.
+     * @return string uid or false
+     * @deprecated 8.0.0 Use \OC::$server->getUserSession()->getUser()->getUID()
+     * @since 5.0.0
+     */
+    public static function getUser() {
+        return \OC_User::getUser();
+    }
 
-	/**
-	 * Check if the user is logged in
-	 * @return boolean
-	 * @since 5.0.0
-	 * @deprecated 13.0.0 Use annotation based ACLs from the AppFramework instead
-	 */
-	public static function isLoggedIn() {
-		return \OC::$server->getUserSession()->isLoggedIn();
-	}
+    /**
+     * Check if the user is logged in
+     * @return boolean
+     * @since 5.0.0
+     * @deprecated 13.0.0 Use annotation based ACLs from the AppFramework instead
+     */
+    public static function isLoggedIn() {
+        return \OC::$server->getUserSession()->isLoggedIn();
+    }
 
-	/**
-	 * Check if the user is a admin, redirects to home if not
-	 * @since 5.0.0
-	 * @deprecated 13.0.0 Use annotation based ACLs from the AppFramework instead
-	 */
-	public static function checkAdminUser() {
-		\OC_Util::checkAdminUser();
-	}
+    /**
+     * Check if the user is a admin, redirects to home if not
+     * @since 5.0.0
+     * @deprecated 13.0.0 Use annotation based ACLs from the AppFramework instead
+     */
+    public static function checkAdminUser() {
+        \OC_Util::checkAdminUser();
+    }
 
-	/**
-	 * Check if the user is logged in, redirects to home if not. With
-	 * redirect URL parameter to the request URI.
-	 * @since 5.0.0
-	 * @deprecated 13.0.0 Use annotation based ACLs from the AppFramework instead
-	 */
-	public static function checkLoggedIn() {
-		\OC_Util::checkLoggedIn();
-	}
+    /**
+     * Check if the user is logged in, redirects to home if not. With
+     * redirect URL parameter to the request URI.
+     * @since 5.0.0
+     * @deprecated 13.0.0 Use annotation based ACLs from the AppFramework instead
+     */
+    public static function checkLoggedIn() {
+        \OC_Util::checkLoggedIn();
+    }
 }

lib/public/Authentication/TwoFactorAuth/IProvidesCustomCSP.php

Indentation +6 added lines, -6 removed lines

@@ -31,10 +31,10 @@
  */
 interface IProvidesCustomCSP {
 
-	/**
-	 * @return ContentSecurityPolicy
-	 *
-	 * @since 13.0.0
-	 */
-	public function getCSP(): ContentSecurityPolicy;
+    /**
+     * @return ContentSecurityPolicy
+     *
+     * @since 13.0.0
+     */
+    public function getCSP(): ContentSecurityPolicy;
 }

apps/provisioning_api/composer/composer/autoload_static.php

Spacing +16 added lines, -16 removed lines

@@ -6,35 +6,35 @@
 
 class ComposerStaticInitProvisioning_API
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Provisioning_API\\' => 21,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Provisioning_API\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'OCA\\Provisioning_API\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Provisioning_API\\Controller\\AUserData' => __DIR__ . '/..' . '/../lib/Controller/AUserData.php',
-        'OCA\\Provisioning_API\\Controller\\AppConfigController' => __DIR__ . '/..' . '/../lib/Controller/AppConfigController.php',
-        'OCA\\Provisioning_API\\Controller\\AppsController' => __DIR__ . '/..' . '/../lib/Controller/AppsController.php',
-        'OCA\\Provisioning_API\\Controller\\GroupsController' => __DIR__ . '/..' . '/../lib/Controller/GroupsController.php',
-        'OCA\\Provisioning_API\\Controller\\UsersController' => __DIR__ . '/..' . '/../lib/Controller/UsersController.php',
-        'OCA\\Provisioning_API\\FederatedFileSharingFactory' => __DIR__ . '/..' . '/../lib/FederatedFileSharingFactory.php',
-        'OCA\\Provisioning_API\\Middleware\\Exceptions\\NotSubAdminException' => __DIR__ . '/..' . '/../lib/Middleware/Exceptions/NotSubAdminException.php',
-        'OCA\\Provisioning_API\\Middleware\\ProvisioningApiMiddleware' => __DIR__ . '/..' . '/../lib/Middleware/ProvisioningApiMiddleware.php',
+    public static $classMap = array(
+        'OCA\\Provisioning_API\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Provisioning_API\\Controller\\AUserData' => __DIR__.'/..'.'/../lib/Controller/AUserData.php',
+        'OCA\\Provisioning_API\\Controller\\AppConfigController' => __DIR__.'/..'.'/../lib/Controller/AppConfigController.php',
+        'OCA\\Provisioning_API\\Controller\\AppsController' => __DIR__.'/..'.'/../lib/Controller/AppsController.php',
+        'OCA\\Provisioning_API\\Controller\\GroupsController' => __DIR__.'/..'.'/../lib/Controller/GroupsController.php',
+        'OCA\\Provisioning_API\\Controller\\UsersController' => __DIR__.'/..'.'/../lib/Controller/UsersController.php',
+        'OCA\\Provisioning_API\\FederatedFileSharingFactory' => __DIR__.'/..'.'/../lib/FederatedFileSharingFactory.php',
+        'OCA\\Provisioning_API\\Middleware\\Exceptions\\NotSubAdminException' => __DIR__.'/..'.'/../lib/Middleware/Exceptions/NotSubAdminException.php',
+        'OCA\\Provisioning_API\\Middleware\\ProvisioningApiMiddleware' => __DIR__.'/..'.'/../lib/Middleware/ProvisioningApiMiddleware.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitProvisioning_API::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitProvisioning_API::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitProvisioning_API::$classMap;

apps/provisioning_api/composer/composer/autoload_classmap.php

Spacing +9 added lines, -9 removed lines

@@ -6,13 +6,13 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Provisioning_API\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Provisioning_API\\Controller\\AUserData' => $baseDir . '/../lib/Controller/AUserData.php',
-    'OCA\\Provisioning_API\\Controller\\AppConfigController' => $baseDir . '/../lib/Controller/AppConfigController.php',
-    'OCA\\Provisioning_API\\Controller\\AppsController' => $baseDir . '/../lib/Controller/AppsController.php',
-    'OCA\\Provisioning_API\\Controller\\GroupsController' => $baseDir . '/../lib/Controller/GroupsController.php',
-    'OCA\\Provisioning_API\\Controller\\UsersController' => $baseDir . '/../lib/Controller/UsersController.php',
-    'OCA\\Provisioning_API\\FederatedFileSharingFactory' => $baseDir . '/../lib/FederatedFileSharingFactory.php',
-    'OCA\\Provisioning_API\\Middleware\\Exceptions\\NotSubAdminException' => $baseDir . '/../lib/Middleware/Exceptions/NotSubAdminException.php',
-    'OCA\\Provisioning_API\\Middleware\\ProvisioningApiMiddleware' => $baseDir . '/../lib/Middleware/ProvisioningApiMiddleware.php',
+    'OCA\\Provisioning_API\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Provisioning_API\\Controller\\AUserData' => $baseDir.'/../lib/Controller/AUserData.php',
+    'OCA\\Provisioning_API\\Controller\\AppConfigController' => $baseDir.'/../lib/Controller/AppConfigController.php',
+    'OCA\\Provisioning_API\\Controller\\AppsController' => $baseDir.'/../lib/Controller/AppsController.php',
+    'OCA\\Provisioning_API\\Controller\\GroupsController' => $baseDir.'/../lib/Controller/GroupsController.php',
+    'OCA\\Provisioning_API\\Controller\\UsersController' => $baseDir.'/../lib/Controller/UsersController.php',
+    'OCA\\Provisioning_API\\FederatedFileSharingFactory' => $baseDir.'/../lib/FederatedFileSharingFactory.php',
+    'OCA\\Provisioning_API\\Middleware\\Exceptions\\NotSubAdminException' => $baseDir.'/../lib/Middleware/Exceptions/NotSubAdminException.php',
+    'OCA\\Provisioning_API\\Middleware\\ProvisioningApiMiddleware' => $baseDir.'/../lib/Middleware/ProvisioningApiMiddleware.php',
 );

lib/public/Files/Mount/IMountManager.php

Indentation +65 added lines, -65 removed lines

@@ -32,77 +32,77 @@
  */
 interface IMountManager {
 
-	/**
-	 * Add a new mount
-	 *
-	 * @param \OCP\Files\Mount\IMountPoint $mount
-	 * @since 8.2.0
-	 */
-	public function addMount(IMountPoint $mount);
+    /**
+     * Add a new mount
+     *
+     * @param \OCP\Files\Mount\IMountPoint $mount
+     * @since 8.2.0
+     */
+    public function addMount(IMountPoint $mount);
 
-	/**
-	 * Remove a mount
-	 *
-	 * @param string $mountPoint
-	 * @since 8.2.0
-	 */
-	public function removeMount(string $mountPoint);
+    /**
+     * Remove a mount
+     *
+     * @param string $mountPoint
+     * @since 8.2.0
+     */
+    public function removeMount(string $mountPoint);
 
-	/**
-	 * Change the location of a mount
-	 *
-	 * @param string $mountPoint
-	 * @param string $target
-	 * @since 8.2.0
-	 */
-	public function moveMount(string $mountPoint, string $target);
+    /**
+     * Change the location of a mount
+     *
+     * @param string $mountPoint
+     * @param string $target
+     * @since 8.2.0
+     */
+    public function moveMount(string $mountPoint, string $target);
 
-	/**
-	 * Find the mount for $path
-	 *
-	 * @param string $path
-	 * @return \OCP\Files\Mount\IMountPoint|null
-	 * @since 8.2.0
-	 */
-	public function find(string $path);
+    /**
+     * Find the mount for $path
+     *
+     * @param string $path
+     * @return \OCP\Files\Mount\IMountPoint|null
+     * @since 8.2.0
+     */
+    public function find(string $path);
 
-	/**
-	 * Find all mounts in $path
-	 *
-	 * @param string $path
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 * @since 8.2.0
-	 */
-	public function findIn(string $path): array;
+    /**
+     * Find all mounts in $path
+     *
+     * @param string $path
+     * @return \OCP\Files\Mount\IMountPoint[]
+     * @since 8.2.0
+     */
+    public function findIn(string $path): array;
 
-	/**
-	 * Remove all registered mounts
-	 *
-	 * @since 8.2.0
-	 */
-	public function clear();
+    /**
+     * Remove all registered mounts
+     *
+     * @since 8.2.0
+     */
+    public function clear();
 
-	/**
-	 * Find mounts by storage id
-	 *
-	 * @param string $id
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 * @since 8.2.0
-	 */
-	public function findByStorageId(string $id): array;
+    /**
+     * Find mounts by storage id
+     *
+     * @param string $id
+     * @return \OCP\Files\Mount\IMountPoint[]
+     * @since 8.2.0
+     */
+    public function findByStorageId(string $id): array;
 
-	/**
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 * @since 8.2.0
-	 */
-	public function getAll(): array;
+    /**
+     * @return \OCP\Files\Mount\IMountPoint[]
+     * @since 8.2.0
+     */
+    public function getAll(): array;
 
-	/**
-	 * Find mounts by numeric storage id
-	 *
-	 * @param int $id
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 * @since 8.2.0
-	 */
-	public function findByNumericId(int $id): array;
+    /**
+     * Find mounts by numeric storage id
+     *
+     * @param int $id
+     * @return \OCP\Files\Mount\IMountPoint[]
+     * @since 8.2.0
+     */
+    public function findByNumericId(int $id): array;
 }

lib/public/AppFramework/Http/Template/LinkMenuAction.php

Indentation +28 added lines, -28 removed lines

@@ -34,33 +34,33 @@
  */
 class LinkMenuAction extends SimpleMenuAction {
 
-	/**
-	 * LinkMenuAction constructor.
-	 *
-	 * @param string $label
-	 * @param string $icon
-	 * @param string $link
-	 * @since 14.0.0
-	 */
-	public function __construct(string $label, string $icon, string $link) {
-		parent::__construct('directLink-container', $label, $icon, $link);
-	}
+    /**
+     * LinkMenuAction constructor.
+     *
+     * @param string $label
+     * @param string $icon
+     * @param string $link
+     * @since 14.0.0
+     */
+    public function __construct(string $label, string $icon, string $link) {
+        parent::__construct('directLink-container', $label, $icon, $link);
+    }
 
-	/**
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function render(): string {
-		return '<li>' .
-			'<a id="directLink-container">' .
-			'<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
-			'<label for="directLink">' . Util::sanitizeHTML($this->getLabel()) . '</label>' .
-			'</a>' .
-			'</li>' .
-			'<li>' .
-			'<span class="menuitem">' .
-			'<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' .
-			'</span>' .
-			'</li>';
-	}
+    /**
+     * @return string
+     * @since 14.0.0
+     */
+    public function render(): string {
+        return '<li>' .
+            '<a id="directLink-container">' .
+            '<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
+            '<label for="directLink">' . Util::sanitizeHTML($this->getLabel()) . '</label>' .
+            '</a>' .
+            '</li>' .
+            '<li>' .
+            '<span class="menuitem">' .
+            '<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' .
+            '</span>' .
+            '</li>';
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -51,16 +51,16 @@
 	 * @since 14.0.0
 	 */
 	public function render(): string {
-		return '<li>' .
-			'<a id="directLink-container">' .
-			'<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
-			'<label for="directLink">' . Util::sanitizeHTML($this->getLabel()) . '</label>' .
-			'</a>' .
-			'</li>' .
-			'<li>' .
-			'<span class="menuitem">' .
-			'<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' .
-			'</span>' .
+		return '<li>'.
+			'<a id="directLink-container">'.
+			'<span class="icon '.Util::sanitizeHTML($this->getIcon()).'"></span>'.
+			'<label for="directLink">'.Util::sanitizeHTML($this->getLabel()).'</label>'.
+			'</a>'.
+			'</li>'.
+			'<li>'.
+			'<span class="menuitem">'.
+			'<input id="directLink" type="text" readonly="" value="'.Util::sanitizeHTML($this->getLink()).'">'.
+			'</span>'.
 			'</li>';
 	}
 }

core/Command/Log/File.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 		$defaultLogFile = rtrim($dataDir, '/').'/nextcloud.log';
 		$output->writeln('Log file: '.$this->config->getSystemValue('logfile', $defaultLogFile));
 
-		$rotateSize = $this->config->getSystemValue('log_rotate_size', 100*1024*1024);
+		$rotateSize = $this->config->getSystemValue('log_rotate_size', 100 * 1024 * 1024);
 		if ($rotateSize) {
 			$rotateString = \OCP\Util::humanFileSize($rotateSize);
 		} else {

Indentation +119 added lines, -119 removed lines

@@ -38,123 +38,123 @@
 
 class File extends Command implements Completion\CompletionAwareInterface {
 
-	/** @var IConfig */
-	protected $config;
-
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('log:file')
-			->setDescription('manipulate logging backend')
-			->addOption(
-				'enable',
-				null,
-				InputOption::VALUE_NONE,
-				'enable this logging backend'
-			)
-			->addOption(
-				'file',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'set the log file path'
-			)
-			->addOption(
-				'rotate-size',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'set the file size for log rotation, 0 = disabled'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$toBeSet = [];
-
-		if ($input->getOption('enable')) {
-			$toBeSet['log_type'] = 'file';
-		}
-
-		if ($file = $input->getOption('file')) {
-			$toBeSet['logfile'] = $file;
-		}
-
-		if (($rotateSize = $input->getOption('rotate-size')) !== null) {
-			$rotateSize = \OCP\Util::computerFileSize($rotateSize);
-			$this->validateRotateSize($rotateSize);
-			$toBeSet['log_rotate_size'] = $rotateSize;
-		}
-
-		// set config
-		foreach ($toBeSet as $option => $value) {
-			$this->config->setSystemValue($option, $value);
-		}
-
-		// display config
-		// TODO: Drop backwards compatibility for config in the future
-		$logType = $this->config->getSystemValue('log_type', 'file');
-		if ($logType === 'file' || $logType === 'owncloud') {
-			$enabledText = 'enabled';
-		} else {
-			$enabledText = 'disabled';
-		}
-		$output->writeln('Log backend file: '.$enabledText);
-
-		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
-		$defaultLogFile = rtrim($dataDir, '/').'/nextcloud.log';
-		$output->writeln('Log file: '.$this->config->getSystemValue('logfile', $defaultLogFile));
-
-		$rotateSize = $this->config->getSystemValue('log_rotate_size', 100*1024*1024);
-		if ($rotateSize) {
-			$rotateString = \OCP\Util::humanFileSize($rotateSize);
-		} else {
-			$rotateString = 'disabled';
-		}
-		$output->writeln('Rotate at: '.$rotateString);
-	}
-
-	/**
-	 * @param mixed $rotateSize
-	 * @throws \InvalidArgumentException
-	 */
-	protected function validateRotateSize(&$rotateSize) {
-		if ($rotateSize === false) {
-			throw new \InvalidArgumentException('Error parsing log rotation file size');
-		}
-		$rotateSize = (int) $rotateSize;
-		if ($rotateSize < 0) {
-			throw new \InvalidArgumentException('Log rotation file size must be non-negative');
-		}
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		if ($optionName === 'file') {
-			$helper = new ShellPathCompletion(
-				$this->getName(),
-				'file',
-				Completion::TYPE_OPTION
-			);
-			return $helper->run();
-		} elseif ($optionName === 'rotate-size') {
-			return [0];
-		}
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		return [];
-	}
+    /** @var IConfig */
+    protected $config;
+
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('log:file')
+            ->setDescription('manipulate logging backend')
+            ->addOption(
+                'enable',
+                null,
+                InputOption::VALUE_NONE,
+                'enable this logging backend'
+            )
+            ->addOption(
+                'file',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'set the log file path'
+            )
+            ->addOption(
+                'rotate-size',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'set the file size for log rotation, 0 = disabled'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $toBeSet = [];
+
+        if ($input->getOption('enable')) {
+            $toBeSet['log_type'] = 'file';
+        }
+
+        if ($file = $input->getOption('file')) {
+            $toBeSet['logfile'] = $file;
+        }
+
+        if (($rotateSize = $input->getOption('rotate-size')) !== null) {
+            $rotateSize = \OCP\Util::computerFileSize($rotateSize);
+            $this->validateRotateSize($rotateSize);
+            $toBeSet['log_rotate_size'] = $rotateSize;
+        }
+
+        // set config
+        foreach ($toBeSet as $option => $value) {
+            $this->config->setSystemValue($option, $value);
+        }
+
+        // display config
+        // TODO: Drop backwards compatibility for config in the future
+        $logType = $this->config->getSystemValue('log_type', 'file');
+        if ($logType === 'file' || $logType === 'owncloud') {
+            $enabledText = 'enabled';
+        } else {
+            $enabledText = 'disabled';
+        }
+        $output->writeln('Log backend file: '.$enabledText);
+
+        $dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
+        $defaultLogFile = rtrim($dataDir, '/').'/nextcloud.log';
+        $output->writeln('Log file: '.$this->config->getSystemValue('logfile', $defaultLogFile));
+
+        $rotateSize = $this->config->getSystemValue('log_rotate_size', 100*1024*1024);
+        if ($rotateSize) {
+            $rotateString = \OCP\Util::humanFileSize($rotateSize);
+        } else {
+            $rotateString = 'disabled';
+        }
+        $output->writeln('Rotate at: '.$rotateString);
+    }
+
+    /**
+     * @param mixed $rotateSize
+     * @throws \InvalidArgumentException
+     */
+    protected function validateRotateSize(&$rotateSize) {
+        if ($rotateSize === false) {
+            throw new \InvalidArgumentException('Error parsing log rotation file size');
+        }
+        $rotateSize = (int) $rotateSize;
+        if ($rotateSize < 0) {
+            throw new \InvalidArgumentException('Log rotation file size must be non-negative');
+        }
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        if ($optionName === 'file') {
+            $helper = new ShellPathCompletion(
+                $this->getName(),
+                'file',
+                Completion::TYPE_OPTION
+            );
+            return $helper->run();
+        } elseif ($optionName === 'rotate-size') {
+            return [0];
+        }
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        return [];
+    }
 }

lib/public/OCS/IDiscoveryService.php

Indentation +13 added lines, -13 removed lines

@@ -35,18 +35,18 @@
  */
 interface IDiscoveryService {
 
-	/**
-	 * Discover OCS end-points
-	 *
-	 * If no valid discovery data is found the defaults are returned
-	 *
-	 * @since 12.0.0
-	 *
-	 * @param string $remote
-	 * @param string $service the service you want to discover
-	 * @param bool $skipCache We won't check if the data is in the cache. This is useful if a background job is updating the status - Added in 14.0.0
-	 * @return array
-	 */
-	public function discover(string $remote, string $service, bool $skipCache = false): array;
+    /**
+     * Discover OCS end-points
+     *
+     * If no valid discovery data is found the defaults are returned
+     *
+     * @since 12.0.0
+     *
+     * @param string $remote
+     * @param string $service the service you want to discover
+     * @param bool $skipCache We won't check if the data is in the cache. This is useful if a background job is updating the status - Added in 14.0.0
+     * @return array
+     */
+    public function discover(string $remote, string $service, bool $skipCache = false): array;
 
 }

lib/private/Lock/DBLockingProvider.php

Spacing +2 added lines, -2 removed lines

@@ -154,7 +154,7 @@ 
 		}
 		$query = $this->connection->prepare('SELECT `lock` from `*PREFIX*file_locks` WHERE `key` = ?');
 		$query->execute([$path]);
-		$lockValue = (int)$query->fetchColumn();
+		$lockValue = (int) $query->fetchColumn();
 		if ($type === self::LOCK_SHARED) {
 			if ($this->isLocallyLocked($path)) {
 				// if we have a shared lock we kept open locally but it's released we always have at least 1 shared lock in the db
@@ -291,7 +291,7 @@ 
 		}
 		// since we keep shared locks we need to manually clean those
 		$lockedPaths = array_keys($this->sharedLocks);
-		$lockedPaths = array_filter($lockedPaths, function ($path) {
+		$lockedPaths = array_filter($lockedPaths, function($path) {
 			return $this->sharedLocks[$path];
 		});
 

Indentation +253 added lines, -253 removed lines

@@ -40,279 +40,279 @@
  * Locking provider that stores the locks in the database
  */
 class DBLockingProvider extends AbstractLockingProvider {
-	/**
-	 * @var \OCP\IDBConnection
-	 */
-	private $connection;
+    /**
+     * @var \OCP\IDBConnection
+     */
+    private $connection;
 
-	/**
-	 * @var \OCP\ILogger
-	 */
-	private $logger;
+    /**
+     * @var \OCP\ILogger
+     */
+    private $logger;
 
-	/**
-	 * @var \OCP\AppFramework\Utility\ITimeFactory
-	 */
-	private $timeFactory;
+    /**
+     * @var \OCP\AppFramework\Utility\ITimeFactory
+     */
+    private $timeFactory;
 
-	private $sharedLocks = [];
+    private $sharedLocks = [];
 
-	/**
-	 * @var bool
-	 */
-	private $cacheSharedLocks;
+    /**
+     * @var bool
+     */
+    private $cacheSharedLocks;
 
-	/**
-	 * Check if we have an open shared lock for a path
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	protected function isLocallyLocked(string $path): bool {
-		return isset($this->sharedLocks[$path]) && $this->sharedLocks[$path];
-	}
+    /**
+     * Check if we have an open shared lock for a path
+     *
+     * @param string $path
+     * @return bool
+     */
+    protected function isLocallyLocked(string $path): bool {
+        return isset($this->sharedLocks[$path]) && $this->sharedLocks[$path];
+    }
 
-	/**
-	 * Mark a locally acquired lock
-	 *
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 */
-	protected function markAcquire(string $path, int $type) {
-		parent::markAcquire($path, $type);
-		if ($this->cacheSharedLocks) {
-			if ($type === self::LOCK_SHARED) {
-				$this->sharedLocks[$path] = true;
-			}
-		}
-	}
+    /**
+     * Mark a locally acquired lock
+     *
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     */
+    protected function markAcquire(string $path, int $type) {
+        parent::markAcquire($path, $type);
+        if ($this->cacheSharedLocks) {
+            if ($type === self::LOCK_SHARED) {
+                $this->sharedLocks[$path] = true;
+            }
+        }
+    }
 
-	/**
-	 * Change the type of an existing tracked lock
-	 *
-	 * @param string $path
-	 * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 */
-	protected function markChange(string $path, int $targetType) {
-		parent::markChange($path, $targetType);
-		if ($this->cacheSharedLocks) {
-			if ($targetType === self::LOCK_SHARED) {
-				$this->sharedLocks[$path] = true;
-			} elseif ($targetType === self::LOCK_EXCLUSIVE) {
-				$this->sharedLocks[$path] = false;
-			}
-		}
-	}
+    /**
+     * Change the type of an existing tracked lock
+     *
+     * @param string $path
+     * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     */
+    protected function markChange(string $path, int $targetType) {
+        parent::markChange($path, $targetType);
+        if ($this->cacheSharedLocks) {
+            if ($targetType === self::LOCK_SHARED) {
+                $this->sharedLocks[$path] = true;
+            } elseif ($targetType === self::LOCK_EXCLUSIVE) {
+                $this->sharedLocks[$path] = false;
+            }
+        }
+    }
 
-	/**
-	 * @param \OCP\IDBConnection $connection
-	 * @param \OCP\ILogger $logger
-	 * @param \OCP\AppFramework\Utility\ITimeFactory $timeFactory
-	 * @param int $ttl
-	 * @param bool $cacheSharedLocks
-	 */
-	public function __construct(
-		IDBConnection $connection,
-		ILogger $logger,
-		ITimeFactory $timeFactory,
-		int $ttl = 3600,
-		$cacheSharedLocks = true
-	) {
-		$this->connection = $connection;
-		$this->logger = $logger;
-		$this->timeFactory = $timeFactory;
-		$this->ttl = $ttl;
-		$this->cacheSharedLocks = $cacheSharedLocks;
-	}
+    /**
+     * @param \OCP\IDBConnection $connection
+     * @param \OCP\ILogger $logger
+     * @param \OCP\AppFramework\Utility\ITimeFactory $timeFactory
+     * @param int $ttl
+     * @param bool $cacheSharedLocks
+     */
+    public function __construct(
+        IDBConnection $connection,
+        ILogger $logger,
+        ITimeFactory $timeFactory,
+        int $ttl = 3600,
+        $cacheSharedLocks = true
+    ) {
+        $this->connection = $connection;
+        $this->logger = $logger;
+        $this->timeFactory = $timeFactory;
+        $this->ttl = $ttl;
+        $this->cacheSharedLocks = $cacheSharedLocks;
+    }
 
-	/**
-	 * Insert a file locking row if it does not exists.
-	 *
-	 * @param string $path
-	 * @param int $lock
-	 * @return int number of inserted rows
-	 */
-	protected function initLockField(string $path, int $lock = 0): int {
-		$expire = $this->getExpireTime();
-		return $this->connection->insertIgnoreConflict('file_locks', [
-			'key' => $path,
-			'lock' => $lock,
-			'ttl' => $expire
-		]);
-	}
+    /**
+     * Insert a file locking row if it does not exists.
+     *
+     * @param string $path
+     * @param int $lock
+     * @return int number of inserted rows
+     */
+    protected function initLockField(string $path, int $lock = 0): int {
+        $expire = $this->getExpireTime();
+        return $this->connection->insertIgnoreConflict('file_locks', [
+            'key' => $path,
+            'lock' => $lock,
+            'ttl' => $expire
+        ]);
+    }
 
-	/**
-	 * @return int
-	 */
-	protected function getExpireTime(): int {
-		return $this->timeFactory->getTime() + $this->ttl;
-	}
+    /**
+     * @return int
+     */
+    protected function getExpireTime(): int {
+        return $this->timeFactory->getTime() + $this->ttl;
+    }
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @return bool
-	 */
-	public function isLocked(string $path, int $type): bool {
-		if ($this->hasAcquiredLock($path, $type)) {
-			return true;
-		}
-		$query = $this->connection->prepare('SELECT `lock` from `*PREFIX*file_locks` WHERE `key` = ?');
-		$query->execute([$path]);
-		$lockValue = (int)$query->fetchColumn();
-		if ($type === self::LOCK_SHARED) {
-			if ($this->isLocallyLocked($path)) {
-				// if we have a shared lock we kept open locally but it's released we always have at least 1 shared lock in the db
-				return $lockValue > 1;
-			} else {
-				return $lockValue > 0;
-			}
-		} elseif ($type === self::LOCK_EXCLUSIVE) {
-			return $lockValue === -1;
-		} else {
-			return false;
-		}
-	}
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @return bool
+     */
+    public function isLocked(string $path, int $type): bool {
+        if ($this->hasAcquiredLock($path, $type)) {
+            return true;
+        }
+        $query = $this->connection->prepare('SELECT `lock` from `*PREFIX*file_locks` WHERE `key` = ?');
+        $query->execute([$path]);
+        $lockValue = (int)$query->fetchColumn();
+        if ($type === self::LOCK_SHARED) {
+            if ($this->isLocallyLocked($path)) {
+                // if we have a shared lock we kept open locally but it's released we always have at least 1 shared lock in the db
+                return $lockValue > 1;
+            } else {
+                return $lockValue > 0;
+            }
+        } elseif ($type === self::LOCK_EXCLUSIVE) {
+            return $lockValue === -1;
+        } else {
+            return false;
+        }
+    }
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function acquireLock(string $path, int $type) {
-		$expire = $this->getExpireTime();
-		if ($type === self::LOCK_SHARED) {
-			if (!$this->isLocallyLocked($path)) {
-				$result = $this->initLockField($path, 1);
-				if ($result <= 0) {
-					$result = $this->connection->executeUpdate(
-						'UPDATE `*PREFIX*file_locks` SET `lock` = `lock` + 1, `ttl` = ? WHERE `key` = ? AND `lock` >= 0',
-						[$expire, $path]
-					);
-				}
-			} else {
-				$result = 1;
-			}
-		} else {
-			$existing = 0;
-			if ($this->hasAcquiredLock($path, ILockingProvider::LOCK_SHARED) === false && $this->isLocallyLocked($path)) {
-				$existing = 1;
-			}
-			$result = $this->initLockField($path, -1);
-			if ($result <= 0) {
-				$result = $this->connection->executeUpdate(
-					'UPDATE `*PREFIX*file_locks` SET `lock` = -1, `ttl` = ? WHERE `key` = ? AND `lock` = ?',
-					[$expire, $path, $existing]
-				);
-			}
-		}
-		if ($result !== 1) {
-			throw new LockedException($path);
-		}
-		$this->markAcquire($path, $type);
-	}
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @throws \OCP\Lock\LockedException
+     */
+    public function acquireLock(string $path, int $type) {
+        $expire = $this->getExpireTime();
+        if ($type === self::LOCK_SHARED) {
+            if (!$this->isLocallyLocked($path)) {
+                $result = $this->initLockField($path, 1);
+                if ($result <= 0) {
+                    $result = $this->connection->executeUpdate(
+                        'UPDATE `*PREFIX*file_locks` SET `lock` = `lock` + 1, `ttl` = ? WHERE `key` = ? AND `lock` >= 0',
+                        [$expire, $path]
+                    );
+                }
+            } else {
+                $result = 1;
+            }
+        } else {
+            $existing = 0;
+            if ($this->hasAcquiredLock($path, ILockingProvider::LOCK_SHARED) === false && $this->isLocallyLocked($path)) {
+                $existing = 1;
+            }
+            $result = $this->initLockField($path, -1);
+            if ($result <= 0) {
+                $result = $this->connection->executeUpdate(
+                    'UPDATE `*PREFIX*file_locks` SET `lock` = -1, `ttl` = ? WHERE `key` = ? AND `lock` = ?',
+                    [$expire, $path, $existing]
+                );
+            }
+        }
+        if ($result !== 1) {
+            throw new LockedException($path);
+        }
+        $this->markAcquire($path, $type);
+    }
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 *
-	 * @suppress SqlInjectionChecker
-	 */
-	public function releaseLock(string $path, int $type) {
-		$this->markRelease($path, $type);
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     *
+     * @suppress SqlInjectionChecker
+     */
+    public function releaseLock(string $path, int $type) {
+        $this->markRelease($path, $type);
 
-		// we keep shared locks till the end of the request so we can re-use them
-		if ($type === self::LOCK_EXCLUSIVE) {
-			$this->connection->executeUpdate(
-				'UPDATE `*PREFIX*file_locks` SET `lock` = 0 WHERE `key` = ? AND `lock` = -1',
-				[$path]
-			);
-		} elseif (!$this->cacheSharedLocks) {
-			$query = $this->connection->getQueryBuilder();
-			$query->update('file_locks')
-				->set('lock', $query->func()->subtract('lock', $query->createNamedParameter(1)))
-				->where($query->expr()->eq('key', $query->createNamedParameter($path)))
-				->andWhere($query->expr()->gt('lock', $query->createNamedParameter(0)));
-			$query->execute();
-		}
-	}
+        // we keep shared locks till the end of the request so we can re-use them
+        if ($type === self::LOCK_EXCLUSIVE) {
+            $this->connection->executeUpdate(
+                'UPDATE `*PREFIX*file_locks` SET `lock` = 0 WHERE `key` = ? AND `lock` = -1',
+                [$path]
+            );
+        } elseif (!$this->cacheSharedLocks) {
+            $query = $this->connection->getQueryBuilder();
+            $query->update('file_locks')
+                ->set('lock', $query->func()->subtract('lock', $query->createNamedParameter(1)))
+                ->where($query->expr()->eq('key', $query->createNamedParameter($path)))
+                ->andWhere($query->expr()->gt('lock', $query->createNamedParameter(0)));
+            $query->execute();
+        }
+    }
 
-	/**
-	 * Change the type of an existing lock
-	 *
-	 * @param string $path
-	 * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function changeLock(string $path, int $targetType) {
-		$expire = $this->getExpireTime();
-		if ($targetType === self::LOCK_SHARED) {
-			$result = $this->connection->executeUpdate(
-				'UPDATE `*PREFIX*file_locks` SET `lock` = 1, `ttl` = ? WHERE `key` = ? AND `lock` = -1',
-				[$expire, $path]
-			);
-		} else {
-			// since we only keep one shared lock in the db we need to check if we have more then one shared lock locally manually
-			if (isset($this->acquiredLocks['shared'][$path]) && $this->acquiredLocks['shared'][$path] > 1) {
-				throw new LockedException($path);
-			}
-			$result = $this->connection->executeUpdate(
-				'UPDATE `*PREFIX*file_locks` SET `lock` = -1, `ttl` = ? WHERE `key` = ? AND `lock` = 1',
-				[$expire, $path]
-			);
-		}
-		if ($result !== 1) {
-			throw new LockedException($path);
-		}
-		$this->markChange($path, $targetType);
-	}
+    /**
+     * Change the type of an existing lock
+     *
+     * @param string $path
+     * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @throws \OCP\Lock\LockedException
+     */
+    public function changeLock(string $path, int $targetType) {
+        $expire = $this->getExpireTime();
+        if ($targetType === self::LOCK_SHARED) {
+            $result = $this->connection->executeUpdate(
+                'UPDATE `*PREFIX*file_locks` SET `lock` = 1, `ttl` = ? WHERE `key` = ? AND `lock` = -1',
+                [$expire, $path]
+            );
+        } else {
+            // since we only keep one shared lock in the db we need to check if we have more then one shared lock locally manually
+            if (isset($this->acquiredLocks['shared'][$path]) && $this->acquiredLocks['shared'][$path] > 1) {
+                throw new LockedException($path);
+            }
+            $result = $this->connection->executeUpdate(
+                'UPDATE `*PREFIX*file_locks` SET `lock` = -1, `ttl` = ? WHERE `key` = ? AND `lock` = 1',
+                [$expire, $path]
+            );
+        }
+        if ($result !== 1) {
+            throw new LockedException($path);
+        }
+        $this->markChange($path, $targetType);
+    }
 
-	/**
-	 * cleanup empty locks
-	 */
-	public function cleanExpiredLocks() {
-		$expire = $this->timeFactory->getTime();
-		try {
-			$this->connection->executeUpdate(
-				'DELETE FROM `*PREFIX*file_locks` WHERE `ttl` < ?',
-				[$expire]
-			);
-		} catch (\Exception $e) {
-			// If the table is missing, the clean up was successful
-			if ($this->connection->tableExists('file_locks')) {
-				throw $e;
-			}
-		}
-	}
+    /**
+     * cleanup empty locks
+     */
+    public function cleanExpiredLocks() {
+        $expire = $this->timeFactory->getTime();
+        try {
+            $this->connection->executeUpdate(
+                'DELETE FROM `*PREFIX*file_locks` WHERE `ttl` < ?',
+                [$expire]
+            );
+        } catch (\Exception $e) {
+            // If the table is missing, the clean up was successful
+            if ($this->connection->tableExists('file_locks')) {
+                throw $e;
+            }
+        }
+    }
 
-	/**
-	 * release all lock acquired by this instance which were marked using the mark* methods
-	 *
-	 * @suppress SqlInjectionChecker
-	 */
-	public function releaseAll() {
-		parent::releaseAll();
+    /**
+     * release all lock acquired by this instance which were marked using the mark* methods
+     *
+     * @suppress SqlInjectionChecker
+     */
+    public function releaseAll() {
+        parent::releaseAll();
 
-		if (!$this->cacheSharedLocks) {
-			return;
-		}
-		// since we keep shared locks we need to manually clean those
-		$lockedPaths = array_keys($this->sharedLocks);
-		$lockedPaths = array_filter($lockedPaths, function ($path) {
-			return $this->sharedLocks[$path];
-		});
+        if (!$this->cacheSharedLocks) {
+            return;
+        }
+        // since we keep shared locks we need to manually clean those
+        $lockedPaths = array_keys($this->sharedLocks);
+        $lockedPaths = array_filter($lockedPaths, function ($path) {
+            return $this->sharedLocks[$path];
+        });
 
-		$chunkedPaths = array_chunk($lockedPaths, 100);
+        $chunkedPaths = array_chunk($lockedPaths, 100);
 
-		foreach ($chunkedPaths as $chunk) {
-			$builder = $this->connection->getQueryBuilder();
+        foreach ($chunkedPaths as $chunk) {
+            $builder = $this->connection->getQueryBuilder();
 
-			$query = $builder->update('file_locks')
-				->set('lock', $builder->func()->subtract('lock', $builder->expr()->literal(1)))
-				->where($builder->expr()->in('key', $builder->createNamedParameter($chunk, IQueryBuilder::PARAM_STR_ARRAY)))
-				->andWhere($builder->expr()->gt('lock', new Literal(0)));
+            $query = $builder->update('file_locks')
+                ->set('lock', $builder->func()->subtract('lock', $builder->expr()->literal(1)))
+                ->where($builder->expr()->in('key', $builder->createNamedParameter($chunk, IQueryBuilder::PARAM_STR_ARRAY)))
+                ->andWhere($builder->expr()->gt('lock', new Literal(0)));
 
-			$query->execute();
-		}
-	}
+            $query->execute();
+        }
+    }
 }