nextcloud / server

lib/private/BackgroundJob/Legacy/RegularJob.php

Indentation +10 added lines, -10 removed lines

@@ -26,14 +26,14 @@
 use OCP\AutoloadNotAllowedException;
 
 class RegularJob extends \OC\BackgroundJob\Job {
-	public function run($argument) {
-		try {
-			if (is_callable($argument)) {
-				call_user_func($argument);
-			}
-		} catch (AutoloadNotAllowedException $e) {
-			// job is from a disabled app, ignore
-			return null;
-		}
-	}
+    public function run($argument) {
+        try {
+            if (is_callable($argument)) {
+                call_user_func($argument);
+            }
+        } catch (AutoloadNotAllowedException $e) {
+            // job is from a disabled app, ignore
+            return null;
+        }
+    }
 }

lib/private/BackgroundJob/Legacy/QueuedJob.php

Indentation +8 added lines, -8 removed lines

@@ -24,12 +24,12 @@
 namespace OC\BackgroundJob\Legacy;
 
 class QueuedJob extends \OC\BackgroundJob\QueuedJob {
-	public function run($argument) {
-		$class = $argument['klass'];
-		$method = $argument['method'];
-		$parameters = $argument['parameters'];
-		if (is_callable(array($class, $method))) {
-			call_user_func(array($class, $method), $parameters);
-		}
-	}
+    public function run($argument) {
+        $class = $argument['klass'];
+        $method = $argument['method'];
+        $parameters = $argument['parameters'];
+        if (is_callable(array($class, $method))) {
+            call_user_func(array($class, $method), $parameters);
+        }
+    }
 }

lib/private/Settings/Section.php

Indentation +58 added lines, -58 removed lines

@@ -26,67 +26,67 @@
 use OCP\Settings\IIconSection;
 
 class Section implements IIconSection {
-	/** @var string */
-	private $id;
-	/** @var string */
-	private $name;
-	/** @var int */
-	private $priority;
-	/** @var string */
-	private $icon;
+    /** @var string */
+    private $id;
+    /** @var string */
+    private $name;
+    /** @var int */
+    private $priority;
+    /** @var string */
+    private $icon;
 
-	/**
-	 * @param string $id
-	 * @param string $name
-	 * @param int $priority
-	 * @param string $icon
-	 */
-	public function __construct($id, $name, $priority, $icon = '') {
-		$this->id = $id;
-		$this->name = $name;
-		$this->priority = $priority;
-		$this->icon = $icon;
-	}
+    /**
+     * @param string $id
+     * @param string $name
+     * @param int $priority
+     * @param string $icon
+     */
+    public function __construct($id, $name, $priority, $icon = '') {
+        $this->id = $id;
+        $this->name = $name;
+        $this->priority = $priority;
+        $this->icon = $icon;
+    }
 
-	/**
-	 * returns the ID of the section. It is supposed to be a lower case string,
-	 * e.g. 'ldap'
-	 *
-	 * @returns string
-	 */
-	public function getID() {
-		return $this->id;
-	}
+    /**
+     * returns the ID of the section. It is supposed to be a lower case string,
+     * e.g. 'ldap'
+     *
+     * @returns string
+     */
+    public function getID() {
+        return $this->id;
+    }
 
-	/**
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
-	 * integration'. Use the L10N service to translate it.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	}
+    /**
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+     * integration'. Use the L10N service to translate it.
+     *
+     * @return string
+     */
+    public function getName() {
+        return $this->name;
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the settings navigation. The sections are arranged in ascending order of
-	 * the priority values. It is required to return a value between 0 and 99.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return $this->priority;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the settings navigation. The sections are arranged in ascending order of
+     * the priority values. It is required to return a value between 0 and 99.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return $this->priority;
+    }
 
-	/**
-	 * returns the relative path to an 16*16 icon describing the section.
-	 * e.g. '/core/img/places/files.svg'
-	 *
-	 * @returns string
-	 * @since 12
-	 */
-	public function getIcon() {
-		return $this->icon;
-	}
+    /**
+     * returns the relative path to an 16*16 icon describing the section.
+     * e.g. '/core/img/places/files.svg'
+     *
+     * @returns string
+     * @since 12
+     */
+    public function getIcon() {
+        return $this->icon;
+    }
 }

lib/private/Settings/RemoveOrphaned.php

