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;
 }

Spacing +2 added lines, -2 removed lines

@@ -342,7 +342,7 @@ 
             return false;
         }
         if (null !== $this->apcuPrefix) {
-            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            $file = apcu_fetch($this->apcuPrefix . $class, $hit);
             if ($hit) {
                 return $file;
             }
@@ -356,7 +356,7 @@ 
         }
 
         if (null !== $this->apcuPrefix) {
-            apcu_add($this->apcuPrefix.$class, $file);
+            apcu_add($this->apcuPrefix . $class, $file);
         }
 
         if (false === $file) {

sources/subs/MessageIcons.subs.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 		ORDER BY m.icon_order',
 		[]
 	)->fetch_callback(
-		function ($row) use (&$icons, &$last_icon, &$trueOrder) {
+		function($row) use (&$icons, &$last_icon, &$trueOrder) {
 			global $settings, $txt;
 
 			$icons[$row['id_icon']] = [

sources/subs/Attachments.subs.php

Spacing +1 added lines, -1 removed lines

@@ -614,7 +614,7 @@
 			'type' => 0,
 		)
 	)->fetch_callback(
-		function ($row) use (&$attachmentData) {
+		function($row) use (&$attachmentData) {
 			$attachmentData = $row;
 			$attachmentData['is_image'] = substr($attachmentData['mime_type'], 0, 5) === 'image';
 			$attachmentData['size'] = byte_format($attachmentData['size']);

sources/subs/ManageSearch.subs.php

Spacing +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
 		FROM {db_prefix}messages',
 		array()
 	)->fetch_callback(
-		function ($row) use (&$fulltext_index) {
+		function($row) use (&$fulltext_index) {
 			if (($row['Column_name'] === 'body' || $row['Column_name'] === 'subject')
 				&& (isset($row['Index_type']) && $row['Index_type'] === 'FULLTEXT'
 					|| isset($row['Comment']) && $row['Comment'] === 'FULLTEXT'))
@@ -380,7 +380,7 @@ 
 			'starting_id' => $start,
 		)
 	)->fetch_callback(
-		function ($row) use (&$num_messages) {
+		function($row) use (&$num_messages) {
 			$num_messages[empty($row['todo']) ? 'done' : 'todo'] = $row['num_messages'];
 		}
 	);
@@ -414,7 +414,7 @@ 
 					'limit' => $messages_per_batch,
 				)
 			)->fetch_callback(
-				function ($row) use (&$forced_break, &$number_processed, &$inserts, $stop) {
+				function($row) use (&$forced_break, &$number_processed, &$inserts, $stop) {
 					// In theory it's possible for one of these to take friggin ages so add more timeout protection.
 					if ($stop < time() || $forced_break)
 					{
@@ -501,7 +501,7 @@ 
 				'minimum_messages' => $max_occurrences,
 			)
 		)->fetch_callback(
-			function ($row) use (&$stop_words) {
+			function($row) use (&$stop_words) {
 				$stop_words[] = $row['id_word'];
 			}
 		);

sources/subs/Post.subs.php

Spacing +2 added lines, -2 removed lines

@@ -785,7 +785,7 @@ 
 				'approved' => 1,
 			)
 		)->fetch_callback(
-			function ($row) use (&$topic_changes) {
+			function($row) use (&$topic_changes) {
 				$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_last_msg'];
 			}
 		);
@@ -947,7 +947,7 @@ 
 				'approved' => 1,
 			)
 		)->fetch_callback(
-			function ($row) use (&$lastMsg) {
+			function($row) use (&$lastMsg) {
 				$lastMsg[$row['id_board']] = $row['id_msg'];
 			}
 		);

sources/subs/RepairBoards.subs.php

Spacing +33 added lines, -33 removed lines

@@ -107,7 +107,7 @@ 
 					LEFT JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)
 				WHERE t.id_topic IS NULL
 				GROUP BY m.id_topic, m.id_board',
-			'fix_processing' => function ($row) {
+			'fix_processing' => function($row) {
 				$db = database();
 
 				// Only if we don't have a reasonable idea of where to put it.
@@ -196,7 +196,7 @@ 
 			// Remove all topics that have zero messages in the messages table.
 			'fix_collect' => array(
 				'index' => 'id_topic',
-				'process' => function ($topics) {
+				'process' => function($topics) {
 					$db = database();
 
 					$db->query('', '
@@ -231,7 +231,7 @@ 
 					LEFT JOIN {db_prefix}topics AS t ON (t.id_poll = p.id_poll)
 				WHERE p.id_poll BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND t.id_poll IS NULL',
-			'fix_processing' => function ($row) {
+			'fix_processing' => function($row) {
 				global $txt;
 
 				$db = database();
@@ -346,7 +346,7 @@ 
 				WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				GROUP BY t.id_topic, t.id_first_msg, t.id_last_msg, t.approved, mf.approved
 				ORDER BY t.id_topic',
-			'fix_processing' => function ($row) {
+			'fix_processing' => function($row) {
 				$row['firstmsg_approved'] = (int) $row['firstmsg_approved'];
 				$row['myid_first_msg'] = (int) $row['myid_first_msg'];
 				$row['myid_last_msg'] = (int) $row['myid_last_msg'];
@@ -369,7 +369,7 @@ 
 					'approved' => $row['firstmsg_approved'],
 				));
 			},
-			'message_function' => function ($row) {
+			'message_function' => function($row) {
 				global $txt, $context;
 
 				// A pretend error?
@@ -414,7 +414,7 @@ 
 				WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				GROUP BY t.id_topic, t.num_replies, mf.approved
 				ORDER BY t.id_topic',
-			'fix_processing' => function ($row) {
+			'fix_processing' => function($row) {
 				$row['my_num_replies'] = (int) $row['my_num_replies'];
 
 				// Not really a problem?
@@ -428,7 +428,7 @@ 
 					'num_replies' => $row['my_num_replies'],
 				));
 			},
-			'message_function' => function ($row) {
+			'message_function' => function($row) {
 				global $txt, $context;
 
 				// Just joking?
@@ -462,7 +462,7 @@ 
 				GROUP BY t.id_topic, t.unapproved_posts
 				HAVING unapproved_posts != COUNT(mu.id_msg)
 				ORDER BY t.id_topic',
-			'fix_processing' => function ($row) {
+			'fix_processing' => function($row) {
 				$row['my_unapproved_posts'] = (int) $row['my_unapproved_posts'];
 
 				setTopicAttribute($row['id_topic'], array(
@@ -496,7 +496,7 @@ 
 				WHERE b.id_board IS NULL
 					AND t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				GROUP BY t.id_board',
-			'fix_processing' => function ($row) {
+			'fix_processing' => function($row) {
 				global $txt;
 
 				$db = database();
@@ -547,7 +547,7 @@ 
 				ORDER BY b.id_cat, b.id_board',
 			'fix_collect' => array(
 				'index' => 'id_cat',
-				'process' => function ($cats) {
+				'process' => function($cats) {
 					$db = database();
 					$salvageCatID = createSalvageCategory();
 					$db->query('', '
@@ -583,7 +583,7 @@ 
 			// Last step-make sure all non-guest posters still exist.
 			'fix_collect' => array(
 				'index' => 'id_msg',
-				'process' => function ($msgs) {
+				'process' => function($msgs) {
 					$db = database();
 
 					$db->query('', '
@@ -612,7 +612,7 @@ 
 				ORDER BY b.id_parent, b.id_board',
 			'fix_collect' => array(
 				'index' => 'id_parent',
-				'process' => function ($parents) {
+				'process' => function($parents) {
 					$db = database();
 					$salvageCatID = createSalvageCategory();
 					$salvageBoardID = createSalvageBoard();
@@ -649,7 +649,7 @@ 
 					AND p.id_poll IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_poll',
-				'process' => function ($polls) {
+				'process' => function($polls) {
 					$db = database();
 
 					$db->query('', '
@@ -683,7 +683,7 @@ 
 				ORDER BY cal.id_topic',
 			'fix_collect' => array(
 				'index' => 'id_topic',
-				'process' => function ($events) {
+				'process' => function($events) {
 					$db = database();
 
 					$db->query('', '
@@ -714,7 +714,7 @@ 
 					AND lt.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
 			'fix_collect' => array(
 				'index' => 'id_topic',
-				'process' => function ($topics) {
+				'process' => function($topics) {
 					$db = database();
 
 					$db->query('', '
@@ -743,7 +743,7 @@ 
 					AND lt.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -772,7 +772,7 @@ 
 					AND lb.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
 			'fix_collect' => array(
 				'index' => 'id_board',
-				'process' => function ($boards) {
+				'process' => function($boards) {
 					$db = database();
 
 					$db->query('', '
@@ -801,7 +801,7 @@ 
 					AND lb.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -830,7 +830,7 @@ 
 					AND lmr.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
 			'fix_collect' => array(
 				'index' => 'id_board',
-				'process' => function ($boards) {
+				'process' => function($boards) {
 					$db = database();
 
 					$db->query('', '
@@ -859,7 +859,7 @@ 
 					AND lmr.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -890,7 +890,7 @@ 
 				GROUP BY pmr.id_pm',
 			'fix_collect' => array(
 				'index' => 'id_pm',
-				'process' => function ($pms) {
+				'process' => function($pms) {
 					$db = database();
 
 					$db->query('', '
@@ -920,7 +920,7 @@ 
 					AND mem.id_member IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -951,7 +951,7 @@ 
 					AND mem.id_member IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_pm',
-				'process' => function ($guestMessages) {
+				'process' => function($guestMessages) {
 					$db = database();
 
 					$db->query('', '
@@ -980,7 +980,7 @@ 
 					AND mem.id_member IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -1009,7 +1009,7 @@ 
 					LEFT JOIN {db_prefix}log_search_subjects AS lss ON (lss.id_topic = t.id_topic)
 				WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND lss.id_topic IS NULL',
-			'fix_full_processing' => function ($result) {
+			'fix_full_processing' => function($result) {
 
 				$db = database();
 
@@ -1043,7 +1043,7 @@ 
 					);
 				}
 			},
-			'message_function' => function ($row) {
+			'message_function' => function($row) {
 				global $txt, $context;
 
 				if (count(text2words($row['subject'])) != 0)
@@ -1072,7 +1072,7 @@ 
 					AND t.id_topic IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_topic',
-				'process' => function ($deleteTopics) {
+				'process' => function($deleteTopics) {
 					$db = database();
 
 					$db->query('', '
@@ -1103,7 +1103,7 @@ 
 					AND mem.id_member IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -1133,7 +1133,7 @@ 
 					AND p.id_poll IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_poll',
-				'process' => function ($polls) {
+				'process' => function($polls) {
 					$db = database();
 
 					$db->query('', '
@@ -1163,7 +1163,7 @@ 
 					AND lrc.id_report IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_report',
-				'process' => function ($reports) {
+				'process' => function($reports) {
 					$db = database();
 
 					$db->query('', '
@@ -1193,7 +1193,7 @@ 
 					AND lr.id_report IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_report',
-				'process' => function ($reports) {
+				'process' => function($reports) {
 					$db = database();
 
 					$db->query('', '
@@ -1222,7 +1222,7 @@ 
 					AND mem.id_member IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -1251,7 +1251,7 @@ 
 					AND mg.id_group IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_group',
-				'process' => function ($groups) {
+				'process' => function($groups) {
 					$db = database();
 
 					$db->query('', '

sources/subs/Language.subs.php

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
 		GROUP BY lngfile',
 		array()
 	)->fetch_callback(
-		function ($row) use (&$languages, $language) {
+		function($row) use (&$languages, $language) {
 			// Default?
 			if (empty($row['lngfile']) || !isset($languages[$row['lngfile']]))
 			{

sources/subs/ManagePermissions.subs.php

Spacing +12 added lines, -12 removed lines

@@ -330,7 +330,7 @@ 
 				'newbie_group' => 4,
 			)
 		)->fetch_callback(
-			function ($row) use ($db, $boardLevels, $profile, $level) {
+			function($row) use ($db, $boardLevels, $profile, $level) {
 				$group = $row['id_group'];
 
 				$boardInserts = array();
@@ -388,7 +388,7 @@ 
 		ORDER BY id_profile',
 		array()
 	)->fetch_callback(
-		function ($row) use ($txt) {
+		function($row) use ($txt) {
 			global $context;
 
 			// Format the label nicely.
@@ -737,7 +737,7 @@ 
 			'hidden_permissions' => !isset($hidden_permissions) ? $hidden_permissions : array(),
 		)
 	)->fetch_callback(
-		function ($row) use (&$groups) {
+		function($row) use (&$groups) {
 			if (isset($groups[(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
 			{
 				$groups[$row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] = $row['num_permissions'];
@@ -775,7 +775,7 @@ 
 			'current_profile' => $profile_id,
 		)
 	)->fetch_callback(
-		function ($row) use (&$groups) {
+		function($row) use (&$groups) {
 			if (isset($groups[(int) $row['id_group']]) && (!empty($row['add_deny']) || $row['id_group'] != -1))
 			{
 				$groups[$row['id_group']]['num_permissions'][empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
@@ -834,7 +834,7 @@ 
 			'copy_from' => $copy_from,
 		)
 	)->fetch_callback(
-		function ($row) use (&$target_perm) {
+		function($row) use (&$target_perm) {
 			$target_perm[$row['permission']] = $row['add_deny'];
 		}
 	);
@@ -907,7 +907,7 @@ 
 			'current_profile' => $profile_id,
 		)
 	)->fetch_callback(
-		function ($row) use (&$target_perm) {
+		function($row) use (&$target_perm) {
 			$target_perm[$row['permission']] = $row['add_deny'];
 		}
 	);
@@ -1070,7 +1070,7 @@ 
 			'current_group' => $id_group,
 		)
 	)->fetch_callback(
-		function ($row) use (&$permissions) {
+		function($row) use (&$permissions) {
 			$permissions[empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
 		}
 	);
@@ -1109,7 +1109,7 @@ 
 			'current_profile' => $permission_type === 'membergroup' ? 1 : $profile_id,
 		)
 	)->fetch_callback(
-		function ($row) use (&$permissions) {
+		function($row) use (&$permissions) {
 			$permissions[empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
 		}
 	);
@@ -1205,7 +1205,7 @@ 
 			'min_posts' => -1,
 		)
 	)->fetch_callback(
-		function ($row) {
+		function($row) {
 			return $row['id_group'];
 		}
 	);
@@ -1272,7 +1272,7 @@ 
 			'copy_from' => $copy_from,
 		)
 	)->fetch_callback(
-		function ($row) use ($profile_id) {
+		function($row) use ($profile_id) {
 			return array($profile_id, $row['id_group'], $row['permission'], $row['add_deny']);
 		}
 	);
@@ -1372,7 +1372,7 @@ 
 		GROUP BY id_profile',
 		array()
 	)->fetch_callback(
-		function ($row) use (&$profiles) {
+		function($row) use (&$profiles) {
 			global $txt;
 
 			if (isset($profiles[$row['id_profile']]))
@@ -1459,7 +1459,7 @@ 
 			'permissions' => $permissions,
 		)
 	)->fetch_callback(
-		function ($row) use (&$groups) {
+		function($row) use (&$groups) {
 			$groups[$row['id_group']][$row['add_deny'] ? 'add' : 'deny'][] = $row['permission'];
 		}
 	);

sources/subs/Who.subs.php

Spacing +2 added lines, -2 removed lines

@@ -155,7 +155,7 @@ 
 				'empty' => '',
 			)
 		)->fetch_callback(
-			function ($row) use (&$credits) {
+			function($row) use (&$credits) {
 				global $txt;
 
 				$credit_info = Util::unserialize($row['credits']);
@@ -551,7 +551,7 @@ 
 			'<a href="https://github.com/googlefonts/noto-emoji">Noto Emoji</a> | &copy; Googlefonts | Licensed under <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>',
 			'<a href="https://openmoji.org">OpenMoji</a> | &copy; OpenMoji | Licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0</a>',
 			'<a href="http://www.oxygen-icons.org/">Oxygen Icons</a> | These icons are licensed under <a href="https://creativecommons.org/licenses/by-sa/3.0/">CC BY-SA 3.0</a>',
-			'<a href="https://github.com/twitter/twemoji">Twitter Emoji</a> | &copy; Twitter, Inc and other contributors | Licensed under <a href="https://github.com/twitter/twemoji/blob/master/LICENSE/">MIT</a>',		),
+			'<a href="https://github.com/twitter/twemoji">Twitter Emoji</a> | &copy; Twitter, Inc and other contributors | Licensed under <a href="https://github.com/twitter/twemoji/blob/master/LICENSE/">MIT</a>',),
 		'fonts' => array(
 			'<a href="http://openfontlibrary.org/en/font/architect-s-daughter">Architect\'s Daughter</a> | &copy; 2010 <a href="http://kimberlygeswein.com/">Kimberly Geswein</a> | This font is licensed under the SIL Open Font License, Version 1.1',
 			'<a href="http://openfontlibrary.org/en/font/klaudia-and-berenika">Berenika</a> | &copy; 2011 wmk69 | This font is licensed under the SIL Open Font License, Version 1.1',