nextcloud / server

lib/private/Security/Bruteforce/Capabilities.php

Indentation +22 added lines, -22 removed lines

@@ -24,29 +24,29 @@
 use OCP\IRequest;
 
 class Capabilities implements IPublicCapability {
-	/** @var IRequest */
-	private $request;
+    /** @var IRequest */
+    private $request;
 
-	/** @var Throttler */
-	private $throttler;
+    /** @var Throttler */
+    private $throttler;
 
-	/**
-	 * Capabilities constructor.
-	 *
-	 * @param IRequest $request
-	 * @param Throttler $throttler
-	 */
-	public function __construct(IRequest $request,
-								Throttler $throttler) {
-		$this->request = $request;
-		$this->throttler = $throttler;
-	}
+    /**
+     * Capabilities constructor.
+     *
+     * @param IRequest $request
+     * @param Throttler $throttler
+     */
+    public function __construct(IRequest $request,
+                                Throttler $throttler) {
+        $this->request = $request;
+        $this->throttler = $throttler;
+    }
 
-	public function getCapabilities() {
-		return [
-			'bruteforce' => [
-				'delay' => $this->throttler->getDelay($this->request->getRemoteAddress())
-			]
-		];
-	}
+    public function getCapabilities() {
+        return [
+            'bruteforce' => [
+                'delay' => $this->throttler->getDelay($this->request->getRemoteAddress())
+            ]
+        ];
+    }
 }

lib/private/Diagnostics/QueryLogger.php

Indentation +55 added lines, -55 removed lines