Spacing +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
 	private $manager;
 
 	public function __construct(Manager $manager = null) {
-		if($manager !== null) {
+		if ($manager !== null) {
 			$this->manager = $manager;
 		} else {
 			// fix DI for Jobs
@@ -62,7 +62,7 @@ 
 	 */
 	public function execute($jobList, ILogger $logger = null) {
 		// add an interval of 15 mins
-		$this->setInterval(15*60);
+		$this->setInterval(15 * 60);
 
 		$this->jobList = $jobList;
 		$this->logger = $logger;

Indentation +43 added lines, -43 removed lines

@@ -36,56 +36,56 @@
  */
 class RemoveOrphaned extends TimedJob {
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/** @var Manager */
-	private $manager;
+    /** @var Manager */
+    private $manager;
 
-	public function __construct(Manager $manager = null) {
-		if($manager !== null) {
-			$this->manager = $manager;
-		} else {
-			// fix DI for Jobs
-			$this->manager = \OC::$server->getSettingsManager();
-		}
-	}
+    public function __construct(Manager $manager = null) {
+        if($manager !== null) {
+            $this->manager = $manager;
+        } else {
+            // fix DI for Jobs
+            $this->manager = \OC::$server->getSettingsManager();
+        }
+    }
 
-	/**
-	 * run the job, then remove it from the job list
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger|null $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		// add an interval of 15 mins
-		$this->setInterval(15*60);
+    /**
+     * run the job, then remove it from the job list
+     *
+     * @param JobList $jobList
+     * @param ILogger|null $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+        // add an interval of 15 mins
+        $this->setInterval(15*60);
 
-		$this->jobList = $jobList;
-		$this->logger = $logger;
-		parent::execute($jobList, $logger);
-	}
+        $this->jobList = $jobList;
+        $this->logger = $logger;
+        parent::execute($jobList, $logger);
+    }
 
-	/**
-	 * @param array $argument
-	 * @throws \Exception
-	 * @throws \OC\NeedsUpdateException
-	 */
-	protected function run($argument) {
-		try {
-			\OC_App::loadApps();
-		} catch (NeedsUpdateException $ex) {
-			// only run when apps are up to date
-			return;
-		}
+    /**
+     * @param array $argument
+     * @throws \Exception
+     * @throws \OC\NeedsUpdateException
+     */
+    protected function run($argument) {
+        try {
+            \OC_App::loadApps();
+        } catch (NeedsUpdateException $ex) {
+            // only run when apps are up to date
+            return;
+        }
 
-		$this->manager->checkForOrphanedClassNames();
+        $this->manager->checkForOrphanedClassNames();
 
-		// remove the job once executed successfully
-		$this->jobList->remove($this);
-	}
+        // remove the job once executed successfully
+        $this->jobList->remove($this);
+    }
 
 }

lib/private/Streamer.php

Indentation +91 added lines, -91 removed lines

@@ -28,105 +28,105 @@
 use ZipStreamer\ZipStreamer;
 
 class Streamer {
-	// array of regexp. Matching user agents will get tar instead of zip
-	private $preferTarFor = [ '/macintosh|mac os x/i' ];
+    // array of regexp. Matching user agents will get tar instead of zip
+    private $preferTarFor = [ '/macintosh|mac os x/i' ];
 
-	// streamer instance
-	private $streamerInstance;
+    // streamer instance
+    private $streamerInstance;
 	
-	public function __construct(){
-		/** @var \OCP\IRequest */
-		$request = \OC::$server->getRequest();
+    public function __construct(){
+        /** @var \OCP\IRequest */
+        $request = \OC::$server->getRequest();
 		
-		if ($request->isUserAgent($this->preferTarFor)) {
-			$this->streamerInstance = new TarStreamer();
-		} else {
-			$this->streamerInstance = new ZipStreamer(['zip64' => PHP_INT_SIZE !== 4]);
-		}
-	}
+        if ($request->isUserAgent($this->preferTarFor)) {
+            $this->streamerInstance = new TarStreamer();
+        } else {
+            $this->streamerInstance = new ZipStreamer(['zip64' => PHP_INT_SIZE !== 4]);
+        }
+    }
 	
-	/**
-	 * Send HTTP headers
-	 * @param string $name 
-	 */
-	public function sendHeaders($name){
-		$extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
-		$fullName = $name . $extension;
-		$this->streamerInstance->sendHeaders($fullName);
-	}
+    /**
+     * Send HTTP headers
+     * @param string $name 
+     */
+    public function sendHeaders($name){
+        $extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
+        $fullName = $name . $extension;
+        $this->streamerInstance->sendHeaders($fullName);
+    }
 	
-	/**
-	 * Stream directory recursively
-	 * @param string $dir
-	 * @param string $internalDir
-	 */
-	public function addDirRecursive($dir, $internalDir='') {
-		$dirname = basename($dir);
-		$rootDir = $internalDir . $dirname;
-		if (!empty($rootDir)) {
-			$this->streamerInstance->addEmptyDir($rootDir);
-		}
-		$internalDir .= $dirname . '/';
-		// prevent absolute dirs
-		$internalDir = ltrim($internalDir, '/');
+    /**
+     * Stream directory recursively
+     * @param string $dir
+     * @param string $internalDir
+     */
+    public function addDirRecursive($dir, $internalDir='') {
+        $dirname = basename($dir);
+        $rootDir = $internalDir . $dirname;
+        if (!empty($rootDir)) {
+            $this->streamerInstance->addEmptyDir($rootDir);
+        }
+        $internalDir .= $dirname . '/';
+        // prevent absolute dirs
+        $internalDir = ltrim($internalDir, '/');
 
-		$files= \OC\Files\Filesystem::getDirectoryContent($dir);
-		foreach($files as $file) {
-			$filename = $file['name'];
-			$file = $dir . '/' . $filename;
-			if(\OC\Files\Filesystem::is_file($file)) {
-				$filesize = \OC\Files\Filesystem::filesize($file);
-				$fileTime = \OC\Files\Filesystem::filemtime($file);
-				$fh = \OC\Files\Filesystem::fopen($file, 'r');
-				$this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
-				fclose($fh);
-			}elseif(\OC\Files\Filesystem::is_dir($file)) {
-				$this->addDirRecursive($file, $internalDir);
-			}
-		}
-	}
+        $files= \OC\Files\Filesystem::getDirectoryContent($dir);
+        foreach($files as $file) {
+            $filename = $file['name'];
+            $file = $dir . '/' . $filename;
+            if(\OC\Files\Filesystem::is_file($file)) {
+                $filesize = \OC\Files\Filesystem::filesize($file);
+                $fileTime = \OC\Files\Filesystem::filemtime($file);
+                $fh = \OC\Files\Filesystem::fopen($file, 'r');
+                $this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
+                fclose($fh);
+            }elseif(\OC\Files\Filesystem::is_dir($file)) {
+                $this->addDirRecursive($file, $internalDir);
+            }
+        }
+    }
 	
-	/**
-	 * Add a file to the archive at the specified location and file name.
-	 *
-	 * @param string $stream Stream to read data from
-	 * @param string $internalName Filepath and name to be used in the archive.
-	 * @param int $size Filesize
-	 * @param int|bool $time File mtime as int, or false
-	 * @return bool $success
-	 */
-	public function addFileFromStream($stream, $internalName, $size, $time) {
-		$options = [];
-		if ($time) {
-			$options = [
-				'timestamp' => $time
-			];
-		}
+    /**
+     * Add a file to the archive at the specified location and file name.
+     *
+     * @param string $stream Stream to read data from
+     * @param string $internalName Filepath and name to be used in the archive.
+     * @param int $size Filesize
+     * @param int|bool $time File mtime as int, or false
+     * @return bool $success
+     */
+    public function addFileFromStream($stream, $internalName, $size, $time) {
+        $options = [];
+        if ($time) {
+            $options = [
+                'timestamp' => $time
+            ];
+        }
 
-		if ($this->streamerInstance instanceof ZipStreamer) {
-			return $this->streamerInstance->addFileFromStream($stream, $internalName, $options);
-		} else {
-			return $this->streamerInstance->addFileFromStream($stream, $internalName, $size, $options);
-		}
-	}
+        if ($this->streamerInstance instanceof ZipStreamer) {
+            return $this->streamerInstance->addFileFromStream($stream, $internalName, $options);
+        } else {
+            return $this->streamerInstance->addFileFromStream($stream, $internalName, $size, $options);
+        }
+    }
 
-	/**
-	 * Add an empty directory entry to the archive.
-	 *
-	 * @param string $dirName Directory Path and name to be added to the archive.
-	 * @return bool $success
-	 */
-	public function addEmptyDir($dirName){
-		return $this->streamerInstance->addEmptyDir($dirName);
-	}
+    /**
+     * Add an empty directory entry to the archive.
+     *
+     * @param string $dirName Directory Path and name to be added to the archive.
+     * @return bool $success
+     */
+    public function addEmptyDir($dirName){
+        return $this->streamerInstance->addEmptyDir($dirName);
+    }
 
-	/**
-	 * Close the archive.
-	 * A closed archive can no longer have new files added to it. After
-	 * closing, the file is completely written to the output stream.
-	 * @return bool $success
-	 */
-	public function finalize(){
-		return $this->streamerInstance->finalize();
-	}
+    /**
+     * Close the archive.
+     * A closed archive can no longer have new files added to it. After
+     * closing, the file is completely written to the output stream.
+     * @return bool $success
+     */
+    public function finalize(){
+        return $this->streamerInstance->finalize();
+    }
 }

Spacing +15 added lines, -15 removed lines

@@ -29,12 +29,12 @@ 
 
 class Streamer {
 	// array of regexp. Matching user agents will get tar instead of zip
-	private $preferTarFor = [ '/macintosh|mac os x/i' ];
+	private $preferTarFor = ['/macintosh|mac os x/i'];
 
 	// streamer instance
 	private $streamerInstance;
 	
-	public function __construct(){
+	public function __construct() {
 		/** @var \OCP\IRequest */
 		$request = \OC::$server->getRequest();
 		
@@ -49,9 +49,9 @@ 
 	 * Send HTTP headers
 	 * @param string $name 
 	 */
-	public function sendHeaders($name){
+	public function sendHeaders($name) {
 		$extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
-		$fullName = $name . $extension;
+		$fullName = $name.$extension;
 		$this->streamerInstance->sendHeaders($fullName);
 	}
 	
@@ -60,27 +60,27 @@ 
 	 * @param string $dir
 	 * @param string $internalDir
 	 */
-	public function addDirRecursive($dir, $internalDir='') {
+	public function addDirRecursive($dir, $internalDir = '') {
 		$dirname = basename($dir);
-		$rootDir = $internalDir . $dirname;
+		$rootDir = $internalDir.$dirname;
 		if (!empty($rootDir)) {
 			$this->streamerInstance->addEmptyDir($rootDir);
 		}
-		$internalDir .= $dirname . '/';
+		$internalDir .= $dirname.'/';
 		// prevent absolute dirs
 		$internalDir = ltrim($internalDir, '/');
 
-		$files= \OC\Files\Filesystem::getDirectoryContent($dir);
-		foreach($files as $file) {
+		$files = \OC\Files\Filesystem::getDirectoryContent($dir);
+		foreach ($files as $file) {
 			$filename = $file['name'];
-			$file = $dir . '/' . $filename;
-			if(\OC\Files\Filesystem::is_file($file)) {
+			$file = $dir.'/'.$filename;
+			if (\OC\Files\Filesystem::is_file($file)) {
 				$filesize = \OC\Files\Filesystem::filesize($file);
 				$fileTime = \OC\Files\Filesystem::filemtime($file);
 				$fh = \OC\Files\Filesystem::fopen($file, 'r');
-				$this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
+				$this->addFileFromStream($fh, $internalDir.$filename, $filesize, $fileTime);
 				fclose($fh);
-			}elseif(\OC\Files\Filesystem::is_dir($file)) {
+			}elseif (\OC\Files\Filesystem::is_dir($file)) {
 				$this->addDirRecursive($file, $internalDir);
 			}
 		}
@@ -116,7 +116,7 @@ 
 	 * @param string $dirName Directory Path and name to be added to the archive.
 	 * @return bool $success
 	 */
-	public function addEmptyDir($dirName){
+	public function addEmptyDir($dirName) {
 		return $this->streamerInstance->addEmptyDir($dirName);
 	}
 
@@ -126,7 +126,7 @@ 
 	 * closing, the file is completely written to the output stream.
 	 * @return bool $success
 	 */
-	public function finalize(){
+	public function finalize() {
 		return $this->streamerInstance->finalize();
 	}
 }

Braces +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 				$fh = \OC\Files\Filesystem::fopen($file, 'r');
 				$this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
 				fclose($fh);
-			}elseif(\OC\Files\Filesystem::is_dir($file)) {
+			} elseif(\OC\Files\Filesystem::is_dir($file)) {
 				$this->addDirRecursive($file, $internalDir);
 			}
 		}

lib/private/Memcache/Factory.php

Indentation +154 added lines, -154 removed lines

@@ -34,158 +34,158 @@
 use \OCP\ILogger;
 
 class Factory implements ICacheFactory {
-	const NULL_CACHE = '\\OC\\Memcache\\NullCache';
-
-	/**
-	 * @var string $globalPrefix
-	 */
-	private $globalPrefix;
-
-	/**
-	 * @var ILogger $logger
-	 */
-	private $logger;
-
-	/**
-	 * @var string $localCacheClass
-	 */
-	private $localCacheClass;
-
-	/**
-	 * @var string $distributedCacheClass
-	 */
-	private $distributedCacheClass;
-
-	/**
-	 * @var string $lockingCacheClass
-	 */
-	private $lockingCacheClass;
-
-	/**
-	 * @param string $globalPrefix
-	 * @param ILogger $logger
-	 * @param string|null $localCacheClass
-	 * @param string|null $distributedCacheClass
-	 * @param string|null $lockingCacheClass
-	 */
-	public function __construct($globalPrefix, ILogger $logger,
-		$localCacheClass = null, $distributedCacheClass = null, $lockingCacheClass = null)
-	{
-		$this->logger = $logger;
-		$this->globalPrefix = $globalPrefix;
-
-		if (!$localCacheClass) {
-			$localCacheClass = self::NULL_CACHE;
-		}
-		if (!$distributedCacheClass) {
-			$distributedCacheClass = $localCacheClass;
-		}
-
-		$missingCacheMessage = 'Memcache {class} not available for {use} cache';
-		$missingCacheHint = 'Is the matching PHP module installed and enabled?';
-		if (!class_exists($localCacheClass) || !$localCacheClass::isAvailable()) {
-			if (\OC::$CLI && !defined('PHPUNIT_RUN')) {
-				// CLI should not hard-fail on broken memcache
-				$this->logger->info($missingCacheMessage, [
-					'class' => $localCacheClass,
-					'use' => 'local',
-					'app' => 'cli'
-				]);
-				$localCacheClass = self::NULL_CACHE;
-			} else {
-				throw new \OC\HintException(strtr($missingCacheMessage, [
-					'{class}' => $localCacheClass, '{use}' => 'local'
-				]), $missingCacheHint);
-			}
-		}
-		if (!class_exists($distributedCacheClass) || !$distributedCacheClass::isAvailable()) {
-			if (\OC::$CLI && !defined('PHPUNIT_RUN')) {
-				// CLI should not hard-fail on broken memcache
-				$this->logger->info($missingCacheMessage, [
-					'class' => $distributedCacheClass,
-					'use' => 'distributed',
-					'app' => 'cli'
-				]);
-				$distributedCacheClass = self::NULL_CACHE;
-			} else {
-				throw new \OC\HintException(strtr($missingCacheMessage, [
-					'{class}' => $distributedCacheClass, '{use}' => 'distributed'
-				]), $missingCacheHint);
-			}
-		}
-		if (!($lockingCacheClass && class_exists($distributedCacheClass) && $lockingCacheClass::isAvailable())) {
-			// don't fallback since the fallback might not be suitable for storing lock
-			$lockingCacheClass = self::NULL_CACHE;
-		}
-
-		$this->localCacheClass = $localCacheClass;
-		$this->distributedCacheClass = $distributedCacheClass;
-		$this->lockingCacheClass = $lockingCacheClass;
-	}
-
-	/**
-	 * create a cache instance for storing locks
-	 *
-	 * @param string $prefix
-	 * @return \OCP\IMemcache
-	 */
-	public function createLocking($prefix = '') {
-		return new $this->lockingCacheClass($this->globalPrefix . '/' . $prefix);
-	}
-
-	/**
-	 * create a distributed cache instance
-	 *
-	 * @param string $prefix
-	 * @return \OC\Memcache\Cache
-	 */
-	public function createDistributed($prefix = '') {
-		return new $this->distributedCacheClass($this->globalPrefix . '/' . $prefix);
-	}
-
-	/**
-	 * create a local cache instance
-	 *
-	 * @param string $prefix
-	 * @return \OC\Memcache\Cache
-	 */
-	public function createLocal($prefix = '') {
-		return new $this->localCacheClass($this->globalPrefix . '/' . $prefix);
-	}
-
-	/**
-	 * @see \OC\Memcache\Factory::createDistributed()
-	 * @param string $prefix
-	 * @return \OC\Memcache\Cache
-	 */
-	public function create($prefix = '') {
-		return $this->createDistributed($prefix);
-	}
-
-	/**
-	 * check memcache availability
-	 *
-	 * @return bool
-	 */
-	public function isAvailable() {
-		return ($this->distributedCacheClass !== self::NULL_CACHE);
-	}
-
-	/**
-	 * @see \OC\Memcache\Factory::createLocal()
-	 * @param string $prefix
-	 * @return Cache
-	 */
-	public function createLowLatency($prefix = '') {
-		return $this->createLocal($prefix);
-	}
-
-	/**
-	 * check local memcache availability
-	 *
-	 * @return bool
-	 */
-	public function isAvailableLowLatency() {
-		return ($this->localCacheClass !== self::NULL_CACHE);
-	}
+    const NULL_CACHE = '\\OC\\Memcache\\NullCache';
+
+    /**
+     * @var string $globalPrefix
+     */
+    private $globalPrefix;
+
+    /**
+     * @var ILogger $logger
+     */
+    private $logger;
+
+    /**
+     * @var string $localCacheClass
+     */
+    private $localCacheClass;
+
+    /**
+     * @var string $distributedCacheClass
+     */
+    private $distributedCacheClass;
+
+    /**
+     * @var string $lockingCacheClass
+     */
+    private $lockingCacheClass;
+
+    /**
+     * @param string $globalPrefix
+     * @param ILogger $logger
+     * @param string|null $localCacheClass
+     * @param string|null $distributedCacheClass
+     * @param string|null $lockingCacheClass
+     */
+    public function __construct($globalPrefix, ILogger $logger,
+        $localCacheClass = null, $distributedCacheClass = null, $lockingCacheClass = null)
+    {
+        $this->logger = $logger;
+        $this->globalPrefix = $globalPrefix;
+
+        if (!$localCacheClass) {
+            $localCacheClass = self::NULL_CACHE;
+        }
+        if (!$distributedCacheClass) {
+            $distributedCacheClass = $localCacheClass;
+        }
+
+        $missingCacheMessage = 'Memcache {class} not available for {use} cache';
+        $missingCacheHint = 'Is the matching PHP module installed and enabled?';
+        if (!class_exists($localCacheClass) || !$localCacheClass::isAvailable()) {
+            if (\OC::$CLI && !defined('PHPUNIT_RUN')) {
+                // CLI should not hard-fail on broken memcache
+                $this->logger->info($missingCacheMessage, [
+                    'class' => $localCacheClass,
+                    'use' => 'local',
+                    'app' => 'cli'
+                ]);
+                $localCacheClass = self::NULL_CACHE;
+            } else {
+                throw new \OC\HintException(strtr($missingCacheMessage, [
+                    '{class}' => $localCacheClass, '{use}' => 'local'
+                ]), $missingCacheHint);
+            }
+        }
+        if (!class_exists($distributedCacheClass) || !$distributedCacheClass::isAvailable()) {
+            if (\OC::$CLI && !defined('PHPUNIT_RUN')) {
+                // CLI should not hard-fail on broken memcache
+                $this->logger->info($missingCacheMessage, [
+                    'class' => $distributedCacheClass,
+                    'use' => 'distributed',
+                    'app' => 'cli'
+                ]);
+                $distributedCacheClass = self::NULL_CACHE;
+            } else {
+                throw new \OC\HintException(strtr($missingCacheMessage, [
+                    '{class}' => $distributedCacheClass, '{use}' => 'distributed'
+                ]), $missingCacheHint);
+            }
+        }
+        if (!($lockingCacheClass && class_exists($distributedCacheClass) && $lockingCacheClass::isAvailable())) {
+            // don't fallback since the fallback might not be suitable for storing lock
+            $lockingCacheClass = self::NULL_CACHE;
+        }
+
+        $this->localCacheClass = $localCacheClass;
+        $this->distributedCacheClass = $distributedCacheClass;
+        $this->lockingCacheClass = $lockingCacheClass;
+    }
+
+    /**
+     * create a cache instance for storing locks
+     *
+     * @param string $prefix
+     * @return \OCP\IMemcache
+     */
+    public function createLocking($prefix = '') {
+        return new $this->lockingCacheClass($this->globalPrefix . '/' . $prefix);
+    }
+
+    /**
+     * create a distributed cache instance
+     *
+     * @param string $prefix
+     * @return \OC\Memcache\Cache
+     */
+    public function createDistributed($prefix = '') {
+        return new $this->distributedCacheClass($this->globalPrefix . '/' . $prefix);
+    }
+
+    /**
+     * create a local cache instance
+     *
+     * @param string $prefix
+     * @return \OC\Memcache\Cache
+     */
+    public function createLocal($prefix = '') {
+        return new $this->localCacheClass($this->globalPrefix . '/' . $prefix);
+    }
+
+    /**
+     * @see \OC\Memcache\Factory::createDistributed()
+     * @param string $prefix
+     * @return \OC\Memcache\Cache
+     */
+    public function create($prefix = '') {
+        return $this->createDistributed($prefix);
+    }
+
+    /**
+     * check memcache availability
+     *
+     * @return bool
+     */
+    public function isAvailable() {
+        return ($this->distributedCacheClass !== self::NULL_CACHE);
+    }
+
+    /**
+     * @see \OC\Memcache\Factory::createLocal()
+     * @param string $prefix
+     * @return Cache
+     */
+    public function createLowLatency($prefix = '') {
+        return $this->createLocal($prefix);
+    }
+
+    /**
+     * check local memcache availability
+     *
+     * @return bool
+     */
+    public function isAvailableLowLatency() {
+        return ($this->localCacheClass !== self::NULL_CACHE);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -130,7 +130,7 @@ 
 	 * @return \OCP\IMemcache
 	 */
 	public function createLocking($prefix = '') {
-		return new $this->lockingCacheClass($this->globalPrefix . '/' . $prefix);
+		return new $this->lockingCacheClass($this->globalPrefix.'/'.$prefix);
 	}
 
 	/**
@@ -140,7 +140,7 @@ 
 	 * @return \OC\Memcache\Cache
 	 */
 	public function createDistributed($prefix = '') {
-		return new $this->distributedCacheClass($this->globalPrefix . '/' . $prefix);
+		return new $this->distributedCacheClass($this->globalPrefix.'/'.$prefix);
 	}
 
 	/**
@@ -150,7 +150,7 @@ 
 	 * @return \OC\Memcache\Cache
 	 */
 	public function createLocal($prefix = '') {
-		return new $this->localCacheClass($this->globalPrefix . '/' . $prefix);
+		return new $this->localCacheClass($this->globalPrefix.'/'.$prefix);
 	}
 
 	/**

lib/private/Memcache/CASTrait.php

Indentation +27 added lines, -27 removed lines

@@ -23,35 +23,35 @@
 namespace OC\Memcache;
 
 trait CASTrait {
-	abstract public function get($key);
+    abstract public function get($key);
 
-	abstract public function set($key, $value, $ttl = 0);
+    abstract public function set($key, $value, $ttl = 0);
 
-	abstract public function remove($key);
+    abstract public function remove($key);
 
-	abstract public function add($key, $value, $ttl = 0);
+    abstract public function add($key, $value, $ttl = 0);
 
-	/**
-	 * Compare and set
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @param mixed $new
-	 * @return bool
-	 */
-	public function cas($key, $old, $new) {
-		//no native cas, emulate with locking
-		if ($this->add($key . '_lock', true)) {
-			if ($this->get($key) === $old) {
-				$this->set($key, $new);
-				$this->remove($key . '_lock');
-				return true;
-			} else {
-				$this->remove($key . '_lock');
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
+    /**
+     * Compare and set
+     *
+     * @param string $key
+     * @param mixed $old
+     * @param mixed $new
+     * @return bool
+     */
+    public function cas($key, $old, $new) {
+        //no native cas, emulate with locking
+        if ($this->add($key . '_lock', true)) {
+            if ($this->get($key) === $old) {
+                $this->set($key, $new);
+                $this->remove($key . '_lock');
+                return true;
+            } else {
+                $this->remove($key . '_lock');
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -41,13 +41,13 @@
 	 */
 	public function cas($key, $old, $new) {
 		//no native cas, emulate with locking
-		if ($this->add($key . '_lock', true)) {
+		if ($this->add($key.'_lock', true)) {
 			if ($this->get($key) === $old) {
 				$this->set($key, $new);
-				$this->remove($key . '_lock');
+				$this->remove($key.'_lock');
 				return true;
 			} else {
-				$this->remove($key . '_lock');
+				$this->remove($key.'_lock');
 				return false;
 			}
 		} else {

lib/private/Memcache/Cache.php

Indentation +56 added lines, -56 removed lines

@@ -26,72 +26,72 @@
 namespace OC\Memcache;
 
 abstract class Cache implements \ArrayAccess, \OCP\ICache {
-	/**
-	 * @var string $prefix
-	 */
-	protected $prefix;
+    /**
+     * @var string $prefix
+     */
+    protected $prefix;
 
-	/**
-	 * @param string $prefix
-	 */
-	public function __construct($prefix = '') {
-		$this->prefix = $prefix;
-	}
+    /**
+     * @param string $prefix
+     */
+    public function __construct($prefix = '') {
+        $this->prefix = $prefix;
+    }
 
-	/**
-	 * @return string Prefix used for caching purposes
-	 */
-	public function getPrefix() {
-		return $this->prefix;
-	}
+    /**
+     * @return string Prefix used for caching purposes
+     */
+    public function getPrefix() {
+        return $this->prefix;
+    }
 
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	abstract public function get($key);
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    abstract public function get($key);
 
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 * @param int $ttl
-	 * @return mixed
-	 */
-	abstract public function set($key, $value, $ttl = 0);
+    /**
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl
+     * @return mixed
+     */
+    abstract public function set($key, $value, $ttl = 0);
 
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	abstract public function hasKey($key);
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    abstract public function hasKey($key);
 
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	abstract public function remove($key);
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    abstract public function remove($key);
 
-	/**
-	 * @param string $prefix
-	 * @return mixed
-	 */
-	abstract public function clear($prefix = '');
+    /**
+     * @param string $prefix
+     * @return mixed
+     */
+    abstract public function clear($prefix = '');
 
-	//implement the ArrayAccess interface
+    //implement the ArrayAccess interface
 
-	public function offsetExists($offset) {
-		return $this->hasKey($offset);
-	}
+    public function offsetExists($offset) {
+        return $this->hasKey($offset);
+    }
 
-	public function offsetSet($offset, $value) {
-		$this->set($offset, $value);
-	}
+    public function offsetSet($offset, $value) {
+        $this->set($offset, $value);
+    }
 
-	public function offsetGet($offset) {
-		return $this->get($offset);
-	}
+    public function offsetGet($offset) {
+        return $this->get($offset);
+    }
 
-	public function offsetUnset($offset) {
-		$this->remove($offset);
-	}
+    public function offsetUnset($offset) {
+        $this->remove($offset);
+    }
 }

lib/private/Memcache/CADTrait.php

Indentation +25 added lines, -25 removed lines

@@ -23,32 +23,32 @@
 namespace OC\Memcache;
 
 trait CADTrait {
-	abstract public function get($key);
+    abstract public function get($key);
 
-	abstract public function remove($key);
+    abstract public function remove($key);
 
-	abstract public function add($key, $value, $ttl = 0);
+    abstract public function add($key, $value, $ttl = 0);
 
-	/**
-	 * Compare and delete
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @return bool
-	 */
-	public function cad($key, $old) {
-		//no native cas, emulate with locking
-		if ($this->add($key . '_lock', true)) {
-			if ($this->get($key) === $old) {
-				$this->remove($key);
-				$this->remove($key . '_lock');
-				return true;
-			} else {
-				$this->remove($key . '_lock');
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
+    /**
+     * Compare and delete
+     *
+     * @param string $key
+     * @param mixed $old
+     * @return bool
+     */
+    public function cad($key, $old) {
+        //no native cas, emulate with locking
+        if ($this->add($key . '_lock', true)) {
+            if ($this->get($key) === $old) {
+                $this->remove($key);
+                $this->remove($key . '_lock');
+                return true;
+            } else {
+                $this->remove($key . '_lock');
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -38,13 +38,13 @@
 	 */
 	public function cad($key, $old) {
 		//no native cas, emulate with locking
-		if ($this->add($key . '_lock', true)) {
+		if ($this->add($key.'_lock', true)) {
 			if ($this->get($key) === $old) {
 				$this->remove($key);
-				$this->remove($key . '_lock');
+				$this->remove($key.'_lock');
 				return true;
 			} else {
-				$this->remove($key . '_lock');
+				$this->remove($key.'_lock');
 				return false;
 			}
 		} else {