nextcloud / server

lib/versioncheck.php

Spacing +3 added lines, -3 removed lines

@@ -1,12 +1,12 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 // Show warning if a PHP version below 7.0 is used, this has to happen here
 // because base.php will already use 7.0 syntax.
 if (version_compare(PHP_VERSION, '7.0') === -1) {
 	http_response_code(500);
 	echo 'This version of Nextcloud requires at least PHP 7.0<br/>';
-	echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
+	echo 'You are currently running '.PHP_VERSION.'. Please update your PHP version.';
 	exit(-1);
 }
 
@@ -14,6 +14,6 @@ 
 if (version_compare(PHP_VERSION, '7.3.0') !== -1) {
 	http_response_code(500);
 	echo 'This version of Nextcloud is not compatible with > PHP 7.2.<br/>';
-	echo 'You are currently running ' . PHP_VERSION . '.';
+	echo 'You are currently running '.PHP_VERSION.'.';
 	exit(-1);
 }

lib/autoloader.php

Indentation +147 added lines, -147 removed lines

@@ -36,151 +36,151 @@
 use \OCP\AutoloadNotAllowedException;
 
 class Autoloader {
-	/** @var bool */
-	private $useGlobalClassPath = true;
-	/** @var array */
-	private $validRoots = [];
-
-	/**
-	 * Optional low-latency memory cache for class to path mapping.
-	 *
-	 * @var \OC\Memcache\Cache
-	 */
-	protected $memoryCache;
-
-	/**
-	 * Autoloader constructor.
-	 *
-	 * @param string[] $validRoots
-	 */
-	public function __construct(array $validRoots) {
-		foreach ($validRoots as $root) {
-			$this->validRoots[$root] = true;
-		}
-	}
-
-	/**
-	 * Add a path to the list of valid php roots for auto loading
-	 *
-	 * @param string $root
-	 */
-	public function addValidRoot(string $root) {
-		$root = stream_resolve_include_path($root);
-		$this->validRoots[$root] = true;
-	}
-
-	/**
-	 * disable the usage of the global classpath \OC::$CLASSPATH
-	 */
-	public function disableGlobalClassPath() {
-		$this->useGlobalClassPath = false;
-	}
-
-	/**
-	 * enable the usage of the global classpath \OC::$CLASSPATH
-	 */
-	public function enableGlobalClassPath() {
-		$this->useGlobalClassPath = true;
-	}
-
-	/**
-	 * get the possible paths for a class
-	 *
-	 * @param string $class
-	 * @return array an array of possible paths
-	 */
-	public function findClass(string $class): array {
-		$class = trim($class, '\\');
-
-		$paths = [];
-		if ($this->useGlobalClassPath && array_key_exists($class, \OC::$CLASSPATH)) {
-			$paths[] = \OC::$CLASSPATH[$class];
-			/**
-			 * @TODO: Remove this when necessary
-			 * Remove "apps/" from inclusion path for smooth migration to multi app dir
-			 */
-			if (strpos(\OC::$CLASSPATH[$class], 'apps/') === 0) {
-				\OCP\Util::writeLog('core', 'include path for class "' . $class . '" starts with "apps/"', \OCP\Util::DEBUG);
-				$paths[] = str_replace('apps/', '', \OC::$CLASSPATH[$class]);
-			}
-		} elseif (strpos($class, 'OC_') === 0) {
-			$paths[] = \OC::$SERVERROOT . '/lib/private/legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
-		} elseif (strpos($class, 'OCA\\') === 0) {
-			list(, $app, $rest) = explode('\\', $class, 3);
-			$app = strtolower($app);
-			$appPath = \OC_App::getAppPath($app);
-			if ($appPath && stream_resolve_include_path($appPath)) {
-				$paths[] = $appPath . '/' . strtolower(str_replace('\\', '/', $rest) . '.php');
-				// If not found in the root of the app directory, insert '/lib' after app id and try again.
-				$paths[] = $appPath . '/lib/' . strtolower(str_replace('\\', '/', $rest) . '.php');
-			}
-		} elseif ($class === 'Test\\TestCase') {
-			// This File is considered public API, so we make sure that the class
-			// can still be loaded, although the PSR-4 paths have not been loaded.
-			$paths[] = \OC::$SERVERROOT . '/tests/lib/TestCase.php';
-		}
-		return $paths;
-	}
-
-	/**
-	 * @param string $fullPath
-	 * @return bool
-	 * @throws AutoloadNotAllowedException
-	 */
-	protected function isValidPath(string $fullPath): bool {
-		foreach ($this->validRoots as $root => $true) {
-			if (substr($fullPath, 0, strlen($root) + 1) === $root . '/') {
-				return true;
-			}
-		}
-		throw new AutoloadNotAllowedException($fullPath);
-	}
-
-	/**
-	 * Load the specified class
-	 *
-	 * @param string $class
-	 * @return bool
-	 * @throws AutoloadNotAllowedException
-	 */
-	public function load(string $class): bool {
-		$pathsToRequire = null;
-		if ($this->memoryCache) {
-			$pathsToRequire = $this->memoryCache->get($class);
-		}
-
-		if(class_exists($class, false)) {
-			return false;
-		}
-
-		if (!is_array($pathsToRequire)) {
-			// No cache or cache miss
-			$pathsToRequire = array();
-			foreach ($this->findClass($class) as $path) {
-				$fullPath = stream_resolve_include_path($path);
-				if ($fullPath && $this->isValidPath($fullPath)) {
-					$pathsToRequire[] = $fullPath;
-				}
-			}
-
-			if ($this->memoryCache) {
-				$this->memoryCache->set($class, $pathsToRequire, 60); // cache 60 sec
-			}
-		}
-
-		foreach ($pathsToRequire as $fullPath) {
-			require_once $fullPath;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Sets the optional low-latency cache for class to path mapping.
-	 *
-	 * @param \OC\Memcache\Cache $memoryCache Instance of memory cache.
-	 */
-	public function setMemoryCache(\OC\Memcache\Cache $memoryCache = null) {
-		$this->memoryCache = $memoryCache;
-	}
+    /** @var bool */
+    private $useGlobalClassPath = true;
+    /** @var array */
+    private $validRoots = [];
+
+    /**
+     * Optional low-latency memory cache for class to path mapping.
+     *
+     * @var \OC\Memcache\Cache
+     */
+    protected $memoryCache;
+
+    /**
+     * Autoloader constructor.
+     *
+     * @param string[] $validRoots
+     */
+    public function __construct(array $validRoots) {
+        foreach ($validRoots as $root) {
+            $this->validRoots[$root] = true;
+        }
+    }
+
+    /**
+     * Add a path to the list of valid php roots for auto loading
+     *
+     * @param string $root
+     */
+    public function addValidRoot(string $root) {
+        $root = stream_resolve_include_path($root);
+        $this->validRoots[$root] = true;
+    }
+
+    /**
+     * disable the usage of the global classpath \OC::$CLASSPATH
+     */
+    public function disableGlobalClassPath() {
+        $this->useGlobalClassPath = false;
+    }
+
+    /**
+     * enable the usage of the global classpath \OC::$CLASSPATH
+     */
+    public function enableGlobalClassPath() {
+        $this->useGlobalClassPath = true;
+    }
+
+    /**
+     * get the possible paths for a class
+     *
+     * @param string $class
+     * @return array an array of possible paths
+     */
+    public function findClass(string $class): array {
+        $class = trim($class, '\\');
+
+        $paths = [];
+        if ($this->useGlobalClassPath && array_key_exists($class, \OC::$CLASSPATH)) {
+            $paths[] = \OC::$CLASSPATH[$class];
+            /**
+             * @TODO: Remove this when necessary
+             * Remove "apps/" from inclusion path for smooth migration to multi app dir
+             */
+            if (strpos(\OC::$CLASSPATH[$class], 'apps/') === 0) {
+                \OCP\Util::writeLog('core', 'include path for class "' . $class . '" starts with "apps/"', \OCP\Util::DEBUG);
+                $paths[] = str_replace('apps/', '', \OC::$CLASSPATH[$class]);
+            }
+        } elseif (strpos($class, 'OC_') === 0) {
+            $paths[] = \OC::$SERVERROOT . '/lib/private/legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
+        } elseif (strpos($class, 'OCA\\') === 0) {
+            list(, $app, $rest) = explode('\\', $class, 3);
+            $app = strtolower($app);
+            $appPath = \OC_App::getAppPath($app);
+            if ($appPath && stream_resolve_include_path($appPath)) {
+                $paths[] = $appPath . '/' . strtolower(str_replace('\\', '/', $rest) . '.php');
+                // If not found in the root of the app directory, insert '/lib' after app id and try again.
+                $paths[] = $appPath . '/lib/' . strtolower(str_replace('\\', '/', $rest) . '.php');
+            }
+        } elseif ($class === 'Test\\TestCase') {
+            // This File is considered public API, so we make sure that the class
+            // can still be loaded, although the PSR-4 paths have not been loaded.
+            $paths[] = \OC::$SERVERROOT . '/tests/lib/TestCase.php';
+        }
+        return $paths;
+    }
+
+    /**
+     * @param string $fullPath
+     * @return bool
+     * @throws AutoloadNotAllowedException
+     */
+    protected function isValidPath(string $fullPath): bool {
+        foreach ($this->validRoots as $root => $true) {
+            if (substr($fullPath, 0, strlen($root) + 1) === $root . '/') {
+                return true;
+            }
+        }
+        throw new AutoloadNotAllowedException($fullPath);
+    }
+
+    /**
+     * Load the specified class
+     *
+     * @param string $class
+     * @return bool
+     * @throws AutoloadNotAllowedException
+     */
+    public function load(string $class): bool {
+        $pathsToRequire = null;
+        if ($this->memoryCache) {
+            $pathsToRequire = $this->memoryCache->get($class);
+        }
+
+        if(class_exists($class, false)) {
+            return false;
+        }
+
+        if (!is_array($pathsToRequire)) {
+            // No cache or cache miss
+            $pathsToRequire = array();
+            foreach ($this->findClass($class) as $path) {
+                $fullPath = stream_resolve_include_path($path);
+                if ($fullPath && $this->isValidPath($fullPath)) {
+                    $pathsToRequire[] = $fullPath;
+                }
+            }
+
+            if ($this->memoryCache) {
+                $this->memoryCache->set($class, $pathsToRequire, 60); // cache 60 sec
+            }
+        }
+
+        foreach ($pathsToRequire as $fullPath) {
+            require_once $fullPath;
+        }
+
+        return false;
+    }
+
+    /**
+     * Sets the optional low-latency cache for class to path mapping.
+     *
+     * @param \OC\Memcache\Cache $memoryCache Instance of memory cache.
+     */
+    public function setMemoryCache(\OC\Memcache\Cache $memoryCache = null) {
+        $this->memoryCache = $memoryCache;
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
@@ -100,24 +100,24 @@ 
 			 * Remove "apps/" from inclusion path for smooth migration to multi app dir
 			 */
 			if (strpos(\OC::$CLASSPATH[$class], 'apps/') === 0) {
-				\OCP\Util::writeLog('core', 'include path for class "' . $class . '" starts with "apps/"', \OCP\Util::DEBUG);
+				\OCP\Util::writeLog('core', 'include path for class "'.$class.'" starts with "apps/"', \OCP\Util::DEBUG);
 				$paths[] = str_replace('apps/', '', \OC::$CLASSPATH[$class]);
 			}
 		} elseif (strpos($class, 'OC_') === 0) {
-			$paths[] = \OC::$SERVERROOT . '/lib/private/legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
+			$paths[] = \OC::$SERVERROOT.'/lib/private/legacy/'.strtolower(str_replace('_', '/', substr($class, 3)).'.php');
 		} elseif (strpos($class, 'OCA\\') === 0) {
 			list(, $app, $rest) = explode('\\', $class, 3);
 			$app = strtolower($app);
 			$appPath = \OC_App::getAppPath($app);
 			if ($appPath && stream_resolve_include_path($appPath)) {
-				$paths[] = $appPath . '/' . strtolower(str_replace('\\', '/', $rest) . '.php');
+				$paths[] = $appPath.'/'.strtolower(str_replace('\\', '/', $rest).'.php');
 				// If not found in the root of the app directory, insert '/lib' after app id and try again.
-				$paths[] = $appPath . '/lib/' . strtolower(str_replace('\\', '/', $rest) . '.php');
+				$paths[] = $appPath.'/lib/'.strtolower(str_replace('\\', '/', $rest).'.php');
 			}
 		} elseif ($class === 'Test\\TestCase') {
 			// This File is considered public API, so we make sure that the class
 			// can still be loaded, although the PSR-4 paths have not been loaded.
-			$paths[] = \OC::$SERVERROOT . '/tests/lib/TestCase.php';
+			$paths[] = \OC::$SERVERROOT.'/tests/lib/TestCase.php';
 		}
 		return $paths;
 	}
@@ -129,7 +129,7 @@ 
 	 */
 	protected function isValidPath(string $fullPath): bool {
 		foreach ($this->validRoots as $root => $true) {
-			if (substr($fullPath, 0, strlen($root) + 1) === $root . '/') {
+			if (substr($fullPath, 0, strlen($root) + 1) === $root.'/') {
 				return true;
 			}
 		}
@@ -149,7 +149,7 @@ 
 			$pathsToRequire = $this->memoryCache->get($class);
 		}
 
-		if(class_exists($class, false)) {
+		if (class_exists($class, false)) {
 			return false;
 		}