diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DI] fix related to preloading

Browse Source
This commit is contained in:
Nicolas Grekas 2019-09-10 17:50:40 +02:00
parent 541f80c635
commit e25c5957e0
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
View File

@ -2047,7 +2047,7 @@ EOF;
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;

4
src/Symfony/Component/DependencyInjection/ExpressionLanguage.php
View File

@ -14,6 +14,10 @@ namespace Symfony\Component\DependencyInjection;
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.
*