eventespresso / event-espresso-core

vendor/composer/ClassLoader.php

Spacing +15 added lines, -15 removed lines

@@ -113,7 +113,7 @@ 
      */
     public function getPrefixes()
     {
-        if (!empty($this->prefixesPsr0)) {
+        if ( ! empty($this->prefixesPsr0)) {
             return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
         }
 
@@ -183,7 +183,7 @@ 
      */
     public function add($prefix, $paths, $prepend = false)
     {
-        if (!$prefix) {
+        if ( ! $prefix) {
             if ($prepend) {
                 $this->fallbackDirsPsr0 = array_merge(
                     (array) $paths,
@@ -200,7 +200,7 @@ 
         }
 
         $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
+        if ( ! isset($this->prefixesPsr0[$first][$prefix])) {
             $this->prefixesPsr0[$first][$prefix] = (array) $paths;
 
             return;
@@ -232,7 +232,7 @@ 
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
-        if (!$prefix) {
+        if ( ! $prefix) {
             // Register directories for the root namespace.
             if ($prepend) {
                 $this->fallbackDirsPsr4 = array_merge(
@@ -245,7 +245,7 @@ 
                     (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]) {
@@ -279,7 +279,7 @@ 
      */
     public function set($prefix, $paths)
     {
-        if (!$prefix) {
+        if ( ! $prefix) {
             $this->fallbackDirsPsr0 = (array) $paths;
         } else {
             $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
@@ -299,7 +299,7 @@ 
      */
     public function setPsr4($prefix, $paths)
     {
-        if (!$prefix) {
+        if ( ! $prefix) {
             $this->fallbackDirsPsr4 = (array) $paths;
         } else {
             $length = strlen($prefix);
@@ -493,18 +493,18 @@ 
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $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 . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        if (file_exists($file = $dir.$pathEnd)) {
                             return $file;
                         }
                     }
@@ -514,7 +514,7 @@ 
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -526,14 +526,14 @@ 
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $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 (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -543,7 +543,7 @@ 
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }

Indentation +514 added lines, -514 removed lines

@@ -42,519 +42,519 @@ 
  */
 class ClassLoader
 {
-    /** @var ?string */
-    private $vendorDir;
-
-    // PSR-4
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<string, int>>
-     */
-    private $prefixLengthsPsr4 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<int, string>>
-     */
-    private $prefixDirsPsr4 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, string>
-     */
-    private $fallbackDirsPsr4 = array();
-
-    // PSR-0
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<string, string[]>>
-     */
-    private $prefixesPsr0 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, string>
-     */
-    private $fallbackDirsPsr0 = array();
-
-    /** @var bool */
-    private $useIncludePath = false;
-
-    /**
-     * @var string[]
-     * @psalm-var array<string, string>
-     */
-    private $classMap = array();
-
-    /** @var bool */
-    private $classMapAuthoritative = false;
-
-    /**
-     * @var bool[]
-     * @psalm-var array<string, bool>
-     */
-    private $missingClasses = array();
-
-    /** @var ?string */
-    private $apcuPrefix;
-
-    /**
-     * @var self[]
-     */
-    private static $registeredLoaders = array();
-
-    /**
-     * @param ?string $vendorDir
-     */
-    public function __construct($vendorDir = null)
-    {
-        $this->vendorDir = $vendorDir;
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getPrefixes()
-    {
-        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
-        }
-
-        return array();
-    }
-
-    /**
-     * @return array[]
-     * @psalm-return array<string, array<int, string>>
-     */
-    public function getPrefixesPsr4()
-    {
-        return $this->prefixDirsPsr4;
-    }
-
-    /**
-     * @return array[]
-     * @psalm-return array<string, string>
-     */
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirsPsr0;
-    }
-
-    /**
-     * @return array[]
-     * @psalm-return array<string, string>
-     */
-    public function getFallbackDirsPsr4()
-    {
-        return $this->fallbackDirsPsr4;
-    }
-
-    /**
-     * @return string[] Array of classname => path
-     * @psalm-return array<string, string>
-     */
-    public function getClassMap()
-    {
-        return $this->classMap;
-    }
-
-    /**
-     * @param string[] $classMap Class to filename map
-     * @psalm-param array<string, string> $classMap
-     *
-     * @return void
-     */
-    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 string[]|string $paths   The PSR-0 root directories
-     * @param bool            $prepend Whether to prepend the directories
-     *
-     * @return void
-     */
-    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 string[]|string $paths   The PSR-4 base directories
-     * @param bool            $prepend Whether to prepend the directories
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return void
-     */
-    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 string[]|string $paths  The PSR-0 base directories
-     *
-     * @return void
-     */
-    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 string[]|string $paths  The PSR-4 base directories
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return void
-     */
-    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
-     *
-     * @return void
-     */
-    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
-     *
-     * @return void
-     */
-    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
-     *
-     * @return void
-     */
-    public function setApcuPrefix($apcuPrefix)
-    {
-        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $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
-     *
-     * @return void
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-
-        if (null === $this->vendorDir) {
-            return;
-        }
-
-        if ($prepend) {
-            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
-        } else {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-            self::$registeredLoaders[$this->vendorDir] = $this;
-        }
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     *
-     * @return void
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-
-        if (null !== $this->vendorDir) {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-        }
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param  string    $class The name of the class
-     * @return true|null True if loaded, null otherwise
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            includeFile($file);
-
-            return true;
-        }
-
-        return null;
-    }
-
-    /**
-     * 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;
-    }
-
-    /**
-     * Returns the currently registered loaders indexed by their corresponding vendor directories.
-     *
-     * @return self[]
-     */
-    public static function getRegisteredLoaders()
-    {
-        return self::$registeredLoaders;
-    }
-
-    /**
-     * @param  string       $class
-     * @param  string       $ext
-     * @return string|false
-     */
-    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;
-    }
+	/** @var ?string */
+	private $vendorDir;
+
+	// PSR-4
+	/**
+	 * @var array[]
+	 * @psalm-var array<string, array<string, int>>
+	 */
+	private $prefixLengthsPsr4 = array();
+	/**
+	 * @var array[]
+	 * @psalm-var array<string, array<int, string>>
+	 */
+	private $prefixDirsPsr4 = array();
+	/**
+	 * @var array[]
+	 * @psalm-var array<string, string>
+	 */
+	private $fallbackDirsPsr4 = array();
+
+	// PSR-0
+	/**
+	 * @var array[]
+	 * @psalm-var array<string, array<string, string[]>>
+	 */
+	private $prefixesPsr0 = array();
+	/**
+	 * @var array[]
+	 * @psalm-var array<string, string>
+	 */
+	private $fallbackDirsPsr0 = array();
+
+	/** @var bool */
+	private $useIncludePath = false;
+
+	/**
+	 * @var string[]
+	 * @psalm-var array<string, string>
+	 */
+	private $classMap = array();
+
+	/** @var bool */
+	private $classMapAuthoritative = false;
+
+	/**
+	 * @var bool[]
+	 * @psalm-var array<string, bool>
+	 */
+	private $missingClasses = array();
+
+	/** @var ?string */
+	private $apcuPrefix;
+
+	/**
+	 * @var self[]
+	 */
+	private static $registeredLoaders = array();
+
+	/**
+	 * @param ?string $vendorDir
+	 */
+	public function __construct($vendorDir = null)
+	{
+		$this->vendorDir = $vendorDir;
+	}
+
+	/**
+	 * @return string[]
+	 */
+	public function getPrefixes()
+	{
+		if (!empty($this->prefixesPsr0)) {
+			return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
+		}
+
+		return array();
+	}
+
+	/**
+	 * @return array[]
+	 * @psalm-return array<string, array<int, string>>
+	 */
+	public function getPrefixesPsr4()
+	{
+		return $this->prefixDirsPsr4;
+	}
+
+	/**
+	 * @return array[]
+	 * @psalm-return array<string, string>
+	 */
+	public function getFallbackDirs()
+	{
+		return $this->fallbackDirsPsr0;
+	}
+
+	/**
+	 * @return array[]
+	 * @psalm-return array<string, string>
+	 */
+	public function getFallbackDirsPsr4()
+	{
+		return $this->fallbackDirsPsr4;
+	}
+
+	/**
+	 * @return string[] Array of classname => path
+	 * @psalm-return array<string, string>
+	 */
+	public function getClassMap()
+	{
+		return $this->classMap;
+	}
+
+	/**
+	 * @param string[] $classMap Class to filename map
+	 * @psalm-param array<string, string> $classMap
+	 *
+	 * @return void
+	 */
+	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 string[]|string $paths   The PSR-0 root directories
+	 * @param bool            $prepend Whether to prepend the directories
+	 *
+	 * @return void
+	 */
+	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 string[]|string $paths   The PSR-4 base directories
+	 * @param bool            $prepend Whether to prepend the directories
+	 *
+	 * @throws \InvalidArgumentException
+	 *
+	 * @return void
+	 */
+	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 string[]|string $paths  The PSR-0 base directories
+	 *
+	 * @return void
+	 */
+	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 string[]|string $paths  The PSR-4 base directories
+	 *
+	 * @throws \InvalidArgumentException
+	 *
+	 * @return void
+	 */
+	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
+	 *
+	 * @return void
+	 */
+	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
+	 *
+	 * @return void
+	 */
+	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
+	 *
+	 * @return void
+	 */
+	public function setApcuPrefix($apcuPrefix)
+	{
+		$this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $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
+	 *
+	 * @return void
+	 */
+	public function register($prepend = false)
+	{
+		spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+		if (null === $this->vendorDir) {
+			return;
+		}
+
+		if ($prepend) {
+			self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+		} else {
+			unset(self::$registeredLoaders[$this->vendorDir]);
+			self::$registeredLoaders[$this->vendorDir] = $this;
+		}
+	}
+
+	/**
+	 * Unregisters this instance as an autoloader.
+	 *
+	 * @return void
+	 */
+	public function unregister()
+	{
+		spl_autoload_unregister(array($this, 'loadClass'));
+
+		if (null !== $this->vendorDir) {
+			unset(self::$registeredLoaders[$this->vendorDir]);
+		}
+	}
+
+	/**
+	 * Loads the given class or interface.
+	 *
+	 * @param  string    $class The name of the class
+	 * @return true|null True if loaded, null otherwise
+	 */
+	public function loadClass($class)
+	{
+		if ($file = $this->findFile($class)) {
+			includeFile($file);
+
+			return true;
+		}
+
+		return null;
+	}
+
+	/**
+	 * 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;
+	}
+
+	/**
+	 * Returns the currently registered loaders indexed by their corresponding vendor directories.
+	 *
+	 * @return self[]
+	 */
+	public static function getRegisteredLoaders()
+	{
+		return self::$registeredLoaders;
+	}
+
+	/**
+	 * @param  string       $class
+	 * @param  string       $ext
+	 * @return string|false
+	 */
+	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;
+	}
 }
 
 /**
@@ -568,5 +568,5 @@ 
  */
 function includeFile($file)
 {
-    include $file;
+	include $file;
 }

vendor/composer/InstalledVersions.php

Spacing +15 added lines, -15 removed lines

@@ -135,7 +135,7 @@ 
     public static function getVersionRanges($packageName)
     {
         foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
+            if ( ! isset($installed['versions'][$packageName])) {
                 continue;
             }
 
@@ -156,7 +156,7 @@ 
             return implode(' || ', $ranges);
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -166,18 +166,18 @@ 
     public static function getVersion($packageName)
     {
         foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
+            if ( ! isset($installed['versions'][$packageName])) {
                 continue;
             }
 
-            if (!isset($installed['versions'][$packageName]['version'])) {
+            if ( ! isset($installed['versions'][$packageName]['version'])) {
                 return null;
             }
 
             return $installed['versions'][$packageName]['version'];
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -187,18 +187,18 @@ 
     public static function getPrettyVersion($packageName)
     {
         foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
+            if ( ! isset($installed['versions'][$packageName])) {
                 continue;
             }
 
-            if (!isset($installed['versions'][$packageName]['pretty_version'])) {
+            if ( ! isset($installed['versions'][$packageName]['pretty_version'])) {
                 return null;
             }
 
             return $installed['versions'][$packageName]['pretty_version'];
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -208,18 +208,18 @@ 
     public static function getReference($packageName)
     {
         foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
+            if ( ! isset($installed['versions'][$packageName])) {
                 continue;
             }
 
-            if (!isset($installed['versions'][$packageName]['reference'])) {
+            if ( ! isset($installed['versions'][$packageName]['reference'])) {
                 return null;
             }
 
             return $installed['versions'][$packageName]['reference'];
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -229,14 +229,14 @@ 
     public static function getInstallPath($packageName)
     {
         foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
+            if ( ! isset($installed['versions'][$packageName])) {
                 continue;
             }
 
             return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -265,7 +265,7 @@ 
             // only require the installed.php file if this file is loaded from its dumped location,
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
             if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = include __DIR__ . '/installed.php';
+                self::$installed = include __DIR__.'/installed.php';
             } else {
                 self::$installed = array();
             }
@@ -338,7 +338,7 @@ 
             // only require the installed.php file if this file is loaded from its dumped location,
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
             if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = require __DIR__ . '/installed.php';
+                self::$installed = require __DIR__.'/installed.php';
             } else {
                 self::$installed = array();
             }

Indentation +323 added lines, -323 removed lines

@@ -26,327 +26,327 @@
  */
 class InstalledVersions
 {
-    /**
-     * @var mixed[]|null
-     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
-     */
-    private static $installed;
-
-    /**
-     * @var bool|null
-     */
-    private static $canGetVendors;
-
-    /**
-     * @var array[]
-     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
-     */
-    private static $installedByVendor = array();
-
-    /**
-     * Returns a list of all package names which are present, either by being installed, replaced or provided
-     *
-     * @return string[]
-     * @psalm-return list<string>
-     */
-    public static function getInstalledPackages()
-    {
-        $packages = array();
-        foreach (self::getInstalled() as $installed) {
-            $packages[] = array_keys($installed['versions']);
-        }
-
-        if (1 === \count($packages)) {
-            return $packages[0];
-        }
-
-        return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
-    }
-
-    /**
-     * Returns a list of all package names with a specific type e.g. 'library'
-     *
-     * @param  string   $type
-     * @return string[]
-     * @psalm-return list<string>
-     */
-    public static function getInstalledPackagesByType($type)
-    {
-        $packagesByType = array();
-
-        foreach (self::getInstalled() as $installed) {
-            foreach ($installed['versions'] as $name => $package) {
-                if (isset($package['type']) && $package['type'] === $type) {
-                    $packagesByType[] = $name;
-                }
-            }
-        }
-
-        return $packagesByType;
-    }
-
-    /**
-     * Checks whether the given package is installed
-     *
-     * This also returns true if the package name is provided or replaced by another package
-     *
-     * @param  string $packageName
-     * @param  bool   $includeDevRequirements
-     * @return bool
-     */
-    public static function isInstalled($packageName, $includeDevRequirements = true)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (isset($installed['versions'][$packageName])) {
-                return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks whether the given package satisfies a version constraint
-     *
-     * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call:
-     *
-     *   Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3')
-     *
-     * @param  VersionParser $parser      Install composer/semver to have access to this class and functionality
-     * @param  string        $packageName
-     * @param  string|null   $constraint  A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package
-     * @return bool
-     */
-    public static function satisfies(VersionParser $parser, $packageName, $constraint)
-    {
-        $constraint = $parser->parseConstraints($constraint);
-        $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
-
-        return $provided->matches($constraint);
-    }
-
-    /**
-     * Returns a version constraint representing all the range(s) which are installed for a given package
-     *
-     * It is easier to use this via isInstalled() with the $constraint argument if you need to check
-     * whether a given version of a package is installed, and not just whether it exists
-     *
-     * @param  string $packageName
-     * @return string Version constraint usable with composer/semver
-     */
-    public static function getVersionRanges($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            $ranges = array();
-            if (isset($installed['versions'][$packageName]['pretty_version'])) {
-                $ranges[] = $installed['versions'][$packageName]['pretty_version'];
-            }
-            if (array_key_exists('aliases', $installed['versions'][$packageName])) {
-                $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']);
-            }
-            if (array_key_exists('replaced', $installed['versions'][$packageName])) {
-                $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']);
-            }
-            if (array_key_exists('provided', $installed['versions'][$packageName])) {
-                $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']);
-            }
-
-            return implode(' || ', $ranges);
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
-     */
-    public static function getVersion($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            if (!isset($installed['versions'][$packageName]['version'])) {
-                return null;
-            }
-
-            return $installed['versions'][$packageName]['version'];
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
-     */
-    public static function getPrettyVersion($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            if (!isset($installed['versions'][$packageName]['pretty_version'])) {
-                return null;
-            }
-
-            return $installed['versions'][$packageName]['pretty_version'];
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference
-     */
-    public static function getReference($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            if (!isset($installed['versions'][$packageName]['reference'])) {
-                return null;
-            }
-
-            return $installed['versions'][$packageName]['reference'];
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path.
-     */
-    public static function getInstallPath($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @return array
-     * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
-     */
-    public static function getRootPackage()
-    {
-        $installed = self::getInstalled();
-
-        return $installed[0]['root'];
-    }
-
-    /**
-     * Returns the raw installed.php data for custom implementations
-     *
-     * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
-     * @return array[]
-     * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
-     */
-    public static function getRawData()
-    {
-        @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
-
-        if (null === self::$installed) {
-            // only require the installed.php file if this file is loaded from its dumped location,
-            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
-            if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = include __DIR__ . '/installed.php';
-            } else {
-                self::$installed = array();
-            }
-        }
-
-        return self::$installed;
-    }
-
-    /**
-     * Returns the raw data of all installed.php which are currently loaded for custom implementations
-     *
-     * @return array[]
-     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
-     */
-    public static function getAllRawData()
-    {
-        return self::getInstalled();
-    }
-
-    /**
-     * Lets you reload the static array from another file
-     *
-     * This is only useful for complex integrations in which a project needs to use
-     * this class but then also needs to execute another project's autoloader in process,
-     * and wants to ensure both projects have access to their version of installed.php.
-     *
-     * A typical case would be PHPUnit, where it would need to make sure it reads all
-     * the data it needs from this class, then call reload() with
-     * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure
-     * the project in which it runs can then also use this class safely, without
-     * interference between PHPUnit's dependencies and the project's dependencies.
-     *
-     * @param  array[] $data A vendor/composer/installed.php data set
-     * @return void
-     *
-     * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
-     */
-    public static function reload($data)
-    {
-        self::$installed = $data;
-        self::$installedByVendor = array();
-    }
-
-    /**
-     * @return array[]
-     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
-     */
-    private static function getInstalled()
-    {
-        if (null === self::$canGetVendors) {
-            self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
-        }
-
-        $installed = array();
-
-        if (self::$canGetVendors) {
-            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
-                if (isset(self::$installedByVendor[$vendorDir])) {
-                    $installed[] = self::$installedByVendor[$vendorDir];
-                } elseif (is_file($vendorDir.'/composer/installed.php')) {
-                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
-                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
-                        self::$installed = $installed[count($installed) - 1];
-                    }
-                }
-            }
-        }
-
-        if (null === self::$installed) {
-            // only require the installed.php file if this file is loaded from its dumped location,
-            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
-            if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = require __DIR__ . '/installed.php';
-            } else {
-                self::$installed = array();
-            }
-        }
-        $installed[] = self::$installed;
-
-        return $installed;
-    }
+	/**
+	 * @var mixed[]|null
+	 * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
+	 */
+	private static $installed;
+
+	/**
+	 * @var bool|null
+	 */
+	private static $canGetVendors;
+
+	/**
+	 * @var array[]
+	 * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+	 */
+	private static $installedByVendor = array();
+
+	/**
+	 * Returns a list of all package names which are present, either by being installed, replaced or provided
+	 *
+	 * @return string[]
+	 * @psalm-return list<string>
+	 */
+	public static function getInstalledPackages()
+	{
+		$packages = array();
+		foreach (self::getInstalled() as $installed) {
+			$packages[] = array_keys($installed['versions']);
+		}
+
+		if (1 === \count($packages)) {
+			return $packages[0];
+		}
+
+		return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
+	}
+
+	/**
+	 * Returns a list of all package names with a specific type e.g. 'library'
+	 *
+	 * @param  string   $type
+	 * @return string[]
+	 * @psalm-return list<string>
+	 */
+	public static function getInstalledPackagesByType($type)
+	{
+		$packagesByType = array();
+
+		foreach (self::getInstalled() as $installed) {
+			foreach ($installed['versions'] as $name => $package) {
+				if (isset($package['type']) && $package['type'] === $type) {
+					$packagesByType[] = $name;
+				}
+			}
+		}
+
+		return $packagesByType;
+	}
+
+	/**
+	 * Checks whether the given package is installed
+	 *
+	 * This also returns true if the package name is provided or replaced by another package
+	 *
+	 * @param  string $packageName
+	 * @param  bool   $includeDevRequirements
+	 * @return bool
+	 */
+	public static function isInstalled($packageName, $includeDevRequirements = true)
+	{
+		foreach (self::getInstalled() as $installed) {
+			if (isset($installed['versions'][$packageName])) {
+				return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Checks whether the given package satisfies a version constraint
+	 *
+	 * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call:
+	 *
+	 *   Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3')
+	 *
+	 * @param  VersionParser $parser      Install composer/semver to have access to this class and functionality
+	 * @param  string        $packageName
+	 * @param  string|null   $constraint  A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package
+	 * @return bool
+	 */
+	public static function satisfies(VersionParser $parser, $packageName, $constraint)
+	{
+		$constraint = $parser->parseConstraints($constraint);
+		$provided = $parser->parseConstraints(self::getVersionRanges($packageName));
+
+		return $provided->matches($constraint);
+	}
+
+	/**
+	 * Returns a version constraint representing all the range(s) which are installed for a given package
+	 *
+	 * It is easier to use this via isInstalled() with the $constraint argument if you need to check
+	 * whether a given version of a package is installed, and not just whether it exists
+	 *
+	 * @param  string $packageName
+	 * @return string Version constraint usable with composer/semver
+	 */
+	public static function getVersionRanges($packageName)
+	{
+		foreach (self::getInstalled() as $installed) {
+			if (!isset($installed['versions'][$packageName])) {
+				continue;
+			}
+
+			$ranges = array();
+			if (isset($installed['versions'][$packageName]['pretty_version'])) {
+				$ranges[] = $installed['versions'][$packageName]['pretty_version'];
+			}
+			if (array_key_exists('aliases', $installed['versions'][$packageName])) {
+				$ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']);
+			}
+			if (array_key_exists('replaced', $installed['versions'][$packageName])) {
+				$ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']);
+			}
+			if (array_key_exists('provided', $installed['versions'][$packageName])) {
+				$ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']);
+			}
+
+			return implode(' || ', $ranges);
+		}
+
+		throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+	}
+
+	/**
+	 * @param  string      $packageName
+	 * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+	 */
+	public static function getVersion($packageName)
+	{
+		foreach (self::getInstalled() as $installed) {
+			if (!isset($installed['versions'][$packageName])) {
+				continue;
+			}
+
+			if (!isset($installed['versions'][$packageName]['version'])) {
+				return null;
+			}
+
+			return $installed['versions'][$packageName]['version'];
+		}
+
+		throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+	}
+
+	/**
+	 * @param  string      $packageName
+	 * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+	 */
+	public static function getPrettyVersion($packageName)
+	{
+		foreach (self::getInstalled() as $installed) {
+			if (!isset($installed['versions'][$packageName])) {
+				continue;
+			}
+
+			if (!isset($installed['versions'][$packageName]['pretty_version'])) {
+				return null;
+			}
+
+			return $installed['versions'][$packageName]['pretty_version'];
+		}
+
+		throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+	}
+
+	/**
+	 * @param  string      $packageName
+	 * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference
+	 */
+	public static function getReference($packageName)
+	{
+		foreach (self::getInstalled() as $installed) {
+			if (!isset($installed['versions'][$packageName])) {
+				continue;
+			}
+
+			if (!isset($installed['versions'][$packageName]['reference'])) {
+				return null;
+			}
+
+			return $installed['versions'][$packageName]['reference'];
+		}
+
+		throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+	}
+
+	/**
+	 * @param  string      $packageName
+	 * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path.
+	 */
+	public static function getInstallPath($packageName)
+	{
+		foreach (self::getInstalled() as $installed) {
+			if (!isset($installed['versions'][$packageName])) {
+				continue;
+			}
+
+			return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
+		}
+
+		throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+	}
+
+	/**
+	 * @return array
+	 * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
+	 */
+	public static function getRootPackage()
+	{
+		$installed = self::getInstalled();
+
+		return $installed[0]['root'];
+	}
+
+	/**
+	 * Returns the raw installed.php data for custom implementations
+	 *
+	 * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
+	 * @return array[]
+	 * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
+	 */
+	public static function getRawData()
+	{
+		@trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
+
+		if (null === self::$installed) {
+			// only require the installed.php file if this file is loaded from its dumped location,
+			// and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+			if (substr(__DIR__, -8, 1) !== 'C') {
+				self::$installed = include __DIR__ . '/installed.php';
+			} else {
+				self::$installed = array();
+			}
+		}
+
+		return self::$installed;
+	}
+
+	/**
+	 * Returns the raw data of all installed.php which are currently loaded for custom implementations
+	 *
+	 * @return array[]
+	 * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+	 */
+	public static function getAllRawData()
+	{
+		return self::getInstalled();
+	}
+
+	/**
+	 * Lets you reload the static array from another file
+	 *
+	 * This is only useful for complex integrations in which a project needs to use
+	 * this class but then also needs to execute another project's autoloader in process,
+	 * and wants to ensure both projects have access to their version of installed.php.
+	 *
+	 * A typical case would be PHPUnit, where it would need to make sure it reads all
+	 * the data it needs from this class, then call reload() with
+	 * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure
+	 * the project in which it runs can then also use this class safely, without
+	 * interference between PHPUnit's dependencies and the project's dependencies.
+	 *
+	 * @param  array[] $data A vendor/composer/installed.php data set
+	 * @return void
+	 *
+	 * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
+	 */
+	public static function reload($data)
+	{
+		self::$installed = $data;
+		self::$installedByVendor = array();
+	}
+
+	/**
+	 * @return array[]
+	 * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+	 */
+	private static function getInstalled()
+	{
+		if (null === self::$canGetVendors) {
+			self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
+		}
+
+		$installed = array();
+
+		if (self::$canGetVendors) {
+			foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+				if (isset(self::$installedByVendor[$vendorDir])) {
+					$installed[] = self::$installedByVendor[$vendorDir];
+				} elseif (is_file($vendorDir.'/composer/installed.php')) {
+					$installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
+					if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+						self::$installed = $installed[count($installed) - 1];
+					}
+				}
+			}
+		}
+
+		if (null === self::$installed) {
+			// only require the installed.php file if this file is loaded from its dumped location,
+			// and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+			if (substr(__DIR__, -8, 1) !== 'C') {
+				self::$installed = require __DIR__ . '/installed.php';
+			} else {
+				self::$installed = array();
+			}
+		}
+		$installed[] = self::$installed;
+
+		return $installed;
+	}
 }

core/libraries/form_sections/base/EE_Form_Section_Base.form.php

Spacing +15 added lines, -15 removed lines

@@ -94,7 +94,7 @@ 
         // used by display strategies
         // assign incoming values to properties
         foreach ($options_array as $key => $value) {
-            $key = '_' . $key;
+            $key = '_'.$key;
             if (property_exists($this, $key) && empty($this->{$key})) {
                 $this->{$key} = $value;
                 if ($key === '_subsections' && ! is_array($value)) {
@@ -134,7 +134,7 @@ 
      */
     public function ensure_construct_finalized_called()
     {
-        if (! $this->_construction_finalized) {
+        if ( ! $this->_construction_finalized) {
             $this->_construct_finalize($this->_parent_section, $this->_name);
         }
     }
@@ -197,7 +197,7 @@ 
      */
     protected function _set_default_html_id_if_empty()
     {
-        if (! $this->_html_id) {
+        if ( ! $this->_html_id) {
             if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
                 $this->_html_id = $this->_parent_section->html_id()
                                   . '-'
@@ -256,7 +256,7 @@ 
     public function html_id($add_pound_sign = false)
     {
         $this->_set_default_html_id_if_empty();
-        return $add_pound_sign ? '#' . $this->_html_id : $this->_html_id;
+        return $add_pound_sign ? '#'.$this->_html_id : $this->_html_id;
     }
 
 
@@ -326,7 +326,7 @@ 
      */
     public function other_html_attributes()
     {
-        return ! empty($this->_other_html_attributes) ? ' ' . $this->_other_html_attributes : '';
+        return ! empty($this->_other_html_attributes) ? ' '.$this->_other_html_attributes : '';
     }
 
 
@@ -339,7 +339,7 @@ 
      */
     public function name()
     {
-        if (! $this->_construction_finalized) {
+        if ( ! $this->_construction_finalized) {
             throw new EE_Error(sprintf(esc_html__(
                 'You cannot use the form section\s name until _construct_finalize has been called on it (when we set the name). It was called on a form section of type \'s\'',
                 'event_espresso'
@@ -372,18 +372,18 @@ 
      */
     public function form_open($action = '', $method = '', $other_attributes = '')
     {
-        if (! empty($action)) {
+        if ( ! empty($action)) {
             $this->set_action($action);
         }
-        if (! empty($method)) {
+        if ( ! empty($method)) {
             $this->set_method($method);
         }
-        $html = EEH_HTML::nl(1, 'form') . '<form';
-        $html .= $this->html_id() !== '' ? ' id="' . $this->get_html_id_for_form($this->html_id()) . '"' : '';
-        $html .= ' action="' . esc_url_raw($this->action()) . '"';
-        $html .= ' method="' . $this->method() . '"';
-        $html .= ' name="' . $this->name() . '"';
-        $html .= ' ' . $other_attributes . '>';
+        $html = EEH_HTML::nl(1, 'form').'<form';
+        $html .= $this->html_id() !== '' ? ' id="'.$this->get_html_id_for_form($this->html_id()).'"' : '';
+        $html .= ' action="'.esc_url_raw($this->action()).'"';
+        $html .= ' method="'.$this->method().'"';
+        $html .= ' name="'.$this->name().'"';
+        $html .= ' '.$other_attributes.'>';
         return $html;
     }
 
@@ -401,7 +401,7 @@ 
         $strlen = strlen($html_id);
         $html_id = strpos($html_id, '-form') === $strlen - 5 || strpos($html_id, '-frm') === $strlen - 4
             ? $html_id
-            : $html_id . '-frm';
+            : $html_id.'-frm';
         return $html_id;
     }
 

Indentation +474 added lines, -474 removed lines

@@ -14,484 +14,484 @@
  */
 abstract class EE_Form_Section_Base
 {
-    /**
-     * the URL the form is submitted to
-     *
-     * @var string
-     */
-    protected $_action = '';
-
-    /**
-     * POST (default) or GET
-     *
-     * @var string
-     */
-    protected $_method = '';
-
-    /**
-     * html_id and html_name are derived from this by default
-     *
-     * @var string
-     */
-    protected $_name = '';
-
-    /**
-     * $_html_id
-     * @var string
-     */
-    protected $_html_id = '';
-
-    /**
-     * $_html_class
-     * @var string
-     */
-    protected $_html_class = '';
-
-    /**
-     * $_html_style
-     * @var string
-     */
-    protected $_html_style = '';
-
-    /**
-     * $_other_html_attributes
-     * @var string
-     */
-    protected $_other_html_attributes = '';
-
-    /**
-     * The form section of which this form section is a part
-     *
-     * @var EE_Form_Section_Proper
-     */
-    protected $_parent_section;
-
-    /**
-     * flag indicating that _construct_finalize has been called.
-     * If it has not been called and we try to use functions which require it, we call it
-     * with no parameters. But normally, _construct_finalize should be called by the instantiating class
-     *
-     * @var bool
-     */
-    protected $_construction_finalized = false;
-
-    /**
-     * Strategy for parsing the form HTML upon display
-     *
-     * @var FormHtmlFilter
-     */
-    protected $_form_html_filter;
-
-
-    /**
-     * @param array $options_array {
-     * @type        $name          string the name for this form section, if you want to explicitly define it
-     *                             }
-     * @throws InvalidDataTypeException
-     */
-    public function __construct($options_array = array())
-    {
-        // used by display strategies
-        // assign incoming values to properties
-        foreach ($options_array as $key => $value) {
-            $key = '_' . $key;
-            if (property_exists($this, $key) && empty($this->{$key})) {
-                $this->{$key} = $value;
-                if ($key === '_subsections' && ! is_array($value)) {
-                    throw new InvalidDataTypeException($key, $value, 'array');
-                }
-            }
-        }
-        // set parser which allows the form section's rendered HTML to be filtered
-        if (isset($options_array['form_html_filter']) && $options_array['form_html_filter'] instanceof FormHtmlFilter) {
-            $this->_form_html_filter = $options_array['form_html_filter'];
-        }
-    }
-
-
-
-    /**
-     * @param $parent_form_section
-     * @param $name
-     */
-    protected function _construct_finalize($parent_form_section, $name)
-    {
-        $this->_construction_finalized = true;
-        $this->_parent_section = $parent_form_section;
-        if ($name !== null) {
-            $this->_name = $name;
-        }
-    }
-
-
-
-    /**
-     * make sure construction finalized was called, otherwise children might not be ready
-     *
-     * @return void
-     */
-    public function ensure_construct_finalized_called()
-    {
-        if (! $this->_construction_finalized) {
-            $this->_construct_finalize($this->_parent_section, $this->_name);
-        }
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function action()
-    {
-        return $this->_action;
-    }
-
-
-
-    /**
-     * @param string $action
-     */
-    public function set_action($action)
-    {
-        $this->_action = $action;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function method()
-    {
-        return ! empty($this->_method) ? $this->_method : 'POST';
-    }
-
-
-
-    /**
-     * @param string $method
-     */
-    public function set_method($method)
-    {
-        switch ($method) {
-            case 'get':
-            case 'GET':
-                $this->_method = 'GET';
-                break;
-            default:
-                $this->_method = 'POST';
-        }
-    }
-
-
-
-    /**
-     * Sets the html_id to its default value, if none was specified in the constructor.
-     * Calculation involves using the name and the parent's html id
-     * return void
-     *
-     * @throws \EE_Error
-     */
-    protected function _set_default_html_id_if_empty()
-    {
-        if (! $this->_html_id) {
-            if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
-                $this->_html_id = $this->_parent_section->html_id()
-                                  . '-'
-                                  . $this->_prep_name_for_html_id($this->name());
-            } else {
-                $this->_html_id = $this->_prep_name_for_html_id($this->name());
-            }
-        }
-    }
-
-
-
-    /**
-     * _prep_name_for_html_id
-     *
-     * @param $name
-     * @return string
-     */
-    private function _prep_name_for_html_id($name)
-    {
-        return sanitize_key(str_replace(array(' ', ' ', '_'), '-', $name));
-    }
+	/**
+	 * the URL the form is submitted to
+	 *
+	 * @var string
+	 */
+	protected $_action = '';
+
+	/**
+	 * POST (default) or GET
+	 *
+	 * @var string
+	 */
+	protected $_method = '';
+
+	/**
+	 * html_id and html_name are derived from this by default
+	 *
+	 * @var string
+	 */
+	protected $_name = '';
+
+	/**
+	 * $_html_id
+	 * @var string
+	 */
+	protected $_html_id = '';
+
+	/**
+	 * $_html_class
+	 * @var string
+	 */
+	protected $_html_class = '';
+
+	/**
+	 * $_html_style
+	 * @var string
+	 */
+	protected $_html_style = '';
+
+	/**
+	 * $_other_html_attributes
+	 * @var string
+	 */
+	protected $_other_html_attributes = '';
+
+	/**
+	 * The form section of which this form section is a part
+	 *
+	 * @var EE_Form_Section_Proper
+	 */
+	protected $_parent_section;
+
+	/**
+	 * flag indicating that _construct_finalize has been called.
+	 * If it has not been called and we try to use functions which require it, we call it
+	 * with no parameters. But normally, _construct_finalize should be called by the instantiating class
+	 *
+	 * @var bool
+	 */
+	protected $_construction_finalized = false;
+
+	/**
+	 * Strategy for parsing the form HTML upon display
+	 *
+	 * @var FormHtmlFilter
+	 */
+	protected $_form_html_filter;
+
+
+	/**
+	 * @param array $options_array {
+	 * @type        $name          string the name for this form section, if you want to explicitly define it
+	 *                             }
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct($options_array = array())
+	{
+		// used by display strategies
+		// assign incoming values to properties
+		foreach ($options_array as $key => $value) {
+			$key = '_' . $key;
+			if (property_exists($this, $key) && empty($this->{$key})) {
+				$this->{$key} = $value;
+				if ($key === '_subsections' && ! is_array($value)) {
+					throw new InvalidDataTypeException($key, $value, 'array');
+				}
+			}
+		}
+		// set parser which allows the form section's rendered HTML to be filtered
+		if (isset($options_array['form_html_filter']) && $options_array['form_html_filter'] instanceof FormHtmlFilter) {
+			$this->_form_html_filter = $options_array['form_html_filter'];
+		}
+	}
+
+
+
+	/**
+	 * @param $parent_form_section
+	 * @param $name
+	 */
+	protected function _construct_finalize($parent_form_section, $name)
+	{
+		$this->_construction_finalized = true;
+		$this->_parent_section = $parent_form_section;
+		if ($name !== null) {
+			$this->_name = $name;
+		}
+	}
+
+
+
+	/**
+	 * make sure construction finalized was called, otherwise children might not be ready
+	 *
+	 * @return void
+	 */
+	public function ensure_construct_finalized_called()
+	{
+		if (! $this->_construction_finalized) {
+			$this->_construct_finalize($this->_parent_section, $this->_name);
+		}
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function action()
+	{
+		return $this->_action;
+	}
+
+
+
+	/**
+	 * @param string $action
+	 */
+	public function set_action($action)
+	{
+		$this->_action = $action;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function method()
+	{
+		return ! empty($this->_method) ? $this->_method : 'POST';
+	}
+
+
+
+	/**
+	 * @param string $method
+	 */
+	public function set_method($method)
+	{
+		switch ($method) {
+			case 'get':
+			case 'GET':
+				$this->_method = 'GET';
+				break;
+			default:
+				$this->_method = 'POST';
+		}
+	}
+
+
+
+	/**
+	 * Sets the html_id to its default value, if none was specified in the constructor.
+	 * Calculation involves using the name and the parent's html id
+	 * return void
+	 *
+	 * @throws \EE_Error
+	 */
+	protected function _set_default_html_id_if_empty()
+	{
+		if (! $this->_html_id) {
+			if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
+				$this->_html_id = $this->_parent_section->html_id()
+								  . '-'
+								  . $this->_prep_name_for_html_id($this->name());
+			} else {
+				$this->_html_id = $this->_prep_name_for_html_id($this->name());
+			}
+		}
+	}
+
+
+
+	/**
+	 * _prep_name_for_html_id
+	 *
+	 * @param $name
+	 * @return string
+	 */
+	private function _prep_name_for_html_id($name)
+	{
+		return sanitize_key(str_replace(array(' ', ' ', '_'), '-', $name));
+	}
 
 
 
-    /**
-     * Returns the HTML, JS, and CSS necessary to display this form section on a page.
-     * Note however, it's recommended that you instead call enqueue_js on the "wp_enqueue_scripts" action,
-     * and call get_html when you want to output the html. Calling get_html_and_js after
-     * "wp_enqueue_scripts" has already fired seems to work for now, but is contrary
-     * to the instructions on https://developer.wordpress.org/reference/functions/wp_enqueue_script/
-     * and so might stop working anytime.
-     *
-     * @return string
-     */
-    public function get_html_and_js()
-    {
-        return $this->get_html();
-    }
+	/**
+	 * Returns the HTML, JS, and CSS necessary to display this form section on a page.
+	 * Note however, it's recommended that you instead call enqueue_js on the "wp_enqueue_scripts" action,
+	 * and call get_html when you want to output the html. Calling get_html_and_js after
+	 * "wp_enqueue_scripts" has already fired seems to work for now, but is contrary
+	 * to the instructions on https://developer.wordpress.org/reference/functions/wp_enqueue_script/
+	 * and so might stop working anytime.
+	 *
+	 * @return string
+	 */
+	public function get_html_and_js()
+	{
+		return $this->get_html();
+	}
 
 
-
-    /**
-     * Gets the HTML for displaying this form section
-     *
-     * @return string
-     */
-    abstract public function get_html();
-
-
-    /**
-     * @param bool $add_pound_sign
-     * @return string
-     * @throws EE_Error
-     */
-    public function html_id($add_pound_sign = false)
-    {
-        $this->_set_default_html_id_if_empty();
-        return $add_pound_sign ? '#' . $this->_html_id : $this->_html_id;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function html_class()
-    {
-        return $this->_html_class;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function html_style()
-    {
-        return $this->_html_style;
-    }
-
-
-
-    /**
-     * @param mixed $html_class
-     */
-    public function set_html_class($html_class)
-    {
-        $this->_html_class = $html_class;
-    }
-
-
-
-    /**
-     * @param mixed $html_id
-     */
-    public function set_html_id($html_id)
-    {
-        $this->_html_id = $html_id;
-    }
-
-
-
-    /**
-     * @param mixed $html_style
-     */
-    public function set_html_style($html_style)
-    {
-        $this->_html_style = $html_style;
-    }
-
-
-
-    /**
-     * @param string $other_html_attributes
-     */
-    public function set_other_html_attributes($other_html_attributes)
-    {
-        $this->_other_html_attributes = $other_html_attributes ?? '';
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function other_html_attributes()
-    {
-        return ! empty($this->_other_html_attributes) ? ' ' . $this->_other_html_attributes : '';
-    }
-
-
-
-    /**
-     * Gets the name of the form section. This is not the same as the HTML name.
-     *
-     * @throws EE_Error
-     * @return string
-     */
-    public function name()
-    {
-        if (! $this->_construction_finalized) {
-            throw new EE_Error(sprintf(esc_html__(
-                'You cannot use the form section\s name until _construct_finalize has been called on it (when we set the name). It was called on a form section of type \'s\'',
-                'event_espresso'
-            ), get_class($this)));
-        }
-        return $this->_name;
-    }
-
-
-
-    /**
-     * Gets the parent section
-     *
-     * @return EE_Form_Section_Proper
-     */
-    public function parent_section()
-    {
-        return $this->_parent_section;
-    }
-
-
-    /**
-     * returns HTML for generating the opening form HTML tag (<form>)
-     *
-     * @param string $action           the URL the form is submitted to
-     * @param string $method           POST (default) or GET
-     * @param string $other_attributes anything else added to the form open tag, MUST BE VALID HTML
-     * @return string
-     * @throws EE_Error
-     */
-    public function form_open($action = '', $method = '', $other_attributes = '')
-    {
-        if (! empty($action)) {
-            $this->set_action($action);
-        }
-        if (! empty($method)) {
-            $this->set_method($method);
-        }
-        $html = EEH_HTML::nl(1, 'form') . '<form';
-        $html .= $this->html_id() !== '' ? ' id="' . $this->get_html_id_for_form($this->html_id()) . '"' : '';
-        $html .= ' action="' . esc_url_raw($this->action()) . '"';
-        $html .= ' method="' . $this->method() . '"';
-        $html .= ' name="' . $this->name() . '"';
-        $html .= ' ' . $other_attributes . '>';
-        return $html;
-    }
-
-
-
-    /**
-     * ensures that html id for form either ends in "-form" or "-frm"
-     * so that id doesn't conflict/collide with other elements
-     *
-     * @param string $html_id
-     * @return string
-     */
-    protected function get_html_id_for_form($html_id)
-    {
-        $strlen = strlen($html_id);
-        $html_id = strpos($html_id, '-form') === $strlen - 5 || strpos($html_id, '-frm') === $strlen - 4
-            ? $html_id
-            : $html_id . '-frm';
-        return $html_id;
-    }
-
-
-    /**
-     * returns HTML for generating the closing form HTML tag (</form>)
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public function form_close()
-    {
-        return EEH_HTML::nl(-1, 'form')
-               . '</form>'
-               . EEH_HTML::nl()
-               . '<!-- end of ee-'
-               . $this->html_id()
-               . '-form -->'
-               . EEH_HTML::nl();
-    }
-
-
-
-    /**
-     * enqueues JS (and CSS) for the form (ie immediately call wp_enqueue_script and
-     * wp_enqueue_style; the scripts could have optionally been registered earlier)
-     * Default does nothing, but child classes can override
-     *
-     * @return void
-     */
-    public function enqueue_js()
-    {
-        // defaults to enqueue NO js or css
-    }
-
-
-
-    /**
-     * Adds any extra data needed by js. Eventually we'll call wp_localize_script
-     * with it, and it will be on each form section's 'other_data' property.
-     * By default nothing is added, but child classes can extend this method to add something.
-     * Eg, if you have an input that will cause a modal dialog to appear,
-     * here you could add an entry like 'modal_dialog_inputs' to this array
-     * to map between the input's html ID and the modal dialogue's ID, so that
-     * your JS code will know where to find the modal dialog when the input is pressed.
-     * Eg $form_other_js_data['modal_dialog_inputs']['some-input-id']='modal-dialog-id';
-     *
-     * @param array $form_other_js_data
-     * @return array
-     */
-    public function get_other_js_data($form_other_js_data = array())
-    {
-        return $form_other_js_data;
-    }
-
-
-
-    /**
-     * This isn't just the name of an input, it's a path pointing to an input. The
-     * path is similar to a folder path: slash (/) means to descend into a subsection,
-     * dot-dot-slash (../) means to ascend into the parent section.
-     * After a series of slashes and dot-dot-slashes, there should be the name of an input,
-     * which will be returned.
-     * Eg, if you want the related input to be conditional on a sibling input name 'foobar'
-     * just use 'foobar'. If you want it to be conditional on an aunt/uncle input name
-     * 'baz', use '../baz'. If you want it to be conditional on a cousin input,
-     * the child of 'baz_section' named 'baz_child', use '../baz_section/baz_child'.
-     * Etc
-     *
-     * @param string|false $form_section_path we accept false also because substr( '../', '../' ) = false
-     * @return EE_Form_Section_Base
-     */
-    public function find_section_from_path($form_section_path)
-    {
-        if (strpos($form_section_path, '/') === 0) {
-            $form_section_path = substr($form_section_path, strlen('/'));
-        }
-        if (empty($form_section_path)) {
-            return $this;
-        }
-        if (strpos($form_section_path, '../') === 0) {
-            $parent = $this->parent_section();
-            $form_section_path = substr($form_section_path, strlen('../'));
-            if ($parent instanceof EE_Form_Section_Base) {
-                return $parent->find_section_from_path($form_section_path);
-            }
-            if (empty($form_section_path)) {
-                return $this;
-            }
-        }
-        // couldn't find it using simple parent following
-        return null;
-    }
+
+	/**
+	 * Gets the HTML for displaying this form section
+	 *
+	 * @return string
+	 */
+	abstract public function get_html();
+
+
+	/**
+	 * @param bool $add_pound_sign
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function html_id($add_pound_sign = false)
+	{
+		$this->_set_default_html_id_if_empty();
+		return $add_pound_sign ? '#' . $this->_html_id : $this->_html_id;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function html_class()
+	{
+		return $this->_html_class;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function html_style()
+	{
+		return $this->_html_style;
+	}
+
+
+
+	/**
+	 * @param mixed $html_class
+	 */
+	public function set_html_class($html_class)
+	{
+		$this->_html_class = $html_class;
+	}
+
+
+
+	/**
+	 * @param mixed $html_id
+	 */
+	public function set_html_id($html_id)
+	{
+		$this->_html_id = $html_id;
+	}
+
+
+
+	/**
+	 * @param mixed $html_style
+	 */
+	public function set_html_style($html_style)
+	{
+		$this->_html_style = $html_style;
+	}
+
+
+
+	/**
+	 * @param string $other_html_attributes
+	 */
+	public function set_other_html_attributes($other_html_attributes)
+	{
+		$this->_other_html_attributes = $other_html_attributes ?? '';
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function other_html_attributes()
+	{
+		return ! empty($this->_other_html_attributes) ? ' ' . $this->_other_html_attributes : '';
+	}
+
+
+
+	/**
+	 * Gets the name of the form section. This is not the same as the HTML name.
+	 *
+	 * @throws EE_Error
+	 * @return string
+	 */
+	public function name()
+	{
+		if (! $this->_construction_finalized) {
+			throw new EE_Error(sprintf(esc_html__(
+				'You cannot use the form section\s name until _construct_finalize has been called on it (when we set the name). It was called on a form section of type \'s\'',
+				'event_espresso'
+			), get_class($this)));
+		}
+		return $this->_name;
+	}
+
+
+
+	/**
+	 * Gets the parent section
+	 *
+	 * @return EE_Form_Section_Proper
+	 */
+	public function parent_section()
+	{
+		return $this->_parent_section;
+	}
+
+
+	/**
+	 * returns HTML for generating the opening form HTML tag (<form>)
+	 *
+	 * @param string $action           the URL the form is submitted to
+	 * @param string $method           POST (default) or GET
+	 * @param string $other_attributes anything else added to the form open tag, MUST BE VALID HTML
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function form_open($action = '', $method = '', $other_attributes = '')
+	{
+		if (! empty($action)) {
+			$this->set_action($action);
+		}
+		if (! empty($method)) {
+			$this->set_method($method);
+		}
+		$html = EEH_HTML::nl(1, 'form') . '<form';
+		$html .= $this->html_id() !== '' ? ' id="' . $this->get_html_id_for_form($this->html_id()) . '"' : '';
+		$html .= ' action="' . esc_url_raw($this->action()) . '"';
+		$html .= ' method="' . $this->method() . '"';
+		$html .= ' name="' . $this->name() . '"';
+		$html .= ' ' . $other_attributes . '>';
+		return $html;
+	}
+
+
+
+	/**
+	 * ensures that html id for form either ends in "-form" or "-frm"
+	 * so that id doesn't conflict/collide with other elements
+	 *
+	 * @param string $html_id
+	 * @return string
+	 */
+	protected function get_html_id_for_form($html_id)
+	{
+		$strlen = strlen($html_id);
+		$html_id = strpos($html_id, '-form') === $strlen - 5 || strpos($html_id, '-frm') === $strlen - 4
+			? $html_id
+			: $html_id . '-frm';
+		return $html_id;
+	}
+
+
+	/**
+	 * returns HTML for generating the closing form HTML tag (</form>)
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function form_close()
+	{
+		return EEH_HTML::nl(-1, 'form')
+			   . '</form>'
+			   . EEH_HTML::nl()
+			   . '<!-- end of ee-'
+			   . $this->html_id()
+			   . '-form -->'
+			   . EEH_HTML::nl();
+	}
+
+
+
+	/**
+	 * enqueues JS (and CSS) for the form (ie immediately call wp_enqueue_script and
+	 * wp_enqueue_style; the scripts could have optionally been registered earlier)
+	 * Default does nothing, but child classes can override
+	 *
+	 * @return void
+	 */
+	public function enqueue_js()
+	{
+		// defaults to enqueue NO js or css
+	}
+
+
+
+	/**
+	 * Adds any extra data needed by js. Eventually we'll call wp_localize_script
+	 * with it, and it will be on each form section's 'other_data' property.
+	 * By default nothing is added, but child classes can extend this method to add something.
+	 * Eg, if you have an input that will cause a modal dialog to appear,
+	 * here you could add an entry like 'modal_dialog_inputs' to this array
+	 * to map between the input's html ID and the modal dialogue's ID, so that
+	 * your JS code will know where to find the modal dialog when the input is pressed.
+	 * Eg $form_other_js_data['modal_dialog_inputs']['some-input-id']='modal-dialog-id';
+	 *
+	 * @param array $form_other_js_data
+	 * @return array
+	 */
+	public function get_other_js_data($form_other_js_data = array())
+	{
+		return $form_other_js_data;
+	}
+
+
+
+	/**
+	 * This isn't just the name of an input, it's a path pointing to an input. The
+	 * path is similar to a folder path: slash (/) means to descend into a subsection,
+	 * dot-dot-slash (../) means to ascend into the parent section.
+	 * After a series of slashes and dot-dot-slashes, there should be the name of an input,
+	 * which will be returned.
+	 * Eg, if you want the related input to be conditional on a sibling input name 'foobar'
+	 * just use 'foobar'. If you want it to be conditional on an aunt/uncle input name
+	 * 'baz', use '../baz'. If you want it to be conditional on a cousin input,
+	 * the child of 'baz_section' named 'baz_child', use '../baz_section/baz_child'.
+	 * Etc
+	 *
+	 * @param string|false $form_section_path we accept false also because substr( '../', '../' ) = false
+	 * @return EE_Form_Section_Base
+	 */
+	public function find_section_from_path($form_section_path)
+	{
+		if (strpos($form_section_path, '/') === 0) {
+			$form_section_path = substr($form_section_path, strlen('/'));
+		}
+		if (empty($form_section_path)) {
+			return $this;
+		}
+		if (strpos($form_section_path, '../') === 0) {
+			$parent = $this->parent_section();
+			$form_section_path = substr($form_section_path, strlen('../'));
+			if ($parent instanceof EE_Form_Section_Base) {
+				return $parent->find_section_from_path($form_section_path);
+			}
+			if (empty($form_section_path)) {
+				return $this;
+			}
+		}
+		// couldn't find it using simple parent following
+		return null;
+	}
 }
 // End of file EE_Form_Section_Base.form.php

core/services/database/TableAnalysis.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
     public function ensureTableNameHasPrefix(string $table_name): string
     {
         global $wpdb;
-        return strpos($table_name, $wpdb->base_prefix) === 0 ? $table_name : $wpdb->prefix . $table_name;
+        return strpos($table_name, $wpdb->base_prefix) === 0 ? $table_name : $wpdb->prefix.$table_name;
     }
 
 
@@ -85,7 +85,7 @@ 
         $wpdb->last_error = $old_error;
         $EZSQL_ERROR      = $ezsql_error_cache;
         // if there was a table doesn't exist error
-        if (! empty($new_error)) {
+        if ( ! empty($new_error)) {
             if (
                 in_array(
                     EEH_Activation::last_wpdb_error_code(),

Indentation +106 added lines, -106 removed lines

@@ -17,118 +17,118 @@
  */
 class TableAnalysis extends EE_Base
 {
-    /**
-     * The maximum number of characters that can be indexed on a column using utf8mb4 collation,
-     * see https://events.codebasehq.com/redirect?https://make.wordpress.org/core/2015/04/02/the-utf8mb4-upgrade/
-     */
-    public const INDEX_COLUMN_SIZE = 191;
+	/**
+	 * The maximum number of characters that can be indexed on a column using utf8mb4 collation,
+	 * see https://events.codebasehq.com/redirect?https://make.wordpress.org/core/2015/04/02/the-utf8mb4-upgrade/
+	 */
+	public const INDEX_COLUMN_SIZE = 191;
 
 
-    /**
-     * Returns the table name which will definitely have the wpdb prefix on the front,
-     * except if it currently has the wpdb->base_prefix on the front, in which case
-     * it will have the wpdb->base_prefix on it
-     *
-     * @param string $table_name
-     * @return string $tableName, having ensured it has the wpdb prefix on the front
-     * @global wpdb  $wpdb
-     */
-    public function ensureTableNameHasPrefix(string $table_name): string
-    {
-        global $wpdb;
-        return strpos($table_name, $wpdb->base_prefix) === 0 ? $table_name : $wpdb->prefix . $table_name;
-    }
+	/**
+	 * Returns the table name which will definitely have the wpdb prefix on the front,
+	 * except if it currently has the wpdb->base_prefix on the front, in which case
+	 * it will have the wpdb->base_prefix on it
+	 *
+	 * @param string $table_name
+	 * @return string $tableName, having ensured it has the wpdb prefix on the front
+	 * @global wpdb  $wpdb
+	 */
+	public function ensureTableNameHasPrefix(string $table_name): string
+	{
+		global $wpdb;
+		return strpos($table_name, $wpdb->base_prefix) === 0 ? $table_name : $wpdb->prefix . $table_name;
+	}
 
 
-    /**
-     * Indicates whether or not the table has any entries. $table_name can
-     * optionally start with $wpdb->prefix or not
-     *
-     * @param string $table_name
-     * @return bool
-     * @global wpdb  $wpdb
-     */
-    public function tableIsEmpty(string $table_name): bool
-    {
-        global $wpdb;
-        $table_name = $this->ensureTableNameHasPrefix($table_name);
-        if ($this->tableExists($table_name)) {
-            $count = $wpdb->get_var("SELECT COUNT(*) FROM $table_name");
-            return absint($count) === 0;
-        }
-        return false;
-    }
+	/**
+	 * Indicates whether or not the table has any entries. $table_name can
+	 * optionally start with $wpdb->prefix or not
+	 *
+	 * @param string $table_name
+	 * @return bool
+	 * @global wpdb  $wpdb
+	 */
+	public function tableIsEmpty(string $table_name): bool
+	{
+		global $wpdb;
+		$table_name = $this->ensureTableNameHasPrefix($table_name);
+		if ($this->tableExists($table_name)) {
+			$count = $wpdb->get_var("SELECT COUNT(*) FROM $table_name");
+			return absint($count) === 0;
+		}
+		return false;
+	}
 
 
-    /**
-     * Indicates whether or not the table exists. $table_name can optionally
-     * have the $wpdb->prefix on the beginning, or not.
-     *
-     * @param string $table_name
-     * @return bool
-     * @global wpdb  $wpdb
-     * @global array $EZSQL_ERROR
-     */
-    public function tableExists(string $table_name): bool
-    {
-        global $wpdb, $EZSQL_ERROR;
-        $table_name = $this->ensureTableNameHasPrefix($table_name);
-        // ignore if this causes an sql error
-        $old_error             = $wpdb->last_error;
-        $old_suppress_errors   = $wpdb->suppress_errors();
-        $old_show_errors_value = $wpdb->show_errors(false);
-        $ezsql_error_cache     = $EZSQL_ERROR;
-        $wpdb->get_results("SELECT * from $table_name LIMIT 1");
-        $wpdb->show_errors($old_show_errors_value);
-        $wpdb->suppress_errors($old_suppress_errors);
-        $new_error        = $wpdb->last_error;
-        $wpdb->last_error = $old_error;
-        $EZSQL_ERROR      = $ezsql_error_cache;
-        // if there was a table doesn't exist error
-        if (! empty($new_error)) {
-            if (
-                in_array(
-                    EEH_Activation::last_wpdb_error_code(),
-                    [
-                        1051, // bad table
-                        1109, // unknown table
-                        117, // no such table
-                    ]
-                )
-                || preg_match(
-                    '~^Table .* doesn\'t exist~',
-                    $new_error
-                ) // in case not using mysql and error codes aren't reliable, just check for this error string
-            ) {
-                return false;
-            } else {
-                // log this because that's weird. Just use the normal PHP error log
-                error_log(
-                    sprintf(
-                        esc_html__(
-                            'Event Espresso error detected when checking if table existed: %1$s (it wasn\'t just that the table didn\'t exist either)',
-                            'event_espresso'
-                        ),
-                        $new_error
-                    )
-                );
-            }
-        }
-        return true;
-    }
+	/**
+	 * Indicates whether or not the table exists. $table_name can optionally
+	 * have the $wpdb->prefix on the beginning, or not.
+	 *
+	 * @param string $table_name
+	 * @return bool
+	 * @global wpdb  $wpdb
+	 * @global array $EZSQL_ERROR
+	 */
+	public function tableExists(string $table_name): bool
+	{
+		global $wpdb, $EZSQL_ERROR;
+		$table_name = $this->ensureTableNameHasPrefix($table_name);
+		// ignore if this causes an sql error
+		$old_error             = $wpdb->last_error;
+		$old_suppress_errors   = $wpdb->suppress_errors();
+		$old_show_errors_value = $wpdb->show_errors(false);
+		$ezsql_error_cache     = $EZSQL_ERROR;
+		$wpdb->get_results("SELECT * from $table_name LIMIT 1");
+		$wpdb->show_errors($old_show_errors_value);
+		$wpdb->suppress_errors($old_suppress_errors);
+		$new_error        = $wpdb->last_error;
+		$wpdb->last_error = $old_error;
+		$EZSQL_ERROR      = $ezsql_error_cache;
+		// if there was a table doesn't exist error
+		if (! empty($new_error)) {
+			if (
+				in_array(
+					EEH_Activation::last_wpdb_error_code(),
+					[
+						1051, // bad table
+						1109, // unknown table
+						117, // no such table
+					]
+				)
+				|| preg_match(
+					'~^Table .* doesn\'t exist~',
+					$new_error
+				) // in case not using mysql and error codes aren't reliable, just check for this error string
+			) {
+				return false;
+			} else {
+				// log this because that's weird. Just use the normal PHP error log
+				error_log(
+					sprintf(
+						esc_html__(
+							'Event Espresso error detected when checking if table existed: %1$s (it wasn\'t just that the table didn\'t exist either)',
+							'event_espresso'
+						),
+						$new_error
+					)
+				);
+			}
+		}
+		return true;
+	}
 
 
-    /**
-     * @param string $table_name
-     * @param string $index_name
-     * @return array of columns used on that index, Each entry is an object with the following properties {
-     * }
-     */
-    public function showIndexes(string $table_name, string $index_name): array
-    {
-        global $wpdb;
-        $table_name         = $this->ensureTableNameHasPrefix($table_name);
-        $index_exists_query = "SHOW INDEX FROM $table_name WHERE Key_name = '$index_name'";
-        return $wpdb->get_results($index_exists_query);
-    }
+	/**
+	 * @param string $table_name
+	 * @param string $index_name
+	 * @return array of columns used on that index, Each entry is an object with the following properties {
+	 * }
+	 */
+	public function showIndexes(string $table_name, string $index_name): array
+	{
+		global $wpdb;
+		$table_name         = $this->ensureTableNameHasPrefix($table_name);
+		$index_exists_query = "SHOW INDEX FROM $table_name WHERE Key_name = '$index_name'";
+		return $wpdb->get_results($index_exists_query);
+	}
 }

core/services/address/formatters/InlineAddressFormatter.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
             )
         );
         // if the incoming country has a set format, use that, else use the default
-        $formatted_address = $address_formats[ $CNT_ISO ] ?? $address_formats['ZZZ'];
+        $formatted_address = $address_formats[$CNT_ISO] ?? $address_formats['ZZZ'];
         return $this->parse_formatted_address(
             $address,
             $address2,

Indentation +41 added lines, -41 removed lines

@@ -13,45 +13,45 @@
  */
 class InlineAddressFormatter extends AddressFormatter implements AddressFormatterInterface
 {
-    /**
-     * @param string $address
-     * @param string $address2
-     * @param string $city
-     * @param string $state
-     * @param string $zip
-     * @param string $country
-     * @param string $CNT_ISO
-     * @return string|null
-     */
-    public function format(
-        string $address,
-        string $address2,
-        string $city,
-        string $state,
-        string $zip,
-        string $country,
-        string $CNT_ISO
-    ): ?string {
-        $address_formats = apply_filters(
-            'FHEE__EE_Inline_Address_Formatter__address_formats',
-            array(
-                'CA'  => "{address}%{address2}%{city}%{state}%{country}%{zip}",
-                'GB'  => "{address}%{address2}%{city}%{state}%{zip}%{country}",
-                'US'  => "{address}%{address2}%{city}%{state}%{zip}%{country}",
-                'ZZZ' => "{address}%{address2}%{city}%{state}%{zip}%{country}",
-            )
-        );
-        // if the incoming country has a set format, use that, else use the default
-        $formatted_address = $address_formats[ $CNT_ISO ] ?? $address_formats['ZZZ'];
-        return $this->parse_formatted_address(
-            $address,
-            $address2,
-            $city,
-            $state,
-            $zip,
-            $country,
-            $formatted_address,
-            ', '
-        );
-    }
+	/**
+	 * @param string $address
+	 * @param string $address2
+	 * @param string $city
+	 * @param string $state
+	 * @param string $zip
+	 * @param string $country
+	 * @param string $CNT_ISO
+	 * @return string|null
+	 */
+	public function format(
+		string $address,
+		string $address2,
+		string $city,
+		string $state,
+		string $zip,
+		string $country,
+		string $CNT_ISO
+	): ?string {
+		$address_formats = apply_filters(
+			'FHEE__EE_Inline_Address_Formatter__address_formats',
+			array(
+				'CA'  => "{address}%{address2}%{city}%{state}%{country}%{zip}",
+				'GB'  => "{address}%{address2}%{city}%{state}%{zip}%{country}",
+				'US'  => "{address}%{address2}%{city}%{state}%{zip}%{country}",
+				'ZZZ' => "{address}%{address2}%{city}%{state}%{zip}%{country}",
+			)
+		);
+		// if the incoming country has a set format, use that, else use the default
+		$formatted_address = $address_formats[ $CNT_ISO ] ?? $address_formats['ZZZ'];
+		return $this->parse_formatted_address(
+			$address,
+			$address2,
+			$city,
+			$state,
+			$zip,
+			$country,
+			$formatted_address,
+			', '
+		);
+	}
 }

core/services/address/formatters/MultiLineAddressFormatter.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
             )
         );
         // if the incoming country has a set format, use that, else use the default
-        $formatted_address = $address_formats[ $CNT_ISO ] ?? $address_formats['ZZ'];
+        $formatted_address = $address_formats[$CNT_ISO] ?? $address_formats['ZZ'];
         return $this->parse_formatted_address(
             $address,
             $address2,

Indentation +41 added lines, -41 removed lines

@@ -13,45 +13,45 @@
  */
 class MultiLineAddressFormatter extends AddressFormatter implements AddressFormatterInterface
 {
-    /**
-     * @param string $address
-     * @param string $address2
-     * @param string $city
-     * @param string $state
-     * @param string $zip
-     * @param string $country
-     * @param string $CNT_ISO
-     * @return string
-     */
-    public function format(
-        string $address,
-        string $address2,
-        string $city,
-        string $state,
-        string $zip,
-        string $country,
-        string $CNT_ISO
-    ): ?string {
-        $address_formats = apply_filters(
-            'FHEE__EE_MultiLine_Address_Formatter__address_formats',
-            array(
-                'CA' => "{address}%{address2}%{city}%{state}%{country}%{zip}",
-                'GB' => "{address}%{address2}%{city}%{state}%{zip}%{country}",
-                'US' => "{address}%{address2}%{city}%{state}%{zip}%{country}",
-                'ZZ' => "{address}%{address2}%{city}%{state}%{zip}%{country}",
-            )
-        );
-        // if the incoming country has a set format, use that, else use the default
-        $formatted_address = $address_formats[ $CNT_ISO ] ?? $address_formats['ZZ'];
-        return $this->parse_formatted_address(
-            $address,
-            $address2,
-            $city,
-            $state,
-            $zip,
-            $country,
-            $formatted_address,
-            '<br />'
-        );
-    }
+	/**
+	 * @param string $address
+	 * @param string $address2
+	 * @param string $city
+	 * @param string $state
+	 * @param string $zip
+	 * @param string $country
+	 * @param string $CNT_ISO
+	 * @return string
+	 */
+	public function format(
+		string $address,
+		string $address2,
+		string $city,
+		string $state,
+		string $zip,
+		string $country,
+		string $CNT_ISO
+	): ?string {
+		$address_formats = apply_filters(
+			'FHEE__EE_MultiLine_Address_Formatter__address_formats',
+			array(
+				'CA' => "{address}%{address2}%{city}%{state}%{country}%{zip}",
+				'GB' => "{address}%{address2}%{city}%{state}%{zip}%{country}",
+				'US' => "{address}%{address2}%{city}%{state}%{zip}%{country}",
+				'ZZ' => "{address}%{address2}%{city}%{state}%{zip}%{country}",
+			)
+		);
+		// if the incoming country has a set format, use that, else use the default
+		$formatted_address = $address_formats[ $CNT_ISO ] ?? $address_formats['ZZ'];
+		return $this->parse_formatted_address(
+			$address,
+			$address2,
+			$city,
+			$state,
+			$zip,
+			$country,
+			$formatted_address,
+			'<br />'
+		);
+	}
 }

core/services/address/formatters/AddressFormatter.php

Indentation +34 added lines, -34 removed lines

@@ -12,38 +12,38 @@
  */
 class AddressFormatter
 {
-    // phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    /**
-     * @param string $address
-     * @param string $address2
-     * @param string $city
-     * @param string $state
-     * @param string $zip
-     * @param string $country
-     * @param string $formatted_address
-     * @param string $sub
-     * @return string
-     */
-    protected function parse_formatted_address(
-        string $address,
-        string $address2,
-        string $city,
-        string $state,
-        string $zip,
-        string $country,
-        string $formatted_address,
-        string $sub
-    ): string {
-        // swap address part placeholders for the real text
-        $formatted_address = str_replace(
-            // find
-            array('{address}', '{address2}', '{city}', '{state}', '{zip}', '{country}'),
-            // replace
-            array($address, $address2, $city, $state, $zip, $country),
-            // string
-            $formatted_address
-        );
-        // remove placeholder from start and end, reduce repeating placeholders to singles, then replace with HTML line breaks
-        return preg_replace('/%+/', $sub, trim($formatted_address, '%'));
-    }
+	// phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	/**
+	 * @param string $address
+	 * @param string $address2
+	 * @param string $city
+	 * @param string $state
+	 * @param string $zip
+	 * @param string $country
+	 * @param string $formatted_address
+	 * @param string $sub
+	 * @return string
+	 */
+	protected function parse_formatted_address(
+		string $address,
+		string $address2,
+		string $city,
+		string $state,
+		string $zip,
+		string $country,
+		string $formatted_address,
+		string $sub
+	): string {
+		// swap address part placeholders for the real text
+		$formatted_address = str_replace(
+			// find
+			array('{address}', '{address2}', '{city}', '{state}', '{zip}', '{country}'),
+			// replace
+			array($address, $address2, $city, $state, $zip, $country),
+			// string
+			$formatted_address
+		);
+		// remove placeholder from start and end, reduce repeating placeholders to singles, then replace with HTML line breaks
+		return preg_replace('/%+/', $sub, trim($formatted_address, '%'));
+	}
 }

vendor/composer/autoload_files.php

Indentation +4 added lines, -4 removed lines

@@ -6,8 +6,8 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    '6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
-    'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
-    'ec07570ca5a812141189b1fa81503674' => $vendorDir . '/phpunit/phpunit/src/Framework/Assert/Functions.php',
-    '7d3b315c4f303f2fc14aca642a738e50' => $vendorDir . '/yoast/phpunit-polyfills/phpunitpolyfills-autoload.php',
+	'6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
+	'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
+	'ec07570ca5a812141189b1fa81503674' => $vendorDir . '/phpunit/phpunit/src/Framework/Assert/Functions.php',
+	'7d3b315c4f303f2fc14aca642a738e50' => $vendorDir . '/yoast/phpunit-polyfills/phpunitpolyfills-autoload.php',
 );

Spacing +4 added lines, -4 removed lines

@@ -6,8 +6,8 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    '6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
-    'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
-    'ec07570ca5a812141189b1fa81503674' => $vendorDir . '/phpunit/phpunit/src/Framework/Assert/Functions.php',
-    '7d3b315c4f303f2fc14aca642a738e50' => $vendorDir . '/yoast/phpunit-polyfills/phpunitpolyfills-autoload.php',
+    '6124b4c8570aa390c21fafd04a26c69f' => $vendorDir.'/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
+    'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir.'/symfony/polyfill-php80/bootstrap.php',
+    'ec07570ca5a812141189b1fa81503674' => $vendorDir.'/phpunit/phpunit/src/Framework/Assert/Functions.php',
+    '7d3b315c4f303f2fc14aca642a738e50' => $vendorDir.'/yoast/phpunit-polyfills/phpunitpolyfills-autoload.php',
 );

modules/ticket_selector/TicketDetails.php

Spacing +6 added lines, -6 removed lines

@@ -117,7 +117,7 @@ 
      */
     public function getShowHideLinks(): string
     {
-        if (! $this->showTicketDetails()) {
+        if ( ! $this->showTicketDetails()) {
             return '';
         }
         return EEH_HTML::link(
@@ -132,8 +132,8 @@ 
                 "display-{$this->cssId()}",
                 'display-tckt-slctr-tkt-details display-the-hidden lt-grey-text smaller-text hide-if-no-js',
                 '',
-                'rel="' . $this->cssId() . '"'
-            ) . EEH_HTML::link(
+                'rel="'.$this->cssId().'"'
+            ).EEH_HTML::link(
                 '',
                 sprintf(esc_html__('hide%1$sdetails%1$s-', 'event_espresso'), ' '),
                 esc_attr(
@@ -145,7 +145,7 @@ 
                 "hide-{$this->cssId()}",
                 'hide-tckt-slctr-tkt-details hide-the-displayed lt-grey-text smaller-text hide-if-no-js',
                 'display:none;',
-                'rel="' . $this->cssId() . '"'
+                'rel="'.$this->cssId().'"'
             );
     }
 
@@ -191,7 +191,7 @@ 
                                                          'FHEE__ticket_selector_chart_template__display_ticket_price_details',
                                                          true
                                                      );
-        $template_args['price_breakdown_heading']  = apply_filters(
+        $template_args['price_breakdown_heading'] = apply_filters(
             'FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading',
             esc_html__('Price', 'event_espresso')
         );
@@ -202,7 +202,7 @@ 
         return EEH_Template::locate_template(
             apply_filters(
                 'FHEE__EventEspresso_modules_ticket_selector_TicketDetails__display__template_path',
-                TICKET_SELECTOR_TEMPLATES_PATH . 'ticket_details.template.php',
+                TICKET_SELECTOR_TEMPLATES_PATH.'ticket_details.template.php',
                 $this->ticket
             ),
             $template_args

Indentation +189 added lines, -189 removed lines

@@ -19,193 +19,193 @@
  */
 class TicketDetails
 {
-    /**
-     * @var EE_Ticket
-     */
-    protected $ticket;
-
-    /**
-     * @var EE_Ticket_Selector_Config
-     */
-    protected $template_settings;
-
-    /**
-     * @var string $date_format
-     */
-    protected $date_format;
-
-    /**
-     * @var string $time_format
-     */
-    protected $time_format;
-
-    /**
-     * @var bool $event_is_expired
-     */
-    protected $event_is_expired;
-
-
-    /**
-     * TicketDetails constructor.
-     *
-     * @param EE_Ticket                 $ticket
-     * @param EE_Ticket_Selector_Config $template_settings
-     * @param array                     $template_args
-     */
-    public function __construct(
-        EE_Ticket $ticket,
-        EE_Ticket_Selector_Config $template_settings,
-        array $template_args
-    ) {
-        $this->ticket            = $ticket;
-        $this->template_settings = $template_settings;
-        $this->date_format       = $template_args['date_format'];
-        $this->time_format       = $template_args['time_format'];
-        $this->event_is_expired  = $template_args['event_is_expired'];
-    }
-
-
-    /**
-     * @return EE_Ticket
-     */
-    public function getTicket(): EE_Ticket
-    {
-        return $this->ticket;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function showTicketDetails(): bool
-    {
-        return $this->template_settings->show_ticket_details;
-    }
-
-
-    /**
-     * @return EE_Ticket_Selector_Config
-     */
-    public function getTemplateSettings(): EE_Ticket_Selector_Config
-    {
-        return $this->template_settings;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getDateFormat(): string
-    {
-        return $this->date_format;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getTimeFormat(): string
-    {
-        return $this->time_format;
-    }
-
-
-    /**
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function getShowHideLinks(): string
-    {
-        if (! $this->showTicketDetails()) {
-            return '';
-        }
-        return EEH_HTML::link(
-                '',
-                sprintf(esc_html__('show%1$sdetails%1$s+', 'event_espresso'), ' '),
-                esc_attr(
-                    apply_filters(
-                        'FHEE__ticket_selector_chart_template__show_ticket_details_link_title',
-                        esc_html__('click to show additional ticket details', 'event_espresso')
-                    )
-                ),
-                "display-{$this->cssId()}",
-                'display-tckt-slctr-tkt-details display-the-hidden lt-grey-text smaller-text hide-if-no-js',
-                '',
-                'rel="' . $this->cssId() . '"'
-            ) . EEH_HTML::link(
-                '',
-                sprintf(esc_html__('hide%1$sdetails%1$s-', 'event_espresso'), ' '),
-                esc_attr(
-                    apply_filters(
-                        'FHEE__ticket_selector_chart_template__hide_ticket_details_link_title',
-                        esc_html__('click to hide additional ticket details', 'event_espresso')
-                    )
-                ),
-                "hide-{$this->cssId()}",
-                'hide-tckt-slctr-tkt-details hide-the-displayed lt-grey-text smaller-text hide-if-no-js',
-                'display:none;',
-                'rel="' . $this->cssId() . '"'
-            );
-    }
-
-
-    /**
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function cssId(): string
-    {
-        return apply_filters(
-            'FHEE__ticket_selector_chart_template__ticket_details_css_id',
-            "tckt-slctr-tkt-details-{$this->ticket->get_event_ID()}-{$this->ticket->ID()}"
-        );
-    }
-
-
-    /**
-     * @param float|string $ticket_price
-     * @param int|string   $remaining
-     * @param int|string   $cols
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function display(
-        $ticket_price = 0.00,
-        $remaining = EE_INF,
-        $cols = 2
-    ): string {
-        $template_args                             = [];
-        $template_args['ticket']                   = $this->ticket;
-        $template_args['ticket_price']             = $ticket_price;
-        $template_args['remaining']                = $remaining;
-        $template_args['cols']                     = $cols;
-        $template_args['show_ticket_details']      = $this->template_settings->show_ticket_details;
-        $template_args['show_ticket_sale_columns'] = $this->template_settings->show_ticket_sale_columns;
-        $template_args['ticket_details_row_class'] = espresso_get_object_css_class($this->ticket, '', 'details');
-        $template_args['ticket_details_css_id']    = $this->cssId();
-        $template_args['display_ticket_price']     = $ticket_price !== 0
-                                                     && apply_filters(
-                                                         'FHEE__ticket_selector_chart_template__display_ticket_price_details',
-                                                         true
-                                                     );
-        $template_args['price_breakdown_heading']  = apply_filters(
-            'FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading',
-            esc_html__('Price', 'event_espresso')
-        );
-        $template_args['date_format']              = $this->date_format;
-        $template_args['time_format']              = $this->time_format;
-        $template_args['event_is_expired']         = $this->event_is_expired;
-
-        return EEH_Template::locate_template(
-            apply_filters(
-                'FHEE__EventEspresso_modules_ticket_selector_TicketDetails__display__template_path',
-                TICKET_SELECTOR_TEMPLATES_PATH . 'ticket_details.template.php',
-                $this->ticket
-            ),
-            $template_args
-        );
-    }
+	/**
+	 * @var EE_Ticket
+	 */
+	protected $ticket;
+
+	/**
+	 * @var EE_Ticket_Selector_Config
+	 */
+	protected $template_settings;
+
+	/**
+	 * @var string $date_format
+	 */
+	protected $date_format;
+
+	/**
+	 * @var string $time_format
+	 */
+	protected $time_format;
+
+	/**
+	 * @var bool $event_is_expired
+	 */
+	protected $event_is_expired;
+
+
+	/**
+	 * TicketDetails constructor.
+	 *
+	 * @param EE_Ticket                 $ticket
+	 * @param EE_Ticket_Selector_Config $template_settings
+	 * @param array                     $template_args
+	 */
+	public function __construct(
+		EE_Ticket $ticket,
+		EE_Ticket_Selector_Config $template_settings,
+		array $template_args
+	) {
+		$this->ticket            = $ticket;
+		$this->template_settings = $template_settings;
+		$this->date_format       = $template_args['date_format'];
+		$this->time_format       = $template_args['time_format'];
+		$this->event_is_expired  = $template_args['event_is_expired'];
+	}
+
+
+	/**
+	 * @return EE_Ticket
+	 */
+	public function getTicket(): EE_Ticket
+	{
+		return $this->ticket;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function showTicketDetails(): bool
+	{
+		return $this->template_settings->show_ticket_details;
+	}
+
+
+	/**
+	 * @return EE_Ticket_Selector_Config
+	 */
+	public function getTemplateSettings(): EE_Ticket_Selector_Config
+	{
+		return $this->template_settings;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getDateFormat(): string
+	{
+		return $this->date_format;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getTimeFormat(): string
+	{
+		return $this->time_format;
+	}
+
+
+	/**
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function getShowHideLinks(): string
+	{
+		if (! $this->showTicketDetails()) {
+			return '';
+		}
+		return EEH_HTML::link(
+				'',
+				sprintf(esc_html__('show%1$sdetails%1$s+', 'event_espresso'), ' '),
+				esc_attr(
+					apply_filters(
+						'FHEE__ticket_selector_chart_template__show_ticket_details_link_title',
+						esc_html__('click to show additional ticket details', 'event_espresso')
+					)
+				),
+				"display-{$this->cssId()}",
+				'display-tckt-slctr-tkt-details display-the-hidden lt-grey-text smaller-text hide-if-no-js',
+				'',
+				'rel="' . $this->cssId() . '"'
+			) . EEH_HTML::link(
+				'',
+				sprintf(esc_html__('hide%1$sdetails%1$s-', 'event_espresso'), ' '),
+				esc_attr(
+					apply_filters(
+						'FHEE__ticket_selector_chart_template__hide_ticket_details_link_title',
+						esc_html__('click to hide additional ticket details', 'event_espresso')
+					)
+				),
+				"hide-{$this->cssId()}",
+				'hide-tckt-slctr-tkt-details hide-the-displayed lt-grey-text smaller-text hide-if-no-js',
+				'display:none;',
+				'rel="' . $this->cssId() . '"'
+			);
+	}
+
+
+	/**
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function cssId(): string
+	{
+		return apply_filters(
+			'FHEE__ticket_selector_chart_template__ticket_details_css_id',
+			"tckt-slctr-tkt-details-{$this->ticket->get_event_ID()}-{$this->ticket->ID()}"
+		);
+	}
+
+
+	/**
+	 * @param float|string $ticket_price
+	 * @param int|string   $remaining
+	 * @param int|string   $cols
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function display(
+		$ticket_price = 0.00,
+		$remaining = EE_INF,
+		$cols = 2
+	): string {
+		$template_args                             = [];
+		$template_args['ticket']                   = $this->ticket;
+		$template_args['ticket_price']             = $ticket_price;
+		$template_args['remaining']                = $remaining;
+		$template_args['cols']                     = $cols;
+		$template_args['show_ticket_details']      = $this->template_settings->show_ticket_details;
+		$template_args['show_ticket_sale_columns'] = $this->template_settings->show_ticket_sale_columns;
+		$template_args['ticket_details_row_class'] = espresso_get_object_css_class($this->ticket, '', 'details');
+		$template_args['ticket_details_css_id']    = $this->cssId();
+		$template_args['display_ticket_price']     = $ticket_price !== 0
+													 && apply_filters(
+														 'FHEE__ticket_selector_chart_template__display_ticket_price_details',
+														 true
+													 );
+		$template_args['price_breakdown_heading']  = apply_filters(
+			'FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading',
+			esc_html__('Price', 'event_espresso')
+		);
+		$template_args['date_format']              = $this->date_format;
+		$template_args['time_format']              = $this->time_format;
+		$template_args['event_is_expired']         = $this->event_is_expired;
+
+		return EEH_Template::locate_template(
+			apply_filters(
+				'FHEE__EventEspresso_modules_ticket_selector_TicketDetails__display__template_path',
+				TICKET_SELECTOR_TEMPLATES_PATH . 'ticket_details.template.php',
+				$this->ticket
+			),
+			$template_args
+		);
+	}
 }