nextcloud / server

lib/private/Files/Search/SearchBinaryOperator.php

Indentation +26 added lines, -26 removed lines

@@ -25,33 +25,33 @@
 use OCP\Files\Search\ISearchOperator;
 
 class SearchBinaryOperator implements ISearchBinaryOperator {
-	/** @var string */
-	private $type;
-	/** @var ISearchOperator[] */
-	private $arguments;
+    /** @var string */
+    private $type;
+    /** @var ISearchOperator[] */
+    private $arguments;
 
-	/**
-	 * SearchBinaryOperator constructor.
-	 *
-	 * @param string $type
-	 * @param ISearchOperator[] $arguments
-	 */
-	public function __construct($type, array $arguments) {
-		$this->type = $type;
-		$this->arguments = $arguments;
-	}
+    /**
+     * SearchBinaryOperator constructor.
+     *
+     * @param string $type
+     * @param ISearchOperator[] $arguments
+     */
+    public function __construct($type, array $arguments) {
+        $this->type = $type;
+        $this->arguments = $arguments;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getType() {
-		return $this->type;
-	}
+    /**
+     * @return string
+     */
+    public function getType() {
+        return $this->type;
+    }
 
-	/**
-	 * @return ISearchOperator[]
-	 */
-	public function getArguments() {
-		return $this->arguments;
-	}
+    /**
+     * @return ISearchOperator[]
+     */
+    public function getArguments() {
+        return $this->arguments;
+    }
 }

lib/private/Repair/RepairInvalidShares.php

Spacing +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
 
 		$updatedEntries = $builder->execute();
 		if ($updatedEntries > 0) {
-			$out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
+			$out->info('Fixed file share permissions for '.$updatedEntries.' shares');
 		}
 	}
 
@@ -107,7 +107,7 @@ 
 		}
 
 		if ($deletedEntries) {
-			$out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
+			$out->info('Removed '.$deletedEntries.' shares where the parent did not exist');
 		}
 	}
 

Indentation +85 added lines, -85 removed lines

@@ -33,89 +33,89 @@
  * Repairs shares with invalid data
  */
 class RepairInvalidShares implements IRepairStep {
-	public const CHUNK_SIZE = 200;
-
-	/** @var \OCP\IConfig */
-	protected $config;
-
-	/** @var \OCP\IDBConnection */
-	protected $connection;
-
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param \OCP\IDBConnection $connection
-	 */
-	public function __construct($config, $connection) {
-		$this->connection = $connection;
-		$this->config = $config;
-	}
-
-	public function getName() {
-		return 'Repair invalid shares';
-	}
-
-	/**
-	 * Adjust file share permissions
-	 */
-	private function adjustFileSharePermissions(IOutput $out) {
-		$mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE;
-		$builder = $this->connection->getQueryBuilder();
-
-		$permsFunc = $builder->expr()->bitwiseAnd('permissions', $mask);
-		$builder
-			->update('share')
-			->set('permissions', $permsFunc)
-			->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
-			->andWhere($builder->expr()->neq('permissions', $permsFunc));
-
-		$updatedEntries = $builder->execute();
-		if ($updatedEntries > 0) {
-			$out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
-		}
-	}
-
-	/**
-	 * Remove shares where the parent share does not exist anymore
-	 */
-	private function removeSharesNonExistingParent(IOutput $out) {
-		$deletedEntries = 0;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('s1.parent')
-			->from('share', 's1')
-			->where($query->expr()->isNotNull('s1.parent'))
-				->andWhere($query->expr()->isNull('s2.id'))
-			->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'))
-			->groupBy('s1.parent')
-			->setMaxResults(self::CHUNK_SIZE);
-
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('share')
-			->where($deleteQuery->expr()->eq('parent', $deleteQuery->createParameter('parent')));
-
-		$deletedInLastChunk = self::CHUNK_SIZE;
-		while ($deletedInLastChunk === self::CHUNK_SIZE) {
-			$deletedInLastChunk = 0;
-			$result = $query->execute();
-			while ($row = $result->fetch()) {
-				$deletedInLastChunk++;
-				$deletedEntries += $deleteQuery->setParameter('parent', (int) $row['parent'])
-					->execute();
-			}
-			$result->closeCursor();
-		}
-
-		if ($deletedEntries) {
-			$out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
-		}
-	}
-
-	public function run(IOutput $out) {
-		$ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
-		if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
-			$this->adjustFileSharePermissions($out);
-		}
-
-		$this->removeSharesNonExistingParent($out);
-	}
+    public const CHUNK_SIZE = 200;
+
+    /** @var \OCP\IConfig */
+    protected $config;
+
+    /** @var \OCP\IDBConnection */
+    protected $connection;
+
+    /**
+     * @param \OCP\IConfig $config
+     * @param \OCP\IDBConnection $connection
+     */
+    public function __construct($config, $connection) {
+        $this->connection = $connection;
+        $this->config = $config;
+    }
+
+    public function getName() {
+        return 'Repair invalid shares';
+    }
+
+    /**
+     * Adjust file share permissions
+     */
+    private function adjustFileSharePermissions(IOutput $out) {
+        $mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE;
+        $builder = $this->connection->getQueryBuilder();
+
+        $permsFunc = $builder->expr()->bitwiseAnd('permissions', $mask);
+        $builder
+            ->update('share')
+            ->set('permissions', $permsFunc)
+            ->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
+            ->andWhere($builder->expr()->neq('permissions', $permsFunc));
+
+        $updatedEntries = $builder->execute();
+        if ($updatedEntries > 0) {
+            $out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
+        }
+    }
+
+    /**
+     * Remove shares where the parent share does not exist anymore
+     */
+    private function removeSharesNonExistingParent(IOutput $out) {
+        $deletedEntries = 0;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('s1.parent')
+            ->from('share', 's1')
+            ->where($query->expr()->isNotNull('s1.parent'))
+                ->andWhere($query->expr()->isNull('s2.id'))
+            ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'))
+            ->groupBy('s1.parent')
+            ->setMaxResults(self::CHUNK_SIZE);
+
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('share')
+            ->where($deleteQuery->expr()->eq('parent', $deleteQuery->createParameter('parent')));
+
+        $deletedInLastChunk = self::CHUNK_SIZE;
+        while ($deletedInLastChunk === self::CHUNK_SIZE) {
+            $deletedInLastChunk = 0;
+            $result = $query->execute();
+            while ($row = $result->fetch()) {
+                $deletedInLastChunk++;
+                $deletedEntries += $deleteQuery->setParameter('parent', (int) $row['parent'])
+                    ->execute();
+            }
+            $result->closeCursor();
+        }
+
+        if ($deletedEntries) {
+            $out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
+        }
+    }
+
+    public function run(IOutput $out) {
+        $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+        if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
+            $this->adjustFileSharePermissions($out);
+        }
+
+        $this->removeSharesNonExistingParent($out);
+    }
 }

