Get the autoloader class from current registered autoload functions #163
Conversation
|
Tests are failing. But, yea, I think this approach makes even more sense! |
|
Just fixed the closely related test. I will look into others. |
|
I also suggest using an instance variable rather than a static variable for the cache |
src/Util/AutoloaderUtil.php
Outdated
| if ($autoloader[0] instanceof ClassLoader) { | ||
| self::$classLoader = $autoloader[0]; | ||
| break; | ||
| } elseif (class_exists('Symfony\Component\Debug\DebugClassLoader') |
There was a problem hiding this comment.
class_exists is useless. $a instanceof NonExistentClass is perfectly valid (it won't ever return true for non-existent classes) and this will avoid triggering the autoloader when it does not exist.
There was a problem hiding this comment.
Good to know. Changed it.
tests/Util/AutoloaderUtilTest.php
Outdated
| foreach ($this->getPathForFutureClassTests() as $className => $expectedPath) { | ||
| $this->assertSame( | ||
| // the paths will start in vendor/composer and be relative | ||
| str_replace('\\', '/', self::$currentRootDir.'/vendor/composer/../../'.$expectedPath), | ||
| // the paths will start in vendor/composer and be relative |
There was a problem hiding this comment.
you should revert this indentation change
src/Util/AutoloaderUtil.php
Outdated
| $this->classLoader = $autoloader[0]; | ||
| break; | ||
| } elseif ($autoloader[0] instanceof DebugClassLoader | ||
| && $autoloader[0]->getClassLoader()[0] instanceof ClassLoader) { |
There was a problem hiding this comment.
what if the wrapped loader is not an array callable ?
src/Util/AutoloaderUtil.php
Outdated
| if ($autoloader[0] instanceof ClassLoader) { | ||
| $this->classLoader = $autoloader[0]; | ||
| break; | ||
| } elseif ($autoloader[0] instanceof DebugClassLoader |
There was a problem hiding this comment.
this can be if rather than elseif as there is a break above
tests/Util/AutoloaderUtilTest.php
Outdated
|
|
||
| $autoloaderUtil = new AutoloaderUtil(self::$currentRootDir); | ||
| foreach ($this->getPathForFutureClassTests() as $className => $expectedPath) { | ||
| $this->assertSame( | ||
| // the paths will start in vendor/composer and be relative |
tests/Util/AutoloaderUtilTest.php
Outdated
| } | ||
| } | ||
| } | ||
| $autoloader->setUseIncludePath(true); |
There was a problem hiding this comment.
mutating the actual autoloader of PHP is a bad idea, as it will impact the test process (until the end of the testsuite).
a better idea would be to create a Composer\ClassLoader instance with your fake configuration, and put it in the $autoloaderUtil private property (as if the class loader had already been located previously).
And then, you could have a separate test triggering the actual class loader retrieval code, but without altering the instance itself.
|
Any other changes needed? |
|
No other changes needed - this is great work! Thank you Silvester! |
…d functions (silvester) This PR was squashed before being merged into the 1.0-dev branch (closes #163). Discussion ---------- Get the autoloader class from current registered autoload functions If the default folder for vendor is changed the AutloaderUtil class is no more able to find the ClassLoader. Testing the failure can be easily done by changing the **vendor-dir** in composer.json. After adjusting the autoload require in console file, all makers that use AutoloadUtil will fail. Motivation behind this is development with docker. The application is a lot faster on windows and mac if the vendor folder is not a shared folder. Commits ------- bc04e9a Get the autoloader class from current registered autoload functions
If the default folder for vendor is changed the AutloaderUtil class is no more able to find the ClassLoader. Testing the failure can be easily done by changing the vendor-dir in composer.json. After adjusting the autoload require in console file, all makers that use AutoloadUtil will fail.
Motivation behind this is development with docker. The application is a lot faster on windows and mac if the vendor folder is not a shared folder.