Переглянути джерело

Fix access of the static loader property

Jordi Boggiano 12 роки тому
батько
коміт
1beccf9f0f

+ 3 - 3
src/Composer/Autoload/AutoloadGenerator.php

@@ -357,12 +357,12 @@ class ComposerAutoloaderInit$suffix
 
     public static function getLoader()
     {
-        if (null !== static::\$loader) {
-            return static::\$loader;
+        if (null !== self::\$loader) {
+            return self::\$loader;
         }
 
         spl_autoload_register(array('ComposerAutoloaderInit$suffix', 'loadClassLoader'));
-        static::\$loader = \$loader = new \\Composer\\Autoload\\ClassLoader();
+        self::\$loader = \$loader = new \\Composer\\Autoload\\ClassLoader();
         spl_autoload_unregister(array('ComposerAutoloaderInit$suffix', 'loadClassLoader'));
 
         \$vendorDir = $vendorPathCode;

+ 3 - 3
tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php

@@ -15,12 +15,12 @@ class ComposerAutoloaderInitFilesAutoloadOrder
 
     public static function getLoader()
     {
-        if (null !== static::$loader) {
-            return static::$loader;
+        if (null !== self::$loader) {
+            return self::$loader;
         }
 
         spl_autoload_register(array('ComposerAutoloaderInitFilesAutoloadOrder', 'loadClassLoader'));
-        static::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
         spl_autoload_unregister(array('ComposerAutoloaderInitFilesAutoloadOrder', 'loadClassLoader'));
 
         $vendorDir = dirname(__DIR__);

+ 3 - 3
tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php

@@ -15,12 +15,12 @@ class ComposerAutoloaderInitFilesAutoload
 
     public static function getLoader()
     {
-        if (null !== static::$loader) {
-            return static::$loader;
+        if (null !== self::$loader) {
+            return self::$loader;
         }
 
         spl_autoload_register(array('ComposerAutoloaderInitFilesAutoload', 'loadClassLoader'));
-        static::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
         spl_autoload_unregister(array('ComposerAutoloaderInitFilesAutoload', 'loadClassLoader'));
 
         $vendorDir = dirname(__DIR__);

+ 3 - 3
tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php

@@ -15,12 +15,12 @@ class ComposerAutoloaderInitTargetDir
 
     public static function getLoader()
     {
-        if (null !== static::$loader) {
-            return static::$loader;
+        if (null !== self::$loader) {
+            return self::$loader;
         }
 
         spl_autoload_register(array('ComposerAutoloaderInitTargetDir', 'loadClassLoader'));
-        static::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
         spl_autoload_unregister(array('ComposerAutoloaderInitTargetDir', 'loadClassLoader'));
 
         $vendorDir = dirname(__DIR__);