diff --git a/typo3/contrib/vendor/helhum/class-alias-loader/Classes/Composer/ClassAliasLoader.php b/typo3/contrib/vendor/helhum/class-alias-loader/Classes/Composer/ClassAliasLoader.php index 5def4465113a00f3c62d3df288260220f952970b..7822cf140461c36ef9d3e6dca36b0c5ea304d30c 100644 --- a/typo3/contrib/vendor/helhum/class-alias-loader/Classes/Composer/ClassAliasLoader.php +++ b/typo3/contrib/vendor/helhum/class-alias-loader/Classes/Composer/ClassAliasLoader.php @@ -100,10 +100,7 @@ class ClassAliasLoader { */ public function loadClass($className) { if (!$this->caseSensitiveClassLoading) { - $lowerCasedClassName = strtolower($className); - if ($this->composerClassLoader->findFile($lowerCasedClassName)) { - return $this->composerClassLoader->loadClass($lowerCasedClassName); - } + $className = strtolower($className); } return $this->composerClassLoader->loadClass($className); } @@ -117,9 +114,9 @@ class ClassAliasLoader { * @return bool */ protected function loadOriginalClassAndSetAliases($originalClassName) { - if (class_exists($originalClassName, false) || $this->loadClass($originalClassName)) { + if ($this->classOrInterfaceExists($originalClassName) || $this->loadClass($originalClassName)) { foreach ($this->aliasMap['classNameToAliasMapping'][$originalClassName] as $aliasClassName) { - if (!class_exists($aliasClassName, false)) { + if (!$this->classOrInterfaceExists($aliasClassName)) { class_alias($originalClassName, $aliasClassName); } } @@ -128,6 +125,14 @@ class ClassAliasLoader { return false; } + /** + * @param string $className + * @return bool + */ + protected function classOrInterfaceExists($className) { + return class_exists($className, false) || interface_exists($className, false); + } + /** * Act as a proxy for method calls to composer class loader *