bug #33539 [DI] fix related to preloading (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit c40370616793 · 2019-09-10T17:58:35.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [DI] fix related to preloading | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- e25c595 [DI] fix related to preloading
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -2047,7 +2047,7 @@ private function getAutoloadFile(): ?string
 
             foreach (get_declared_classes() as $class) {
                 if (0 === strpos($class, 'ComposerAutoloaderInit') && $class::getLoader() === $autoloader[0]) {
-                    $file = (new \ReflectionClass($class))->getFileName();
+                    $file = \dirname((new \ReflectionClass($class))->getFileName(), 2).'/autoload.php';
 
                     if (preg_match($this->targetDirRegex.'A', $file)) {
                         return $file;
diff --git a/src/Symfony/Component/DependencyInjection/ExpressionLanguage.php b/src/Symfony/Component/DependencyInjection/ExpressionLanguage.php
@@ -14,6 +14,10 @@
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage as BaseExpressionLanguage;
 
+if (!class_exists(BaseExpressionLanguage::class)) {
+    throw new \ReflectionException(BaseExpressionLanguage::class.' not found.');
+}
+
 /**
  * Adds some function to the default ExpressionLanguage.
  *