@@ -29,68 +29,68 @@
 use OCP\Diagnostics\IQueryLogger;
 
 class QueryLogger implements IQueryLogger {
-	/**
-	 * @var \OC\Diagnostics\Query
-	 */
-	protected $activeQuery;
+    /**
+     * @var \OC\Diagnostics\Query
+     */
+    protected $activeQuery;
 
-	/**
-	 * @var CappedMemoryCache
-	 */
-	protected $queries;
+    /**
+     * @var CappedMemoryCache
+     */
+    protected $queries;
 
-	/**
-	 * QueryLogger constructor.
-	 */
-	public function __construct() {
-		$this->queries = new CappedMemoryCache(1024);
-	}
+    /**
+     * QueryLogger constructor.
+     */
+    public function __construct() {
+        $this->queries = new CappedMemoryCache(1024);
+    }
 
 
-	/**
-	 * @var bool - Module needs to be activated by some app
-	 */
-	private $activated = false;
+    /**
+     * @var bool - Module needs to be activated by some app
+     */
+    private $activated = false;
 
-	/**
-	 * @inheritdoc
-	 */
-	public function startQuery($sql, array $params = null, array $types = null) {
-		if ($this->activated) {
-			$this->activeQuery = new Query($sql, $params, microtime(true), $this->getStack());
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function startQuery($sql, array $params = null, array $types = null) {
+        if ($this->activated) {
+            $this->activeQuery = new Query($sql, $params, microtime(true), $this->getStack());
+        }
+    }
 
-	private function getStack() {
-		$stack = debug_backtrace();
-		array_shift($stack);
-		array_shift($stack);
-		array_shift($stack);
-		return $stack;
-	}
+    private function getStack() {
+        $stack = debug_backtrace();
+        array_shift($stack);
+        array_shift($stack);
+        array_shift($stack);
+        return $stack;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function stopQuery() {
-		if ($this->activated && $this->activeQuery) {
-			$this->activeQuery->end(microtime(true));
-			$this->queries[] = $this->activeQuery;
-			$this->activeQuery = null;
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function stopQuery() {
+        if ($this->activated && $this->activeQuery) {
+            $this->activeQuery->end(microtime(true));
+            $this->queries[] = $this->activeQuery;
+            $this->activeQuery = null;
+        }
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getQueries() {
-		return $this->queries->getData();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getQueries() {
+        return $this->queries->getData();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function activate() {
-		$this->activated = true;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function activate() {
+        $this->activated = true;
+    }
 }

core/Command/Db/Migrations/GenerateFromSchemaFileCommand.php

Spacing +4 added lines, -4 removed lines

@@ -60,14 +60,14 @@ 
 		$appName = $input->getArgument('app');
 		$version = $input->getArgument('version');
 
-		if (!preg_match('/^\d{1,16}$/',$version)) {
+		if (!preg_match('/^\d{1,16}$/', $version)) {
 			$output->writeln('<error>The given version is invalid. Only 0-9 are allowed (max. 16 digits)</error>');
 			return 1;
 		}
 
-		$schemaFile = $this->appManager->getAppPath($appName) . '/appinfo/database.xml';
+		$schemaFile = $this->appManager->getAppPath($appName).'/appinfo/database.xml';
 		if (!file_exists($schemaFile)) {
-			$output->writeln('<error>App ' . $appName . ' does not have a database.xml file</error>');
+			$output->writeln('<error>App '.$appName.' does not have a database.xml file</error>');
 			return 2;
 		}
 
@@ -80,7 +80,7 @@ 
 		$ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
 
 		$date = date('YmdHis');
-		$path = $this->generateMigration($ms, 'Version' . $version . 'Date' . $date, $schemaBody);
+		$path = $this->generateMigration($ms, 'Version'.$version.'Date'.$date, $schemaBody);
 
 		$output->writeln("New migration class has been generated to <info>$path</info>");
 		return 0;

Indentation +99 added lines, -99 removed lines

@@ -37,170 +37,170 @@
 
 class GenerateFromSchemaFileCommand extends GenerateCommand {
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	public function __construct(IConfig $config, IAppManager $appManager, IDBConnection $connection) {
-		parent::__construct($connection, $appManager);
-		$this->config = $config;
-	}
+    public function __construct(IConfig $config, IAppManager $appManager, IDBConnection $connection) {
+        parent::__construct($connection, $appManager);
+        $this->config = $config;
+    }
 
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this->setName('migrations:generate-from-schema');
-	}
+        $this->setName('migrations:generate-from-schema');
+    }
 
-	public function execute(InputInterface $input, OutputInterface $output): int {
-		$appName = $input->getArgument('app');
-		$version = $input->getArgument('version');
+    public function execute(InputInterface $input, OutputInterface $output): int {
+        $appName = $input->getArgument('app');
+        $version = $input->getArgument('version');
 
-		if (!preg_match('/^\d{1,16}$/',$version)) {
-			$output->writeln('<error>The given version is invalid. Only 0-9 are allowed (max. 16 digits)</error>');
-			return 1;
-		}
+        if (!preg_match('/^\d{1,16}$/',$version)) {
+            $output->writeln('<error>The given version is invalid. Only 0-9 are allowed (max. 16 digits)</error>');
+            return 1;
+        }
 
-		$schemaFile = $this->appManager->getAppPath($appName) . '/appinfo/database.xml';
-		if (!file_exists($schemaFile)) {
-			$output->writeln('<error>App ' . $appName . ' does not have a database.xml file</error>');
-			return 2;
-		}
+        $schemaFile = $this->appManager->getAppPath($appName) . '/appinfo/database.xml';
+        if (!file_exists($schemaFile)) {
+            $output->writeln('<error>App ' . $appName . ' does not have a database.xml file</error>');
+            return 2;
+        }
 
-		$reader = new MDB2SchemaReader($this->config, $this->connection->getDatabasePlatform());
-		$schema = new Schema();
-		$reader->loadSchemaFromFile($schemaFile, $schema);
+        $reader = new MDB2SchemaReader($this->config, $this->connection->getDatabasePlatform());
+        $schema = new Schema();
+        $reader->loadSchemaFromFile($schemaFile, $schema);
 
-		$schemaBody = $this->schemaToMigration($schema);
+        $schemaBody = $this->schemaToMigration($schema);
 
-		$ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
+        $ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
 
-		$date = date('YmdHis');
-		$path = $this->generateMigration($ms, 'Version' . $version . 'Date' . $date, $schemaBody);
+        $date = date('YmdHis');
+        $path = $this->generateMigration($ms, 'Version' . $version . 'Date' . $date, $schemaBody);
 
-		$output->writeln("New migration class has been generated to <info>$path</info>");
-		return 0;
-	}
+        $output->writeln("New migration class has been generated to <info>$path</info>");
+        return 0;
+    }
 
-	/**
-	 * @param Schema $schema
-	 * @return string
-	 */
-	protected function schemaToMigration(Schema $schema) {
-		$content = <<<'EOT'
+    /**
+     * @param Schema $schema
+     * @return string
+     */
+    protected function schemaToMigration(Schema $schema) {
+        $content = <<<'EOT'
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
 
 EOT;
 
-		foreach ($schema->getTables() as $table) {
-			$content .= str_replace('{{table-name}}', substr($table->getName(), 3), <<<'EOT'
+        foreach ($schema->getTables() as $table) {
+            $content .= str_replace('{{table-name}}', substr($table->getName(), 3), <<<'EOT'
 
 		if (!$schema->hasTable('{{table-name}}')) {
 			$table = $schema->createTable('{{table-name}}');
 
 EOT
-			);
+            );
 
-			foreach ($table->getColumns() as $column) {
-				$content .= str_replace(['{{name}}', '{{type}}'], [$column->getName(), $column->getType()->getName()], <<<'EOT'
+            foreach ($table->getColumns() as $column) {
+                $content .= str_replace(['{{name}}', '{{type}}'], [$column->getName(), $column->getType()->getName()], <<<'EOT'
 			$table->addColumn('{{name}}', '{{type}}', [
 
 EOT
-				);
-				if ($column->getAutoincrement()) {
-					$content .= <<<'EOT'
+                );
+                if ($column->getAutoincrement()) {
+                    $content .= <<<'EOT'
 				'autoincrement' => true,
 
 EOT;
-				}
-				$content .= str_replace('{{notnull}}', $column->getNotnull() ? 'true' : 'false', <<<'EOT'
+                }
+                $content .= str_replace('{{notnull}}', $column->getNotnull() ? 'true' : 'false', <<<'EOT'
 				'notnull' => {{notnull}},
 
 EOT
-				);
-				if ($column->getLength() !== null) {
-					$content .= str_replace('{{length}}', $column->getLength(), <<<'EOT'
+                );
+                if ($column->getLength() !== null) {
+                    $content .= str_replace('{{length}}', $column->getLength(), <<<'EOT'
 				'length' => {{length}},
 
 EOT
-					);
-				}
-				$default = $column->getDefault();
-				if ($default !== null) {
-					if (is_string($default)) {
-						$default = "'$default'";
-					} elseif (is_bool($default)) {
-						$default = ($default === true) ? 'true' : 'false';
-					}
-					$content .= str_replace('{{default}}', $default, <<<'EOT'
+                    );
+                }
+                $default = $column->getDefault();
+                if ($default !== null) {
+                    if (is_string($default)) {
+                        $default = "'$default'";
+                    } elseif (is_bool($default)) {
+                        $default = ($default === true) ? 'true' : 'false';
+                    }
+                    $content .= str_replace('{{default}}', $default, <<<'EOT'
 				'default' => {{default}},
 
 EOT
-					);
-				}
-				if ($column->getUnsigned()) {
-					$content .= <<<'EOT'
+                    );
+                }
+                if ($column->getUnsigned()) {
+                    $content .= <<<'EOT'
 				'unsigned' => true,
 
 EOT;
-				}
+                }
 
-				$content .= <<<'EOT'
+                $content .= <<<'EOT'
 			]);
 
 EOT;
-			}
+            }
 
-			$content .= <<<'EOT'
+            $content .= <<<'EOT'
 
 EOT;
 
-			$primaryKey = $table->getPrimaryKey();
-			if ($primaryKey !== null) {
-				$content .= str_replace('{{columns}}', implode('\', \'', $primaryKey->getUnquotedColumns()), <<<'EOT'
+            $primaryKey = $table->getPrimaryKey();
+            if ($primaryKey !== null) {
+                $content .= str_replace('{{columns}}', implode('\', \'', $primaryKey->getUnquotedColumns()), <<<'EOT'
 			$table->setPrimaryKey(['{{columns}}']);
 
 EOT
-				);
-			}
-
-			foreach ($table->getIndexes() as $index) {
-				if ($index->isPrimary()) {
-					continue;
-				}
-
-				if ($index->isUnique()) {
-					$content .= str_replace(
-						['{{columns}}', '{{name}}'],
-						[implode('\', \'', $index->getUnquotedColumns()), $index->getName()],
-						<<<'EOT'
+                );
+            }
+
+            foreach ($table->getIndexes() as $index) {
+                if ($index->isPrimary()) {
+                    continue;
+                }
+
+                if ($index->isUnique()) {
+                    $content .= str_replace(
+                        ['{{columns}}', '{{name}}'],
+                        [implode('\', \'', $index->getUnquotedColumns()), $index->getName()],
+                        <<<'EOT'
 			$table->addUniqueIndex(['{{columns}}'], '{{name}}');
 
 EOT
-					);
-				} else {
-					$content .= str_replace(
-						['{{columns}}', '{{name}}'],
-						[implode('\', \'', $index->getUnquotedColumns()), $index->getName()],
-						<<<'EOT'
+                    );
+                } else {
+                    $content .= str_replace(
+                        ['{{columns}}', '{{name}}'],
+                        [implode('\', \'', $index->getUnquotedColumns()), $index->getName()],
+                        <<<'EOT'
 			$table->addIndex(['{{columns}}'], '{{name}}');
 
 EOT
-					);
-				}
-			}
+                    );
+                }
+            }
 
-			$content .= <<<'EOT'
+            $content .= <<<'EOT'
 		}
 
 EOT;
-		}
+        }
 
-		$content .= <<<'EOT'
+        $content .= <<<'EOT'
 		return $schema;
 EOT;
 
-		return $content;
-	}
+        return $content;
+    }
 }

lib/private/DB/QueryBuilder/QuoteHelper.php

Indentation +41 added lines, -41 removed lines

@@ -27,55 +27,55 @@
 use OCP\DB\QueryBuilder\IQueryFunction;
 
 class QuoteHelper {
-	/**
-	 * @param array|string|ILiteral|IParameter|IQueryFunction $strings string, Literal or Parameter
-	 * @return array|string
-	 */
-	public function quoteColumnNames($strings) {
-		if (!is_array($strings)) {
-			return $this->quoteColumnName($strings);
-		}
+    /**
+     * @param array|string|ILiteral|IParameter|IQueryFunction $strings string, Literal or Parameter
+     * @return array|string
+     */
+    public function quoteColumnNames($strings) {
+        if (!is_array($strings)) {
+            return $this->quoteColumnName($strings);
+        }
 
-		$return = [];
-		foreach ($strings as $string) {
-			$return[] = $this->quoteColumnName($string);
-		}
+        $return = [];
+        foreach ($strings as $string) {
+            $return[] = $this->quoteColumnName($string);
+        }
 
-		return $return;
-	}
+        return $return;
+    }
 
-	/**
-	 * @param string|ILiteral|IParameter|IQueryFunction $string string, Literal or Parameter
-	 * @return string
-	 */
-	public function quoteColumnName($string) {
-		if ($string instanceof IParameter || $string instanceof ILiteral || $string instanceof IQueryFunction) {
-			return (string) $string;
-		}
+    /**
+     * @param string|ILiteral|IParameter|IQueryFunction $string string, Literal or Parameter
+     * @return string
+     */
+    public function quoteColumnName($string) {
+        if ($string instanceof IParameter || $string instanceof ILiteral || $string instanceof IQueryFunction) {
+            return (string) $string;
+        }
 
-		if ($string === null || $string === 'null' || $string === '*') {
-			return $string;
-		}
+        if ($string === null || $string === 'null' || $string === '*') {
+            return $string;
+        }
 
-		if (!is_string($string)) {
-			throw new \InvalidArgumentException('Only strings, Literals and Parameters are allowed');
-		}
+        if (!is_string($string)) {
+            throw new \InvalidArgumentException('Only strings, Literals and Parameters are allowed');
+        }
 
-		$string = str_replace(' AS ', ' as ', $string);
-		if (substr_count($string, ' as ')) {
-			return implode(' as ', array_map([$this, 'quoteColumnName'], explode(' as ', $string, 2)));
-		}
+        $string = str_replace(' AS ', ' as ', $string);
+        if (substr_count($string, ' as ')) {
+            return implode(' as ', array_map([$this, 'quoteColumnName'], explode(' as ', $string, 2)));
+        }
 
-		if (substr_count($string, '.')) {
-			list($alias, $columnName) = explode('.', $string, 2);
+        if (substr_count($string, '.')) {
+            list($alias, $columnName) = explode('.', $string, 2);
 
-			if ($columnName === '*') {
-				return '`' . $alias . '`.*';
-			}
+            if ($columnName === '*') {
+                return '`' . $alias . '`.*';
+            }
 
-			return '`' . $alias . '`.`' . $columnName . '`';
-		}
+            return '`' . $alias . '`.`' . $columnName . '`';
+        }
 
-		return '`' . $string . '`';
-	}
+        return '`' . $string . '`';
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -70,12 +70,12 @@
 			list($alias, $columnName) = explode('.', $string, 2);
 
 			if ($columnName === '*') {
-				return '`' . $alias . '`.*';
+				return '`'.$alias.'`.*';
 			}
 
-			return '`' . $alias . '`.`' . $columnName . '`';
+			return '`'.$alias.'`.`'.$columnName.'`';
 		}
 
-		return '`' . $string . '`';
+		return '`'.$string.'`';
 	}
 }

apps/testing/lib/Controller/ConfigController.php

Indentation +32 added lines, -32 removed lines

@@ -29,39 +29,39 @@
 
 class ConfigController extends OCSController {
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IConfig $config) {
-		parent::__construct($appName, $request);
-		$this->config = $config;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IConfig $config) {
+        parent::__construct($appName, $request);
+        $this->config = $config;
+    }
 
-	/**
-	 * @param string $appid
-	 * @param string $configkey
-	 * @param string $value
-	 * @return DataResponse
-	 */
-	public function setAppValue($appid, $configkey, $value) {
-		$this->config->setAppValue($appid, $configkey, $value);
-		return new DataResponse();
-	}
+    /**
+     * @param string $appid
+     * @param string $configkey
+     * @param string $value
+     * @return DataResponse
+     */
+    public function setAppValue($appid, $configkey, $value) {
+        $this->config->setAppValue($appid, $configkey, $value);
+        return new DataResponse();
+    }
 
-	/**
-	 * @param string $appid
-	 * @param string $configkey
-	 * @return DataResponse
-	 */
-	public function deleteAppValue($appid, $configkey) {
-		$this->config->deleteAppValue($appid, $configkey);
-		return new DataResponse();
-	}
+    /**
+     * @param string $appid
+     * @param string $configkey
+     * @return DataResponse
+     */
+    public function deleteAppValue($appid, $configkey) {
+        $this->config->deleteAppValue($appid, $configkey);
+        return new DataResponse();
+    }
 }

lib/public/AppFramework/Http/ICallbackResponse.php

Indentation +7 added lines, -7 removed lines

@@ -33,12 +33,12 @@
  */
 interface ICallbackResponse {
 
-	/**
-	 * Outputs the content that should be printed
-	 *
-	 * @param IOutput $output a small wrapper that handles output
-	 * @since 8.1.0
-	 */
-	public function callback(IOutput $output);
+    /**
+     * Outputs the content that should be printed
+     *
+     * @param IOutput $output a small wrapper that handles output
+     * @since 8.1.0
+     */
+    public function callback(IOutput $output);
 
 }

lib/private/Memcache/Memcached.php

Spacing +9 added lines, -9 removed lines

@@ -97,7 +97,7 @@ 
 	}
 
 	public function get($key) {
-		$result = self::$cache->get($this->getNameSpace() . $key);
+		$result = self::$cache->get($this->getNameSpace().$key);
 		if ($result === false and self::$cache->getResultCode() == \Memcached::RES_NOTFOUND) {
 			return null;
 		} else {
@@ -107,9 +107,9 @@ 
 
 	public function set($key, $value, $ttl = 0) {
 		if ($ttl > 0) {
-			$result =  self::$cache->set($this->getNameSpace() . $key, $value, $ttl);
+			$result = self::$cache->set($this->getNameSpace().$key, $value, $ttl);
 		} else {
-			$result = self::$cache->set($this->getNameSpace() . $key, $value);
+			$result = self::$cache->set($this->getNameSpace().$key, $value);
 		}
 		if ($result !== true) {
 			$this->verifyReturnCode();
@@ -118,12 +118,12 @@ 
 	}
 
 	public function hasKey($key) {
-		self::$cache->get($this->getNameSpace() . $key);
+		self::$cache->get($this->getNameSpace().$key);
 		return self::$cache->getResultCode() === \Memcached::RES_SUCCESS;
 	}
 
 	public function remove($key) {
-		$result= self::$cache->delete($this->getNameSpace() . $key);
+		$result = self::$cache->delete($this->getNameSpace().$key);
 		if (self::$cache->getResultCode() !== \Memcached::RES_NOTFOUND) {
 			$this->verifyReturnCode();
 		}
@@ -131,7 +131,7 @@ 
 	}
 
 	public function clear($prefix = '') {
-		$prefix = $this->getNameSpace() . $prefix;
+		$prefix = $this->getNameSpace().$prefix;
 		$allKeys = self::$cache->getAllKeys();
 		if ($allKeys === false) {
 			// newer Memcached doesn't like getAllKeys(), flush everything
@@ -165,7 +165,7 @@ 
 	 * @throws \Exception
 	 */
 	public function add($key, $value, $ttl = 0) {
-		$result = self::$cache->add($this->getPrefix() . $key, $value, $ttl);
+		$result = self::$cache->add($this->getPrefix().$key, $value, $ttl);
 		if (self::$cache->getResultCode() !== \Memcached::RES_NOTSTORED) {
 			$this->verifyReturnCode();
 		}
@@ -181,7 +181,7 @@ 
 	 */
 	public function inc($key, $step = 1) {
 		$this->add($key, 0);
-		$result = self::$cache->increment($this->getPrefix() . $key, $step);
+		$result = self::$cache->increment($this->getPrefix().$key, $step);
 
 		if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
 			return false;
@@ -198,7 +198,7 @@ 
 	 * @return int | bool
 	 */
 	public function dec($key, $step = 1) {
-		$result = self::$cache->decrement($this->getPrefix() . $key, $step);
+		$result = self::$cache->decrement($this->getPrefix().$key, $step);
 
 		if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
 			return false;

Indentation +189 added lines, -189 removed lines

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

lib/private/OCS/Exception.php

Indentation +9 added lines, -9 removed lines

@@ -25,16 +25,16 @@
 
 class Exception extends \Exception {
 
-	/** @var Result */
-	private $result;
+    /** @var Result */
+    private $result;
 
-	public function __construct(Result $result) {
-		parent::__construct();
-		$this->result = $result;
-	}
+    public function __construct(Result $result) {
+        parent::__construct();
+        $this->result = $result;
+    }
 
-	public function getResult() {
-		return $this->result;
-	}
+    public function getResult() {
+        return $this->result;
+    }
 
 }

lib/private/BackgroundJob/QueuedJob.php

Indentation +10 added lines, -10 removed lines

@@ -32,14 +32,14 @@
  * @package OC\BackgroundJob
  */
 abstract class QueuedJob extends Job {
-	/**
-	 * run the job, then remove it from the joblist
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger|null $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		$jobList->remove($this, $this->argument);
-		parent::execute($jobList, $logger);
-	}
+    /**
+     * run the job, then remove it from the joblist
+     *
+     * @param JobList $jobList
+     * @param ILogger|null $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+        $jobList->remove($this, $this->argument);
+        parent::execute($jobList, $logger);
+    }
 }