diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php index d6196f3d6..0691434c3 100644 --- a/src/Composer/Autoload/AutoloadGenerator.php +++ b/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; diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php index 00afd35a9..6434b76dd 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php +++ b/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__); diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php index 118d45854..a25e920db 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php +++ b/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__); diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php index 0964af746..ec8e392be 100644 --- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php +++ b/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__);