Fix preload file

jderusse · jderusse · commit 44dd1978595b · 2019-12-05T16:30:34.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -303,7 +303,7 @@ public function dump(array $options = [])
             $this->asFiles = false;
 
             if ($preload && null !== $autoloadFile = $this->getAutoloadFile()) {
-                $autoloadFile = substr($this->export($autoloadFile), 2, -1);
+                $autoloadFile = $this->export($autoloadFile);
 
                 $code[$options['class'].'.preload.php'] = <<<EOF
 <?php
@@ -2048,11 +2048,7 @@ private function getAutoloadFile(): ?string
 
             foreach (get_declared_classes() as $class) {
                 if (0 === strpos($class, 'ComposerAutoloaderInit') && $class::getLoader() === $autoloader[0]) {
-                    $file = \dirname((new \ReflectionClass($class))->getFileName(), 2).'/autoload.php';
-
-                    if (preg_match($this->targetDirRegex.'A', $file)) {
-                        return $file;
-                    }
+                    return \dirname((new \ReflectionClass($class))->getFileName(), 2).'/autoload.php';
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ public function dump(array $options = [])`
`303`	`303`	`$this->asFiles = false;`
`304`	`304`
`305`	`305`	`if ($preload && null !== $autoloadFile = $this->getAutoloadFile()) {`
`306`		`- $autoloadFile = substr($this->export($autoloadFile), 2, -1);`
	`306`	`+ $autoloadFile = $this->export($autoloadFile);`
`307`	`307`
`308`	`308`	`$code[$options['class'].'.preload.php'] = <<<EOF`
`309`	`309`	`<?php`
`@@ -2048,11 +2048,7 @@ private function getAutoloadFile(): ?string`
`2048`	`2048`
`2049`	`2049`	`foreach (get_declared_classes() as $class) {`
`2050`	`2050`	`if (0 === strpos($class, 'ComposerAutoloaderInit') && $class::getLoader() === $autoloader[0]) {`
`2051`		`- $file = \dirname((new \ReflectionClass($class))->getFileName(), 2).'/autoload.php';`
`2052`		`-`
`2053`		`- if (preg_match($this->targetDirRegex.'A', $file)) {`
`2054`		`- return $file;`
`2055`		`- }`
	`2051`	`+ return \dirname((new \ReflectionClass($class))->getFileName(), 2).'/autoload.php';`
`2056`	`2052`	`}`
`2057`	`2053`	`}`
`2058`	`2054`	`}`