diff options
author | Morris Jobke <hey@morrisjobke.de> | 2018-01-13 01:16:10 +0300 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2018-01-13 01:16:10 +0300 |
commit | f578b69729f09a763b8c323b94b0df76a9d6b5dd (patch) | |
tree | 2bc16c6ae9e025f12a0191fba0a6e189b2c99f2c /apps/files/composer | |
parent | 3dc7d0fb900eec8b792768505299ba73300efb89 (diff) |
Update composer
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'apps/files/composer')
-rw-r--r-- | apps/files/composer/composer/ClassLoader.php | 15 | ||||
-rw-r--r-- | apps/files/composer/composer/autoload_static.php | 9 |
2 files changed, 14 insertions, 10 deletions
diff --git a/apps/files/composer/composer/ClassLoader.php b/apps/files/composer/composer/ClassLoader.php index c6f6d2322bb..dc02dfb114f 100644 --- a/apps/files/composer/composer/ClassLoader.php +++ b/apps/files/composer/composer/ClassLoader.php @@ -43,8 +43,7 @@ namespace Composer\Autoload; class ClassLoader { // PSR-4 - private $firstCharsPsr4 = array(); - private $prefixLengthsPsr4 = array(); // For BC with legacy static maps + private $prefixLengthsPsr4 = array(); private $prefixDirsPsr4 = array(); private $fallbackDirsPsr4 = array(); @@ -171,10 +170,11 @@ class ClassLoader } } elseif (!isset($this->prefixDirsPsr4[$prefix])) { // Register directories for a new namespace. - if ('\\' !== substr($prefix, -1)) { + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); } - $this->firstCharsPsr4[$prefix[0]] = true; + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; $this->prefixDirsPsr4[$prefix] = (array) $paths; } elseif ($prepend) { // Prepend directories for an already registered namespace. @@ -221,10 +221,11 @@ class ClassLoader if (!$prefix) { $this->fallbackDirsPsr4 = (array) $paths; } else { - if ('\\' !== substr($prefix, -1)) { + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); } - $this->firstCharsPsr4[$prefix[0]] = true; + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; $this->prefixDirsPsr4[$prefix] = (array) $paths; } } @@ -372,7 +373,7 @@ class ClassLoader $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext; $first = $class[0]; - if (isset($this->firstCharsPsr4[$first]) || isset($this->prefixLengthsPsr4[$first])) { + if (isset($this->prefixLengthsPsr4[$first])) { $subPath = $class; while (false !== $lastPos = strrpos($subPath, '\\')) { $subPath = substr($subPath, 0, $lastPos); diff --git a/apps/files/composer/composer/autoload_static.php b/apps/files/composer/composer/autoload_static.php index 13e302199c2..44094c6a34c 100644 --- a/apps/files/composer/composer/autoload_static.php +++ b/apps/files/composer/composer/autoload_static.php @@ -6,8 +6,11 @@ namespace Composer\Autoload; class ComposerStaticInitFiles { - public static $firstCharsPsr4 = array ( - 'O' => true, + public static $prefixLengthsPsr4 = array ( + 'O' => + array ( + 'OCA\\Files\\' => 10, + ), ); public static $prefixDirsPsr4 = array ( @@ -50,7 +53,7 @@ class ComposerStaticInitFiles public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->firstCharsPsr4 = ComposerStaticInitFiles::$firstCharsPsr4; + $loader->prefixLengthsPsr4 = ComposerStaticInitFiles::$prefixLengthsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInitFiles::$prefixDirsPsr4; $loader->classMap = ComposerStaticInitFiles::$classMap; |