public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Fix access of the static loader property

pull/1443/head
Jordi Boggiano 2012-12-25 16:08:36 +01:00
parent 0e0af00ad9
commit 1beccf9f0f
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Autoload/AutoloadGenerator.php
View File

@ -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;

6
tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php
View File

@ -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__);

6
tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
View File

@ -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__);

6
tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php
View File

@ -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__);