Merge pull request #295 from RLasinski/fix-composer-autoloader-rewrite

Use PathResolver to resolve unresolved paths from the composer
goaop · Dec 13, 2016 · eec2c71 · eec2c71
2 parents 21618e8 + 8490b59
commit eec2c71
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/Instrument/ClassLoading/AopComposerLoader.php b/src/Instrument/ClassLoading/AopComposerLoader.php
@@ -12,6 +12,7 @@
 
 use Go\Core\AspectContainer;
 use Go\Instrument\FileSystem\Enumerator;
+use Go\Instrument\PathResolver;
 use Go\Instrument\Transformer\FilterInjectorTransformer;
 use Composer\Autoload\ClassLoader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
@@ -155,6 +156,7 @@ public function findFile($class)
         $file = $this->original->findFile($class);
 
         if ($file) {
+            $file = PathResolver::realpath($file)?:$file;
             $cacheState = isset($this->cacheState[$file]) ? $this->cacheState[$file] : null;
             if ($cacheState && $isProduction) {
                 $file = $cacheState['cacheUri'] ?: $file;