elkarte / Elkarte

sources/ext/ClassLoader.php

Indentation +391 added lines, -391 removed lines

@@ -42,396 +42,396 @@ 
  */
 class ClassLoader
 {
-    // PSR-4
-    private $prefixLengthsPsr4 = array();
-    private $prefixDirsPsr4 = array();
-    private $fallbackDirsPsr4 = array();
-
-    // PSR-0
-    private $prefixesPsr0 = array();
-    private $fallbackDirsPsr0 = array();
-
-    private $useIncludePath = false;
-    private $classMap = array();
-    private $classMapAuthoritative = false;
-    private $missingClasses = array();
-    private $apcuPrefix;
-
-    public function getPrefixes()
-    {
-        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
-        }
-
-        return array();
-    }
-
-    public function getPrefixesPsr4()
-    {
-        return $this->prefixDirsPsr4;
-    }
-
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirsPsr0;
-    }
-
-    public function getFallbackDirsPsr4()
-    {
-        return $this->fallbackDirsPsr4;
-    }
-
-    public function getClassMap()
-    {
-        return $this->classMap;
-    }
-
-    /**
-     * @param array $classMap Class to filename map
-     */
-    public function addClassMap(array $classMap)
-    {
-        if ($this->classMap) {
-            $this->classMap = array_merge($this->classMap, $classMap);
-        } else {
-            $this->classMap = $classMap;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix, either
-     * appending or prepending to the ones previously set for this prefix.
-     *
-     * @param string       $prefix  The prefix
-     * @param array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
-     */
-    public function add($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            if ($prepend) {
-                $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr0
-                );
-            } else {
-                $this->fallbackDirsPsr0 = array_merge(
-                    $this->fallbackDirsPsr0,
-                    (array) $paths
-                );
-            }
-
-            return;
-        }
-
-        $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
-
-            return;
-        }
-        if ($prepend) {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixesPsr0[$first][$prefix]
-            );
-        } else {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace, either
-     * appending or prepending to the ones previously set for this namespace.
-     *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function addPsr4($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            // Register directories for the root namespace.
-            if ($prepend) {
-                $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr4
-                );
-            } else {
-                $this->fallbackDirsPsr4 = array_merge(
-                    $this->fallbackDirsPsr4,
-                    (array) $paths
-                );
-            }
-        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
-            // Register directories for a new namespace.
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        } elseif ($prepend) {
-            // Prepend directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixDirsPsr4[$prefix]
-            );
-        } else {
-            // Append directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                $this->prefixDirsPsr4[$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix,
-     * replacing any others previously set for this prefix.
-     *
-     * @param string       $prefix The prefix
-     * @param array|string $paths  The PSR-0 base directories
-     */
-    public function set($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr0 = (array) $paths;
-        } else {
-            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace,
-     * replacing any others previously set for this namespace.
-     *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setPsr4($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr4 = (array) $paths;
-        } else {
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Turns on searching the include path for class files.
-     *
-     * @param bool $useIncludePath
-     */
-    public function setUseIncludePath($useIncludePath)
-    {
-        $this->useIncludePath = $useIncludePath;
-    }
-
-    /**
-     * Can be used to check if the autoloader uses the include path to check
-     * for classes.
-     *
-     * @return bool
-     */
-    public function getUseIncludePath()
-    {
-        return $this->useIncludePath;
-    }
-
-    /**
-     * Turns off searching the prefix and fallback directories for classes
-     * that have not been registered with the class map.
-     *
-     * @param bool $classMapAuthoritative
-     */
-    public function setClassMapAuthoritative($classMapAuthoritative)
-    {
-        $this->classMapAuthoritative = $classMapAuthoritative;
-    }
-
-    /**
-     * Should class lookup fail if not found in the current class map?
-     *
-     * @return bool
-     */
-    public function isClassMapAuthoritative()
-    {
-        return $this->classMapAuthoritative;
-    }
-
-    /**
-     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
-     *
-     * @param string|null $apcuPrefix
-     */
-    public function setApcuPrefix($apcuPrefix)
-    {
-        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
-    }
-
-    /**
-     * The APCu prefix in use, or null if APCu caching is not enabled.
-     *
-     * @return string|null
-     */
-    public function getApcuPrefix()
-    {
-        return $this->apcuPrefix;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            includeFile($file);
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|false The path if found, false otherwise
-     */
-    public function findFile($class)
-    {
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
-            return false;
-        }
-        if (null !== $this->apcuPrefix) {
-            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
-            if ($hit) {
-                return $file;
-            }
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if (false === $file && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if (null !== $this->apcuPrefix) {
-            apcu_add($this->apcuPrefix.$class, $file);
-        }
-
-        if (false === $file) {
-            // Remember that this class does not exist.
-            $this->missingClasses[$class] = true;
-        }
-
-        return $file;
-    }
-
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            $subPath = $class;
-            while (false !== $lastPos = strrpos($subPath, '\\')) {
-                $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
-                if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
-                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-4 fallback dirs
-        foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 lookup
-        if (false !== $pos = strrpos($class, '\\')) {
-            // namespaced class name
-            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
-                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
-        } else {
-            // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
-        }
-
-        if (isset($this->prefixesPsr0[$first])) {
-            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-0 fallback dirs
-        foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 include paths.
-        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
-            return $file;
-        }
-
-        return false;
-    }
+	// PSR-4
+	private $prefixLengthsPsr4 = array();
+	private $prefixDirsPsr4 = array();
+	private $fallbackDirsPsr4 = array();
+
+	// PSR-0
+	private $prefixesPsr0 = array();
+	private $fallbackDirsPsr0 = array();
+
+	private $useIncludePath = false;
+	private $classMap = array();
+	private $classMapAuthoritative = false;
+	private $missingClasses = array();
+	private $apcuPrefix;
+
+	public function getPrefixes()
+	{
+		if (!empty($this->prefixesPsr0)) {
+			return call_user_func_array('array_merge', $this->prefixesPsr0);
+		}
+
+		return array();
+	}
+
+	public function getPrefixesPsr4()
+	{
+		return $this->prefixDirsPsr4;
+	}
+
+	public function getFallbackDirs()
+	{
+		return $this->fallbackDirsPsr0;
+	}
+
+	public function getFallbackDirsPsr4()
+	{
+		return $this->fallbackDirsPsr4;
+	}
+
+	public function getClassMap()
+	{
+		return $this->classMap;
+	}
+
+	/**
+	 * @param array $classMap Class to filename map
+	 */
+	public function addClassMap(array $classMap)
+	{
+		if ($this->classMap) {
+			$this->classMap = array_merge($this->classMap, $classMap);
+		} else {
+			$this->classMap = $classMap;
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-0 directories for a given prefix, either
+	 * appending or prepending to the ones previously set for this prefix.
+	 *
+	 * @param string       $prefix  The prefix
+	 * @param array|string $paths   The PSR-0 root directories
+	 * @param bool         $prepend Whether to prepend the directories
+	 */
+	public function add($prefix, $paths, $prepend = false)
+	{
+		if (!$prefix) {
+			if ($prepend) {
+				$this->fallbackDirsPsr0 = array_merge(
+					(array) $paths,
+					$this->fallbackDirsPsr0
+				);
+			} else {
+				$this->fallbackDirsPsr0 = array_merge(
+					$this->fallbackDirsPsr0,
+					(array) $paths
+				);
+			}
+
+			return;
+		}
+
+		$first = $prefix[0];
+		if (!isset($this->prefixesPsr0[$first][$prefix])) {
+			$this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+			return;
+		}
+		if ($prepend) {
+			$this->prefixesPsr0[$first][$prefix] = array_merge(
+				(array) $paths,
+				$this->prefixesPsr0[$first][$prefix]
+			);
+		} else {
+			$this->prefixesPsr0[$first][$prefix] = array_merge(
+				$this->prefixesPsr0[$first][$prefix],
+				(array) $paths
+			);
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-4 directories for a given namespace, either
+	 * appending or prepending to the ones previously set for this namespace.
+	 *
+	 * @param string       $prefix  The prefix/namespace, with trailing '\\'
+	 * @param array|string $paths   The PSR-4 base directories
+	 * @param bool         $prepend Whether to prepend the directories
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	public function addPsr4($prefix, $paths, $prepend = false)
+	{
+		if (!$prefix) {
+			// Register directories for the root namespace.
+			if ($prepend) {
+				$this->fallbackDirsPsr4 = array_merge(
+					(array) $paths,
+					$this->fallbackDirsPsr4
+				);
+			} else {
+				$this->fallbackDirsPsr4 = array_merge(
+					$this->fallbackDirsPsr4,
+					(array) $paths
+				);
+			}
+		} elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+			// Register directories for a new namespace.
+			$length = strlen($prefix);
+			if ('\\' !== $prefix[$length - 1]) {
+				throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+			}
+			$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+			$this->prefixDirsPsr4[$prefix] = (array) $paths;
+		} elseif ($prepend) {
+			// Prepend directories for an already registered namespace.
+			$this->prefixDirsPsr4[$prefix] = array_merge(
+				(array) $paths,
+				$this->prefixDirsPsr4[$prefix]
+			);
+		} else {
+			// Append directories for an already registered namespace.
+			$this->prefixDirsPsr4[$prefix] = array_merge(
+				$this->prefixDirsPsr4[$prefix],
+				(array) $paths
+			);
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-0 directories for a given prefix,
+	 * replacing any others previously set for this prefix.
+	 *
+	 * @param string       $prefix The prefix
+	 * @param array|string $paths  The PSR-0 base directories
+	 */
+	public function set($prefix, $paths)
+	{
+		if (!$prefix) {
+			$this->fallbackDirsPsr0 = (array) $paths;
+		} else {
+			$this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-4 directories for a given namespace,
+	 * replacing any others previously set for this namespace.
+	 *
+	 * @param string       $prefix The prefix/namespace, with trailing '\\'
+	 * @param array|string $paths  The PSR-4 base directories
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	public function setPsr4($prefix, $paths)
+	{
+		if (!$prefix) {
+			$this->fallbackDirsPsr4 = (array) $paths;
+		} else {
+			$length = strlen($prefix);
+			if ('\\' !== $prefix[$length - 1]) {
+				throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+			}
+			$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+			$this->prefixDirsPsr4[$prefix] = (array) $paths;
+		}
+	}
+
+	/**
+	 * Turns on searching the include path for class files.
+	 *
+	 * @param bool $useIncludePath
+	 */
+	public function setUseIncludePath($useIncludePath)
+	{
+		$this->useIncludePath = $useIncludePath;
+	}
+
+	/**
+	 * Can be used to check if the autoloader uses the include path to check
+	 * for classes.
+	 *
+	 * @return bool
+	 */
+	public function getUseIncludePath()
+	{
+		return $this->useIncludePath;
+	}
+
+	/**
+	 * Turns off searching the prefix and fallback directories for classes
+	 * that have not been registered with the class map.
+	 *
+	 * @param bool $classMapAuthoritative
+	 */
+	public function setClassMapAuthoritative($classMapAuthoritative)
+	{
+		$this->classMapAuthoritative = $classMapAuthoritative;
+	}
+
+	/**
+	 * Should class lookup fail if not found in the current class map?
+	 *
+	 * @return bool
+	 */
+	public function isClassMapAuthoritative()
+	{
+		return $this->classMapAuthoritative;
+	}
+
+	/**
+	 * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+	 *
+	 * @param string|null $apcuPrefix
+	 */
+	public function setApcuPrefix($apcuPrefix)
+	{
+		$this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+	}
+
+	/**
+	 * The APCu prefix in use, or null if APCu caching is not enabled.
+	 *
+	 * @return string|null
+	 */
+	public function getApcuPrefix()
+	{
+		return $this->apcuPrefix;
+	}
+
+	/**
+	 * Registers this instance as an autoloader.
+	 *
+	 * @param bool $prepend Whether to prepend the autoloader or not
+	 */
+	public function register($prepend = false)
+	{
+		spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+	}
+
+	/**
+	 * Unregisters this instance as an autoloader.
+	 */
+	public function unregister()
+	{
+		spl_autoload_unregister(array($this, 'loadClass'));
+	}
+
+	/**
+	 * Loads the given class or interface.
+	 *
+	 * @param  string    $class The name of the class
+	 * @return bool|null True if loaded, null otherwise
+	 */
+	public function loadClass($class)
+	{
+		if ($file = $this->findFile($class)) {
+			includeFile($file);
+
+			return true;
+		}
+	}
+
+	/**
+	 * Finds the path to the file where the class is defined.
+	 *
+	 * @param string $class The name of the class
+	 *
+	 * @return string|false The path if found, false otherwise
+	 */
+	public function findFile($class)
+	{
+		// class map lookup
+		if (isset($this->classMap[$class])) {
+			return $this->classMap[$class];
+		}
+		if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
+			return false;
+		}
+		if (null !== $this->apcuPrefix) {
+			$file = apcu_fetch($this->apcuPrefix.$class, $hit);
+			if ($hit) {
+				return $file;
+			}
+		}
+
+		$file = $this->findFileWithExtension($class, '.php');
+
+		// Search for Hack files if we are running on HHVM
+		if (false === $file && defined('HHVM_VERSION')) {
+			$file = $this->findFileWithExtension($class, '.hh');
+		}
+
+		if (null !== $this->apcuPrefix) {
+			apcu_add($this->apcuPrefix.$class, $file);
+		}
+
+		if (false === $file) {
+			// Remember that this class does not exist.
+			$this->missingClasses[$class] = true;
+		}
+
+		return $file;
+	}
+
+	private function findFileWithExtension($class, $ext)
+	{
+		// PSR-4 lookup
+		$logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+		$first = $class[0];
+		if (isset($this->prefixLengthsPsr4[$first])) {
+			$subPath = $class;
+			while (false !== $lastPos = strrpos($subPath, '\\')) {
+				$subPath = substr($subPath, 0, $lastPos);
+				$search = $subPath . '\\';
+				if (isset($this->prefixDirsPsr4[$search])) {
+					$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+					foreach ($this->prefixDirsPsr4[$search] as $dir) {
+						if (file_exists($file = $dir . $pathEnd)) {
+							return $file;
+						}
+					}
+				}
+			}
+		}
+
+		// PSR-4 fallback dirs
+		foreach ($this->fallbackDirsPsr4 as $dir) {
+			if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+				return $file;
+			}
+		}
+
+		// PSR-0 lookup
+		if (false !== $pos = strrpos($class, '\\')) {
+			// namespaced class name
+			$logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+				. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+		} else {
+			// PEAR-like class name
+			$logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+		}
+
+		if (isset($this->prefixesPsr0[$first])) {
+			foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+				if (0 === strpos($class, $prefix)) {
+					foreach ($dirs as $dir) {
+						if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+							return $file;
+						}
+					}
+				}
+			}
+		}
+
+		// PSR-0 fallback dirs
+		foreach ($this->fallbackDirsPsr0 as $dir) {
+			if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+				return $file;
+			}
+		}
+
+		// PSR-0 include paths.
+		if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+			return $file;
+		}
+
+		return false;
+	}
 }
 
 /**
@@ -441,5 +441,5 @@ 
  */
 function includeFile($file)
 {
-    include $file;
+	include $file;
 }

Braces +102 added lines, -46 removed lines

@@ -59,7 +59,8 @@ 
 
     public function getPrefixes()
     {
-        if (!empty($this->prefixesPsr0)) {
+        if (!empty($this->prefixesPsr0))
+        {
             return call_user_func_array('array_merge', $this->prefixesPsr0);
         }
 
@@ -91,9 +92,12 @@ 
      */
     public function addClassMap(array $classMap)
     {
-        if ($this->classMap) {
+        if ($this->classMap)
+        {
             $this->classMap = array_merge($this->classMap, $classMap);
-        } else {
+        }
+        else
+        {
             $this->classMap = $classMap;
         }
     }
@@ -108,13 +112,17 @@ 
      */
     public function add($prefix, $paths, $prepend = false)
     {
-        if (!$prefix) {
-            if ($prepend) {
+        if (!$prefix)
+        {
+            if ($prepend)
+            {
                 $this->fallbackDirsPsr0 = array_merge(
                     (array) $paths,
                     $this->fallbackDirsPsr0
                 );
-            } else {
+            }
+            else
+            {
                 $this->fallbackDirsPsr0 = array_merge(
                     $this->fallbackDirsPsr0,
                     (array) $paths
@@ -125,17 +133,21 @@ 
         }
 
         $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
+        if (!isset($this->prefixesPsr0[$first][$prefix]))
+        {
             $this->prefixesPsr0[$first][$prefix] = (array) $paths;
 
             return;
         }
-        if ($prepend) {
+        if ($prepend)
+        {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
                 (array) $paths,
                 $this->prefixesPsr0[$first][$prefix]
             );
-        } else {
+        }
+        else
+        {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
                 $this->prefixesPsr0[$first][$prefix],
                 (array) $paths
@@ -155,34 +167,45 @@ 
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
-        if (!$prefix) {
+        if (!$prefix)
+        {
             // Register directories for the root namespace.
-            if ($prepend) {
+            if ($prepend)
+            {
                 $this->fallbackDirsPsr4 = array_merge(
                     (array) $paths,
                     $this->fallbackDirsPsr4
                 );
-            } else {
+            }
+            else
+            {
                 $this->fallbackDirsPsr4 = array_merge(
                     $this->fallbackDirsPsr4,
                     (array) $paths
                 );
             }
-        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+        }
+        elseif (!isset($this->prefixDirsPsr4[$prefix]))
+        {
             // Register directories for a new namespace.
             $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
+            if ('\\' !== $prefix[$length - 1])
+            {
                 throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
             }
             $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
             $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        } elseif ($prepend) {
+        }
+        elseif ($prepend)
+        {
             // Prepend directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
                 (array) $paths,
                 $this->prefixDirsPsr4[$prefix]
             );
-        } else {
+        }
+        else
+        {
             // Append directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
                 $this->prefixDirsPsr4[$prefix],
@@ -200,9 +223,12 @@ 
      */
     public function set($prefix, $paths)
     {
-        if (!$prefix) {
+        if (!$prefix)
+        {
             $this->fallbackDirsPsr0 = (array) $paths;
-        } else {
+        }
+        else
+        {
             $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
         }
     }
@@ -218,11 +244,15 @@ 
      */
     public function setPsr4($prefix, $paths)
     {
-        if (!$prefix) {
+        if (!$prefix)
+        {
             $this->fallbackDirsPsr4 = (array) $paths;
-        } else {
+        }
+        else
+        {
             $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
+            if ('\\' !== $prefix[$length - 1])
+            {
                 throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
             }
             $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
@@ -318,7 +348,8 @@ 
      */
     public function loadClass($class)
     {
-        if ($file = $this->findFile($class)) {
+        if ($file = $this->findFile($class))
+        {
             includeFile($file);
 
             return true;
@@ -335,15 +366,19 @@ 
     public function findFile($class)
     {
         // class map lookup
-        if (isset($this->classMap[$class])) {
+        if (isset($this->classMap[$class]))
+        {
             return $this->classMap[$class];
         }
-        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class]))
+        {
             return false;
         }
-        if (null !== $this->apcuPrefix) {
+        if (null !== $this->apcuPrefix)
+        {
             $file = apcu_fetch($this->apcuPrefix.$class, $hit);
-            if ($hit) {
+            if ($hit)
+            {
                 return $file;
             }
         }
@@ -351,15 +386,18 @@ 
         $file = $this->findFileWithExtension($class, '.php');
 
         // Search for Hack files if we are running on HHVM
-        if (false === $file && defined('HHVM_VERSION')) {
+        if (false === $file && defined('HHVM_VERSION'))
+        {
             $file = $this->findFileWithExtension($class, '.hh');
         }
 
-        if (null !== $this->apcuPrefix) {
+        if (null !== $this->apcuPrefix)
+        {
             apcu_add($this->apcuPrefix.$class, $file);
         }
 
-        if (false === $file) {
+        if (false === $file)
+        {
             // Remember that this class does not exist.
             $this->missingClasses[$class] = true;
         }
@@ -373,15 +411,20 @@ 
         $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
 
         $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
+        if (isset($this->prefixLengthsPsr4[$first]))
+        {
             $subPath = $class;
-            while (false !== $lastPos = strrpos($subPath, '\\')) {
+            while (false !== $lastPos = strrpos($subPath, '\\'))
+            {
                 $subPath = substr($subPath, 0, $lastPos);
                 $search = $subPath . '\\';
-                if (isset($this->prefixDirsPsr4[$search])) {
+                if (isset($this->prefixDirsPsr4[$search]))
+                {
                     $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
-                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                    foreach ($this->prefixDirsPsr4[$search] as $dir)
+                    {
+                        if (file_exists($file = $dir . $pathEnd))
+                        {
                             return $file;
                         }
                     }
@@ -390,27 +433,37 @@ 
         }
 
         // PSR-4 fallback dirs
-        foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+        foreach ($this->fallbackDirsPsr4 as $dir)
+        {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4))
+            {
                 return $file;
             }
         }
 
         // PSR-0 lookup
-        if (false !== $pos = strrpos($class, '\\')) {
+        if (false !== $pos = strrpos($class, '\\'))
+        {
             // namespaced class name
             $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
-        } else {
+        }
+        else
+        {
             // PEAR-like class name
             $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
         }
 
-        if (isset($this->prefixesPsr0[$first])) {
-            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+        if (isset($this->prefixesPsr0[$first]))
+        {
+            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs)
+            {
+                if (0 === strpos($class, $prefix))
+                {
+                    foreach ($dirs as $dir)
+                    {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0))
+                        {
                             return $file;
                         }
                     }
@@ -419,14 +472,17 @@ 
         }
 
         // PSR-0 fallback dirs
-        foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+        foreach ($this->fallbackDirsPsr0 as $dir)
+        {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0))
+            {
                 return $file;
             }
         }
 
         // PSR-0 include paths.
-        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0))
+        {
             return $file;
         }
 

sources/Security.php

Braces +4 added lines, -1 removed lines

@@ -1730,10 +1730,13 @@
 		if ($result[0] === 127 // Valid Response
 			&& ($result[3] & 3 || $result[3] & 5) // Listed as Suspicious + Harvester || Suspicious + Comment Spammer
 			&& $result[2] >= $modSettings['badbehavior_httpbl_threat'] // Level
-			&& $result[1] <= $modSettings['badbehavior_httpbl_maxage']) // Age
+			&& $result[1] <= $modSettings['badbehavior_httpbl_maxage'])
+		{
+			// Age
 		{
 			return true;
 		}
+		}
 	}
 
 	return false;

sources/subs/PaidSubscriptions.subs.php

Braces +3 added lines, -1 removed lines

@@ -1377,11 +1377,13 @@
 		{
 			// If we revert to the old id-group we need to ensure it wasn't from a subscription.
 			foreach ($context['subscriptions'] as $id => $group)
-				// It was? Make them a regular member then!
+			{
+							// It was? Make them a regular member then!
 			{
 				if ($group['prim_group'] == $member['id_group'])
 				{
 					$member['id_group'] = 0;
+			}
 				}
 			}
 

sources/subs/Post.subs.php

Braces +3 added lines, -1 removed lines

@@ -735,10 +735,12 @@
 		}
 		// If this is being unapproved, and it's equal to the id_last_msg we need to find a new one!
 		elseif (!$approve)
-			// Default to the first message and then we'll override in a bit ;)
+		{
+					// Default to the first message and then we'll override in a bit ;)
 		{
 			$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_first_msg'];
 		}
+		}
 
 		$topic_changes[$row['id_topic']]['unapproved_posts'] += $approve ? -1 : 1;
 		$board_changes[$row['id_board']]['unapproved_posts'] += $approve ? -1 : 1;

sources/ElkArte/AdminController/ManageFeatures.php

Braces +1 added lines, -2 removed lines

@@ -306,8 +306,7 @@
 					class_exists($modSettings['front_page'])
 					&& in_array('validateFrontPageOptions', get_class_methods($modSettings['front_page']))
 					&& !$front_page::validateFrontPageOptions($this->_req->post)
-				)
-				{
+				) {
 					$this->_req->post->front_page = '';
 				}
 			}

addons/index.php

Braces +3 added lines, -2 removed lines

@@ -12,5 +12,6 @@
 	header('Location: ' . $boardurl);
 }
 // Can't find it... just forget it.
-else
-	exit;
\ No newline at end of file
+else {
+	exit;
+}

themes/index.php

Braces +2 added lines, -1 removed lines

@@ -12,5 +12,6 @@
 	header('Location: ' . $boardurl);
 }
 // Can't find it... just forget it.
-else
+else {
 	exit;
+}

themes/default/css/index.php

Braces +5 added lines, -2 removed lines

@@ -2,6 +2,9 @@
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
 if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+{
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
-	exit;
\ No newline at end of file
+}
+else {
+	exit;
+}

themes/default/images/post/index.php

Braces +5 added lines, -2 removed lines

@@ -2,6 +2,9 @@
 
 // Try to handle it with the upper level index.php.  (it should know what to do.)
 if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+{
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
-	exit;
\ No newline at end of file
+}
+else {
+	exit;
+}