apps/federatedfilesharing/appinfo/routes.php

Indentation +14 added lines, -14 removed lines

@@ -23,18 +23,18 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'MountPublicLink#createFederatedShare', 'url' => '/createFederatedShare', 'verb' => 'POST'],
-		['name' => 'MountPublicLink#askForFederatedShare', 'url' => '/askForFederatedShare', 'verb' => 'POST'],
-	],
-	'ocs' => [
-		['root' => '/cloud', 'name' => 'RequestHandler#createShare', 'url' => '/shares', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#reShare', 'url' => '/shares/{id}/reshare', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#updatePermissions', 'url' => '/shares/{id}/permissions', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#acceptShare', 'url' => '/shares/{id}/accept', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#declineShare', 'url' => '/shares/{id}/decline', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#unshare', 'url' => '/shares/{id}/unshare', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#revoke', 'url' => '/shares/{id}/revoke', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#move', 'url' => '/shares/{id}/move', 'verb' => 'POST'],
-	],
+    'routes' => [
+        ['name' => 'MountPublicLink#createFederatedShare', 'url' => '/createFederatedShare', 'verb' => 'POST'],
+        ['name' => 'MountPublicLink#askForFederatedShare', 'url' => '/askForFederatedShare', 'verb' => 'POST'],
+    ],
+    'ocs' => [
+        ['root' => '/cloud', 'name' => 'RequestHandler#createShare', 'url' => '/shares', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#reShare', 'url' => '/shares/{id}/reshare', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#updatePermissions', 'url' => '/shares/{id}/permissions', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#acceptShare', 'url' => '/shares/{id}/accept', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#declineShare', 'url' => '/shares/{id}/decline', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#unshare', 'url' => '/shares/{id}/unshare', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#revoke', 'url' => '/shares/{id}/revoke', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#move', 'url' => '/shares/{id}/move', 'verb' => 'POST'],
+    ],
 ];

apps/dav/appinfo/v2/remote.php

Indentation +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
  */
 // no php execution timeout for webdav
 if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-	@set_time_limit(0);
+    @set_time_limit(0);
 }
 ignore_user_abort(true);
 

lib/private/Share20/ProviderFactory.php

Spacing +2 added lines, -2 removed lines

@@ -214,7 +214,7 @@ 
 		}
 
 		if ($provider === null) {
-			throw new ProviderException('No provider with id .' . $id . ' found.');
+			throw new ProviderException('No provider with id .'.$id.' found.');
 		}
 
 		return $provider;
@@ -241,7 +241,7 @@ 
 
 
 		if ($provider === null) {
-			throw new ProviderException('No share provider for share type ' . $shareType);
+			throw new ProviderException('No share provider for share type '.$shareType);
 		}
 
 		return $provider;

Indentation +296 added lines, -296 removed lines

@@ -53,309 +53,309 @@
  */
 class ProviderFactory implements IProviderFactory {
 
-	/** @var IServerContainer */
-	private $serverContainer;
-	/** @var DefaultShareProvider */
-	private $defaultProvider = null;
-	/** @var FederatedShareProvider */
-	private $federatedProvider = null;
-	/** @var  ShareByMailProvider */
-	private $shareByMailProvider;
-	/** @var  \OCA\Circles\ShareByCircleProvider */
-	private $shareByCircleProvider = null;
-	/** @var bool */
-	private $circlesAreNotAvailable = false;
-	/** @var \OCA\Talk\Share\RoomShareProvider */
-	private $roomShareProvider = null;
-
-	private $registeredShareProviders = [];
-
-	private $shareProviders = [];
-
-	/**
-	 * IProviderFactory constructor.
-	 *
-	 * @param IServerContainer $serverContainer
-	 */
-	public function __construct(IServerContainer $serverContainer) {
-		$this->serverContainer = $serverContainer;
-	}
-
-	public function registerProvider(string $shareProviderClass): void {
-		$this->registeredShareProviders[] = $shareProviderClass;
-	}
-
-	/**
-	 * Create the default share provider.
-	 *
-	 * @return DefaultShareProvider
-	 */
-	protected function defaultShareProvider() {
-		if ($this->defaultProvider === null) {
-			$this->defaultProvider = new DefaultShareProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getGroupManager(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getMailer(),
-				$this->serverContainer->query(Defaults::class),
-				$this->serverContainer->getL10NFactory(),
-				$this->serverContainer->getURLGenerator(),
-				$this->serverContainer->getConfig()
-			);
-		}
-
-		return $this->defaultProvider;
-	}
-
-	/**
-	 * Create the federated share provider
-	 *
-	 * @return FederatedShareProvider
-	 */
-	protected function federatedShareProvider() {
-		if ($this->federatedProvider === null) {
-			/*
+    /** @var IServerContainer */
+    private $serverContainer;
+    /** @var DefaultShareProvider */
+    private $defaultProvider = null;
+    /** @var FederatedShareProvider */
+    private $federatedProvider = null;
+    /** @var  ShareByMailProvider */
+    private $shareByMailProvider;
+    /** @var  \OCA\Circles\ShareByCircleProvider */
+    private $shareByCircleProvider = null;
+    /** @var bool */
+    private $circlesAreNotAvailable = false;
+    /** @var \OCA\Talk\Share\RoomShareProvider */
+    private $roomShareProvider = null;
+
+    private $registeredShareProviders = [];
+
+    private $shareProviders = [];
+
+    /**
+     * IProviderFactory constructor.
+     *
+     * @param IServerContainer $serverContainer
+     */
+    public function __construct(IServerContainer $serverContainer) {
+        $this->serverContainer = $serverContainer;
+    }
+
+    public function registerProvider(string $shareProviderClass): void {
+        $this->registeredShareProviders[] = $shareProviderClass;
+    }
+
+    /**
+     * Create the default share provider.
+     *
+     * @return DefaultShareProvider
+     */
+    protected function defaultShareProvider() {
+        if ($this->defaultProvider === null) {
+            $this->defaultProvider = new DefaultShareProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getGroupManager(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getMailer(),
+                $this->serverContainer->query(Defaults::class),
+                $this->serverContainer->getL10NFactory(),
+                $this->serverContainer->getURLGenerator(),
+                $this->serverContainer->getConfig()
+            );
+        }
+
+        return $this->defaultProvider;
+    }
+
+    /**
+     * Create the federated share provider
+     *
+     * @return FederatedShareProvider
+     */
+    protected function federatedShareProvider() {
+        if ($this->federatedProvider === null) {
+            /*
 			 * Check if the app is enabled
 			 */
-			$appManager = $this->serverContainer->getAppManager();
-			if (!$appManager->isEnabledForUser('federatedfilesharing')) {
-				return null;
-			}
+            $appManager = $this->serverContainer->getAppManager();
+            if (!$appManager->isEnabledForUser('federatedfilesharing')) {
+                return null;
+            }
 
-			/*
+            /*
 			 * TODO: add factory to federated sharing app
 			 */
-			$l = $this->serverContainer->getL10N('federatedfilesharing');
-			$addressHandler = new AddressHandler(
-				$this->serverContainer->getURLGenerator(),
-				$l,
-				$this->serverContainer->getCloudIdManager()
-			);
-			$notifications = new Notifications(
-				$addressHandler,
-				$this->serverContainer->getHTTPClientService(),
-				$this->serverContainer->query(\OCP\OCS\IDiscoveryService::class),
-				$this->serverContainer->getJobList(),
-				\OC::$server->getCloudFederationProviderManager(),
-				\OC::$server->getCloudFederationFactory(),
-				$this->serverContainer->query(IEventDispatcher::class)
-			);
-			$tokenHandler = new TokenHandler(
-				$this->serverContainer->getSecureRandom()
-			);
-
-			$this->federatedProvider = new FederatedShareProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$addressHandler,
-				$notifications,
-				$tokenHandler,
-				$l,
-				$this->serverContainer->getLogger(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getConfig(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getCloudIdManager(),
-				$this->serverContainer->getGlobalScaleConfig(),
-				$this->serverContainer->getCloudFederationProviderManager()
-			);
-		}
-
-		return $this->federatedProvider;
-	}
-
-	/**
-	 * Create the federated share provider
-	 *
-	 * @return ShareByMailProvider
-	 */
-	protected function getShareByMailProvider() {
-		if ($this->shareByMailProvider === null) {
-			/*
+            $l = $this->serverContainer->getL10N('federatedfilesharing');
+            $addressHandler = new AddressHandler(
+                $this->serverContainer->getURLGenerator(),
+                $l,
+                $this->serverContainer->getCloudIdManager()
+            );
+            $notifications = new Notifications(
+                $addressHandler,
+                $this->serverContainer->getHTTPClientService(),
+                $this->serverContainer->query(\OCP\OCS\IDiscoveryService::class),
+                $this->serverContainer->getJobList(),
+                \OC::$server->getCloudFederationProviderManager(),
+                \OC::$server->getCloudFederationFactory(),
+                $this->serverContainer->query(IEventDispatcher::class)
+            );
+            $tokenHandler = new TokenHandler(
+                $this->serverContainer->getSecureRandom()
+            );
+
+            $this->federatedProvider = new FederatedShareProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $addressHandler,
+                $notifications,
+                $tokenHandler,
+                $l,
+                $this->serverContainer->getLogger(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getConfig(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getCloudIdManager(),
+                $this->serverContainer->getGlobalScaleConfig(),
+                $this->serverContainer->getCloudFederationProviderManager()
+            );
+        }
+
+        return $this->federatedProvider;
+    }
+
+    /**
+     * Create the federated share provider
+     *
+     * @return ShareByMailProvider
+     */
+    protected function getShareByMailProvider() {
+        if ($this->shareByMailProvider === null) {
+            /*
 			 * Check if the app is enabled
 			 */
-			$appManager = $this->serverContainer->getAppManager();
-			if (!$appManager->isEnabledForUser('sharebymail')) {
-				return null;
-			}
-
-			$settingsManager = new SettingsManager($this->serverContainer->getConfig());
-
-			$this->shareByMailProvider = new ShareByMailProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$this->serverContainer->getSecureRandom(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getL10N('sharebymail'),
-				$this->serverContainer->getLogger(),
-				$this->serverContainer->getMailer(),
-				$this->serverContainer->getURLGenerator(),
-				$this->serverContainer->getActivityManager(),
-				$settingsManager,
-				$this->serverContainer->query(Defaults::class),
-				$this->serverContainer->getHasher(),
-				$this->serverContainer->get(IEventDispatcher::class)
-			);
-		}
-
-		return $this->shareByMailProvider;
-	}
-
-
-	/**
-	 * Create the circle share provider
-	 *
-	 * @return FederatedShareProvider
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	protected function getShareByCircleProvider() {
-		if ($this->circlesAreNotAvailable) {
-			return null;
-		}
-
-		if (!$this->serverContainer->getAppManager()->isEnabledForUser('circles') ||
-			!class_exists('\OCA\Circles\ShareByCircleProvider')
-		) {
-			$this->circlesAreNotAvailable = true;
-			return null;
-		}
-
-		if ($this->shareByCircleProvider === null) {
-			$this->shareByCircleProvider = new \OCA\Circles\ShareByCircleProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$this->serverContainer->getSecureRandom(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getL10N('circles'),
-				$this->serverContainer->getLogger(),
-				$this->serverContainer->getURLGenerator()
-			);
-		}
-
-		return $this->shareByCircleProvider;
-	}
-
-	/**
-	 * Create the room share provider
-	 *
-	 * @return RoomShareProvider
-	 */
-	protected function getRoomShareProvider() {
-		if ($this->roomShareProvider === null) {
-			/*
+            $appManager = $this->serverContainer->getAppManager();
+            if (!$appManager->isEnabledForUser('sharebymail')) {
+                return null;
+            }
+
+            $settingsManager = new SettingsManager($this->serverContainer->getConfig());
+
+            $this->shareByMailProvider = new ShareByMailProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $this->serverContainer->getSecureRandom(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getL10N('sharebymail'),
+                $this->serverContainer->getLogger(),
+                $this->serverContainer->getMailer(),
+                $this->serverContainer->getURLGenerator(),
+                $this->serverContainer->getActivityManager(),
+                $settingsManager,
+                $this->serverContainer->query(Defaults::class),
+                $this->serverContainer->getHasher(),
+                $this->serverContainer->get(IEventDispatcher::class)
+            );
+        }
+
+        return $this->shareByMailProvider;
+    }
+
+
+    /**
+     * Create the circle share provider
+     *
+     * @return FederatedShareProvider
+     *
+     * @suppress PhanUndeclaredClassMethod
+     */
+    protected function getShareByCircleProvider() {
+        if ($this->circlesAreNotAvailable) {
+            return null;
+        }
+
+        if (!$this->serverContainer->getAppManager()->isEnabledForUser('circles') ||
+            !class_exists('\OCA\Circles\ShareByCircleProvider')
+        ) {
+            $this->circlesAreNotAvailable = true;
+            return null;
+        }
+
+        if ($this->shareByCircleProvider === null) {
+            $this->shareByCircleProvider = new \OCA\Circles\ShareByCircleProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $this->serverContainer->getSecureRandom(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getL10N('circles'),
+                $this->serverContainer->getLogger(),
+                $this->serverContainer->getURLGenerator()
+            );
+        }
+
+        return $this->shareByCircleProvider;
+    }
+
+    /**
+     * Create the room share provider
+     *
+     * @return RoomShareProvider
+     */
+    protected function getRoomShareProvider() {
+        if ($this->roomShareProvider === null) {
+            /*
 			 * Check if the app is enabled
 			 */
-			$appManager = $this->serverContainer->getAppManager();
-			if (!$appManager->isEnabledForUser('spreed')) {
-				return null;
-			}
-
-			try {
-				$this->roomShareProvider = $this->serverContainer->query('\OCA\Talk\Share\RoomShareProvider');
-			} catch (\OCP\AppFramework\QueryException $e) {
-				return null;
-			}
-		}
-
-		return $this->roomShareProvider;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getProvider($id) {
-		$provider = null;
-		if (isset($this->shareProviders[$id])) {
-			return $this->shareProviders[$id];
-		}
-
-		if ($id === 'ocinternal') {
-			$provider = $this->defaultShareProvider();
-		} elseif ($id === 'ocFederatedSharing') {
-			$provider = $this->federatedShareProvider();
-		} elseif ($id === 'ocMailShare') {
-			$provider = $this->getShareByMailProvider();
-		} elseif ($id === 'ocCircleShare') {
-			$provider = $this->getShareByCircleProvider();
-		} elseif ($id === 'ocRoomShare') {
-			$provider = $this->getRoomShareProvider();
-		}
-
-		foreach ($this->registeredShareProviders as $shareProvider) {
-			/** @var IShareProvider $instance */
-			$instance = $this->serverContainer->get($shareProvider);
-			$this->shareProviders[$instance->identifier()] = $instance;
-		}
-
-		if (isset($this->shareProviders[$id])) {
-			$provider = $this->shareProviders[$id];
-		}
-
-		if ($provider === null) {
-			throw new ProviderException('No provider with id .' . $id . ' found.');
-		}
-
-		return $provider;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getProviderForType($shareType) {
-		$provider = null;
-
-		if ($shareType === IShare::TYPE_USER ||
-			$shareType === IShare::TYPE_GROUP ||
-			$shareType === IShare::TYPE_LINK
-		) {
-			$provider = $this->defaultShareProvider();
-		} elseif ($shareType === IShare::TYPE_REMOTE || $shareType === IShare::TYPE_REMOTE_GROUP) {
-			$provider = $this->federatedShareProvider();
-		} elseif ($shareType === IShare::TYPE_EMAIL) {
-			$provider = $this->getShareByMailProvider();
-		} elseif ($shareType === IShare::TYPE_CIRCLE) {
-			$provider = $this->getShareByCircleProvider();
-		} elseif ($shareType === IShare::TYPE_ROOM) {
-			$provider = $this->getRoomShareProvider();
-		} elseif ($shareType === IShare::TYPE_DECK) {
-			$provider = $this->getProvider('deck');
-		}
-
-
-		if ($provider === null) {
-			throw new ProviderException('No share provider for share type ' . $shareType);
-		}
-
-		return $provider;
-	}
-
-	public function getAllProviders() {
-		$shares = [$this->defaultShareProvider(), $this->federatedShareProvider()];
-		$shareByMail = $this->getShareByMailProvider();
-		if ($shareByMail !== null) {
-			$shares[] = $shareByMail;
-		}
-		$shareByCircle = $this->getShareByCircleProvider();
-		if ($shareByCircle !== null) {
-			$shares[] = $shareByCircle;
-		}
-		$roomShare = $this->getRoomShareProvider();
-		if ($roomShare !== null) {
-			$shares[] = $roomShare;
-		}
-
-		foreach ($this->registeredShareProviders as $shareProvider) {
-			/** @var IShareProvider $instance */
-			$instance = $this->serverContainer->get($shareProvider);
-			if (!isset($this->shareProviders[$instance->identifier()])) {
-				$this->shareProviders[$instance->identifier()] = $instance;
-			}
-			$shares[] = $this->shareProviders[$instance->identifier()];
-		}
-
-
-
-		return $shares;
-	}
+            $appManager = $this->serverContainer->getAppManager();
+            if (!$appManager->isEnabledForUser('spreed')) {
+                return null;
+            }
+
+            try {
+                $this->roomShareProvider = $this->serverContainer->query('\OCA\Talk\Share\RoomShareProvider');
+            } catch (\OCP\AppFramework\QueryException $e) {
+                return null;
+            }
+        }
+
+        return $this->roomShareProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getProvider($id) {
+        $provider = null;
+        if (isset($this->shareProviders[$id])) {
+            return $this->shareProviders[$id];
+        }
+
+        if ($id === 'ocinternal') {
+            $provider = $this->defaultShareProvider();
+        } elseif ($id === 'ocFederatedSharing') {
+            $provider = $this->federatedShareProvider();
+        } elseif ($id === 'ocMailShare') {
+            $provider = $this->getShareByMailProvider();
+        } elseif ($id === 'ocCircleShare') {
+            $provider = $this->getShareByCircleProvider();
+        } elseif ($id === 'ocRoomShare') {
+            $provider = $this->getRoomShareProvider();
+        }
+
+        foreach ($this->registeredShareProviders as $shareProvider) {
+            /** @var IShareProvider $instance */
+            $instance = $this->serverContainer->get($shareProvider);
+            $this->shareProviders[$instance->identifier()] = $instance;
+        }
+
+        if (isset($this->shareProviders[$id])) {
+            $provider = $this->shareProviders[$id];
+        }
+
+        if ($provider === null) {
+            throw new ProviderException('No provider with id .' . $id . ' found.');
+        }
+
+        return $provider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getProviderForType($shareType) {
+        $provider = null;
+
+        if ($shareType === IShare::TYPE_USER ||
+            $shareType === IShare::TYPE_GROUP ||
+            $shareType === IShare::TYPE_LINK
+        ) {
+            $provider = $this->defaultShareProvider();
+        } elseif ($shareType === IShare::TYPE_REMOTE || $shareType === IShare::TYPE_REMOTE_GROUP) {
+            $provider = $this->federatedShareProvider();
+        } elseif ($shareType === IShare::TYPE_EMAIL) {
+            $provider = $this->getShareByMailProvider();
+        } elseif ($shareType === IShare::TYPE_CIRCLE) {
+            $provider = $this->getShareByCircleProvider();
+        } elseif ($shareType === IShare::TYPE_ROOM) {
+            $provider = $this->getRoomShareProvider();
+        } elseif ($shareType === IShare::TYPE_DECK) {
+            $provider = $this->getProvider('deck');
+        }
+
+
+        if ($provider === null) {
+            throw new ProviderException('No share provider for share type ' . $shareType);
+        }
+
+        return $provider;
+    }
+
+    public function getAllProviders() {
+        $shares = [$this->defaultShareProvider(), $this->federatedShareProvider()];
+        $shareByMail = $this->getShareByMailProvider();
+        if ($shareByMail !== null) {
+            $shares[] = $shareByMail;
+        }
+        $shareByCircle = $this->getShareByCircleProvider();
+        if ($shareByCircle !== null) {
+            $shares[] = $shareByCircle;
+        }
+        $roomShare = $this->getRoomShareProvider();
+        if ($roomShare !== null) {
+            $shares[] = $roomShare;
+        }
+
+        foreach ($this->registeredShareProviders as $shareProvider) {
+            /** @var IShareProvider $instance */
+            $instance = $this->serverContainer->get($shareProvider);
+            if (!isset($this->shareProviders[$instance->identifier()])) {
+                $this->shareProviders[$instance->identifier()] = $instance;
+            }
+            $shares[] = $this->shareProviders[$instance->identifier()];
+        }
+
+
+
+        return $shares;
+    }
 }

lib/private/Migration/ConsoleOutput.php

Indentation +46 added lines, -46 removed lines

@@ -37,57 +37,57 @@
  */
 class ConsoleOutput implements IOutput {
 
-	/** @var OutputInterface */
-	private $output;
+    /** @var OutputInterface */
+    private $output;
 
-	/** @var ProgressBar */
-	private $progressBar;
+    /** @var ProgressBar */
+    private $progressBar;
 
-	public function __construct(OutputInterface $output) {
-		$this->output = $output;
-	}
+    public function __construct(OutputInterface $output) {
+        $this->output = $output;
+    }
 
-	/**
-	 * @param string $message
-	 */
-	public function info($message) {
-		$this->output->writeln("<info>$message</info>");
-	}
+    /**
+     * @param string $message
+     */
+    public function info($message) {
+        $this->output->writeln("<info>$message</info>");
+    }
 
-	/**
-	 * @param string $message
-	 */
-	public function warning($message) {
-		$this->output->writeln("<comment>$message</comment>");
-	}
+    /**
+     * @param string $message
+     */
+    public function warning($message) {
+        $this->output->writeln("<comment>$message</comment>");
+    }
 
-	/**
-	 * @param int $max
-	 */
-	public function startProgress($max = 0) {
-		if (!is_null($this->progressBar)) {
-			$this->progressBar->finish();
-		}
-		$this->progressBar = new ProgressBar($this->output);
-		$this->progressBar->start($max);
-	}
+    /**
+     * @param int $max
+     */
+    public function startProgress($max = 0) {
+        if (!is_null($this->progressBar)) {
+            $this->progressBar->finish();
+        }
+        $this->progressBar = new ProgressBar($this->output);
+        $this->progressBar->start($max);
+    }
 
-	/**
-	 * @param int $step
-	 * @param string $description
-	 */
-	public function advance($step = 1, $description = '') {
-		if (!is_null($this->progressBar)) {
-			$this->progressBar = new ProgressBar($this->output);
-			$this->progressBar->start();
-		}
-		$this->progressBar->advance($step);
-	}
+    /**
+     * @param int $step
+     * @param string $description
+     */
+    public function advance($step = 1, $description = '') {
+        if (!is_null($this->progressBar)) {
+            $this->progressBar = new ProgressBar($this->output);
+            $this->progressBar->start();
+        }
+        $this->progressBar->advance($step);
+    }
 
-	public function finishProgress() {
-		if (is_null($this->progressBar)) {
-			return;
-		}
-		$this->progressBar->finish();
-	}
+    public function finishProgress() {
+        if (is_null($this->progressBar)) {
+            return;
+        }
+        $this->progressBar->finish();
+    }
 }

lib/public/Contacts/ContactsMenu/IEntry.php

Indentation +28 added lines, -28 removed lines

@@ -31,36 +31,36 @@
  */
 interface IEntry extends JsonSerializable {
 
-	/**
-	 * @since 12.0
-	 * @return string
-	 */
-	public function getFullName();
+    /**
+     * @since 12.0
+     * @return string
+     */
+    public function getFullName();
 
-	/**
-	 * @since 12.0
-	 * @return string[]
-	 */
-	public function getEMailAddresses();
+    /**
+     * @since 12.0
+     * @return string[]
+     */
+    public function getEMailAddresses();
 
-	/**
-	 * @since 12.0
-	 * @return string|null image URI
-	 */
-	public function getAvatar();
+    /**
+     * @since 12.0
+     * @return string|null image URI
+     */
+    public function getAvatar();
 
-	/**
-	 * @since 12.0
-	 * @param IAction $action an action to show in the contacts menu
-	 */
-	public function addAction(IAction $action);
+    /**
+     * @since 12.0
+     * @param IAction $action an action to show in the contacts menu
+     */
+    public function addAction(IAction $action);
 
-	/**
-	 * Get an arbitrary property from the contact
-	 *
-	 * @since 12.0
-	 * @param string $key
-	 * @return mixed the value of the property or null
-	 */
-	public function getProperty($key);
+    /**
+     * Get an arbitrary property from the contact
+     *
+     * @since 12.0
+     * @param string $key
+     * @return mixed the value of the property or null
+     */
+    public function getProperty($key);
 }

apps/dav/lib/Avatars/RootCollection.php

Indentation +17 added lines, -17 removed lines

@@ -7,23 +7,23 @@
 
 class RootCollection extends AbstractPrincipalCollection {
 
-	/**
-	 * This method returns a node for a principal.
-	 *
-	 * The passed array contains principal information, and is guaranteed to
-	 * at least contain a uri item. Other properties may or may not be
-	 * supplied by the authentication backend.
-	 *
-	 * @param array $principalInfo
-	 * @return AvatarHome
-	 */
-	public function getChildForPrincipal(array $principalInfo) {
-		$avatarManager = \OC::$server->getAvatarManager();
-		return new AvatarHome($principalInfo, $avatarManager);
-	}
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principalInfo
+     * @return AvatarHome
+     */
+    public function getChildForPrincipal(array $principalInfo) {
+        $avatarManager = \OC::$server->getAvatarManager();
+        return new AvatarHome($principalInfo, $avatarManager);
+    }
 
-	public function getName() {
-		return 'avatars';
-	}
+    public function getName() {
+        return 'avatars';
+    }
 
 }

apps/dav/lib/Migration/CalDAVRemoveEmptyValue.php

Spacing +5 added lines, -5 removed lines

@@ -65,8 +65,8 @@ 
 
 		$output->startProgress(count($objects));
 		foreach ($objects as $row) {
-			$calObject = $this->calDavBackend->getCalendarObject((int)$row['calendarid'], $row['uri']);
-			$data = preg_replace('/' . $pattern . '/', ':', $calObject['calendardata']);
+			$calObject = $this->calDavBackend->getCalendarObject((int) $row['calendarid'], $row['uri']);
+			$data = preg_replace('/'.$pattern.'/', ':', $calObject['calendardata']);
 
 			if ($data !== $calObject['calendardata']) {
 				$output->advance();
@@ -76,14 +76,14 @@ 
 				} catch (InvalidDataException $e) {
 					$this->logger->info('Calendar object for calendar {cal} with uri {uri} still invalid', [
 						'app' => 'dav',
-						'cal' => (int)$row['calendarid'],
+						'cal' => (int) $row['calendarid'],
 						'uri' => $row['uri'],
 					]);
 					$warnings++;
 					continue;
 				}
 
-				$this->calDavBackend->updateCalendarObject((int)$row['calendarid'], $row['uri'], $data);
+				$this->calDavBackend->updateCalendarObject((int) $row['calendarid'], $row['uri'], $data);
 				$count++;
 			}
 		}
@@ -104,7 +104,7 @@ 
 			->where($query->expr()->like(
 				'calendardata',
 				$query->createNamedParameter(
-					'%' . $this->db->escapeLikeParameter($pattern) . '%',
+					'%'.$this->db->escapeLikeParameter($pattern).'%',
 					IQueryBuilder::PARAM_STR
 				),
 				IQueryBuilder::PARAM_STR

Indentation +114 added lines, -114 removed lines

@@ -34,118 +34,118 @@
 
 class CalDAVRemoveEmptyValue implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var CalDavBackend */
-	private $calDavBackend;
-
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * @param IDBConnection $db
-	 * @param CalDavBackend $calDavBackend
-	 * @param ILogger $logger
-	 */
-	public function __construct(IDBConnection $db, CalDavBackend $calDavBackend, ILogger $logger) {
-		$this->db = $db;
-		$this->calDavBackend = $calDavBackend;
-		$this->logger = $logger;
-	}
-
-	public function getName() {
-		return 'Fix broken values of calendar objects';
-	}
-
-	public function run(IOutput $output) {
-		$pattern = ';VALUE=:';
-		$count = $warnings = 0;
-
-		$objects = $this->getInvalidObjects($pattern);
-
-		$output->startProgress(count($objects));
-		foreach ($objects as $row) {
-			$calObject = $this->calDavBackend->getCalendarObject((int)$row['calendarid'], $row['uri']);
-			$data = preg_replace('/' . $pattern . '/', ':', $calObject['calendardata']);
-
-			if ($data !== $calObject['calendardata']) {
-				$output->advance();
-
-				try {
-					$this->calDavBackend->getDenormalizedData($data);
-				} catch (InvalidDataException $e) {
-					$this->logger->info('Calendar object for calendar {cal} with uri {uri} still invalid', [
-						'app' => 'dav',
-						'cal' => (int)$row['calendarid'],
-						'uri' => $row['uri'],
-					]);
-					$warnings++;
-					continue;
-				}
-
-				$this->calDavBackend->updateCalendarObject((int)$row['calendarid'], $row['uri'], $data);
-				$count++;
-			}
-		}
-		$output->finishProgress();
-
-		if ($warnings > 0) {
-			$output->warning(sprintf('%d events could not be updated, see log file for more information', $warnings));
-		}
-		if ($count > 0) {
-			$output->info(sprintf('Updated %d events', $count));
-		}
-	}
-
-	protected function getInvalidObjects($pattern) {
-		if ($this->db->getDatabasePlatform() instanceof OraclePlatform) {
-			$rows = [];
-			$chunkSize = 500;
-			$query = $this->db->getQueryBuilder();
-			$query->select($query->func()->count('*', 'num_entries'))
-				->from('calendarobjects');
-			$result = $query->execute();
-			$count = $result->fetchColumn();
-			$result->closeCursor();
-
-			$numChunks = ceil($count / $chunkSize);
-
-			$query = $this->db->getQueryBuilder();
-			$query->select(['calendarid', 'uri', 'calendardata'])
-				->from('calendarobjects')
-				->setMaxResults($chunkSize);
-			for ($chunk = 0; $chunk < $numChunks; $chunk++) {
-				$query->setFirstResult($chunk * $chunkSize);
-				$result = $query->execute();
-
-				while ($row = $result->fetch()) {
-					if (mb_strpos($row['calendardata'], $pattern) !== false) {
-						unset($row['calendardata']);
-						$rows[] = $row;
-					}
-				}
-				$result->closeCursor();
-			}
-			return $rows;
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->select(['calendarid', 'uri'])
-			->from('calendarobjects')
-			->where($query->expr()->like(
-				'calendardata',
-				$query->createNamedParameter(
-					'%' . $this->db->escapeLikeParameter($pattern) . '%',
-					IQueryBuilder::PARAM_STR
-				),
-				IQueryBuilder::PARAM_STR
-			));
-
-		$result = $query->execute();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-
-		return $rows;
-	}
+    /** @var IDBConnection */
+    private $db;
+
+    /** @var CalDavBackend */
+    private $calDavBackend;
+
+    /** @var ILogger */
+    private $logger;
+
+    /**
+     * @param IDBConnection $db
+     * @param CalDavBackend $calDavBackend
+     * @param ILogger $logger
+     */
+    public function __construct(IDBConnection $db, CalDavBackend $calDavBackend, ILogger $logger) {
+        $this->db = $db;
+        $this->calDavBackend = $calDavBackend;
+        $this->logger = $logger;
+    }
+
+    public function getName() {
+        return 'Fix broken values of calendar objects';
+    }
+
+    public function run(IOutput $output) {
+        $pattern = ';VALUE=:';
+        $count = $warnings = 0;
+
+        $objects = $this->getInvalidObjects($pattern);
+
+        $output->startProgress(count($objects));
+        foreach ($objects as $row) {
+            $calObject = $this->calDavBackend->getCalendarObject((int)$row['calendarid'], $row['uri']);
+            $data = preg_replace('/' . $pattern . '/', ':', $calObject['calendardata']);
+
+            if ($data !== $calObject['calendardata']) {
+                $output->advance();
+
+                try {
+                    $this->calDavBackend->getDenormalizedData($data);
+                } catch (InvalidDataException $e) {
+                    $this->logger->info('Calendar object for calendar {cal} with uri {uri} still invalid', [
+                        'app' => 'dav',
+                        'cal' => (int)$row['calendarid'],
+                        'uri' => $row['uri'],
+                    ]);
+                    $warnings++;
+                    continue;
+                }
+
+                $this->calDavBackend->updateCalendarObject((int)$row['calendarid'], $row['uri'], $data);
+                $count++;
+            }
+        }
+        $output->finishProgress();
+
+        if ($warnings > 0) {
+            $output->warning(sprintf('%d events could not be updated, see log file for more information', $warnings));
+        }
+        if ($count > 0) {
+            $output->info(sprintf('Updated %d events', $count));
+        }
+    }
+
+    protected function getInvalidObjects($pattern) {
+        if ($this->db->getDatabasePlatform() instanceof OraclePlatform) {
+            $rows = [];
+            $chunkSize = 500;
+            $query = $this->db->getQueryBuilder();
+            $query->select($query->func()->count('*', 'num_entries'))
+                ->from('calendarobjects');
+            $result = $query->execute();
+            $count = $result->fetchColumn();
+            $result->closeCursor();
+
+            $numChunks = ceil($count / $chunkSize);
+
+            $query = $this->db->getQueryBuilder();
+            $query->select(['calendarid', 'uri', 'calendardata'])
+                ->from('calendarobjects')
+                ->setMaxResults($chunkSize);
+            for ($chunk = 0; $chunk < $numChunks; $chunk++) {
+                $query->setFirstResult($chunk * $chunkSize);
+                $result = $query->execute();
+
+                while ($row = $result->fetch()) {
+                    if (mb_strpos($row['calendardata'], $pattern) !== false) {
+                        unset($row['calendardata']);
+                        $rows[] = $row;
+                    }
+                }
+                $result->closeCursor();
+            }
+            return $rows;
+        }
+
+        $query = $this->db->getQueryBuilder();
+        $query->select(['calendarid', 'uri'])
+            ->from('calendarobjects')
+            ->where($query->expr()->like(
+                'calendardata',
+                $query->createNamedParameter(
+                    '%' . $this->db->escapeLikeParameter($pattern) . '%',
+                    IQueryBuilder::PARAM_STR
+                ),
+                IQueryBuilder::PARAM_STR
+            ));
+
+        $result = $query->execute();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+
+        return $rows;
+    }
 }