[DI] Fix hardcoded cache dir for warmups

nicolas-grekas · nicolas-grekas · commit ad9d359c62f3 · 2018-03-23T21:55:06.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -241,7 +241,7 @@ public function dump(array $options = array())
     'container.build_hash' => '$hash',
     'container.build_id' => '$id',
     'container.build_time' => $time,
-));
+), __DIR__.DIRECTORY_SEPARATOR.'Container{$hash}');
 
 EOF;
         } else {
@@ -963,7 +963,7 @@ public function __construct()
 
 EOF;
         if (null !== $this->targetDirRegex) {
-            $dir = $this->asFiles ? '$this->targetDirs[0] = \\dirname(__DIR__)' : '__DIR__';
+            $dir = $this->asFiles ? '$this->targetDirs[0] = \\dirname($dir)' : '__DIR__';
             $code .= <<<EOF
         \$dir = {$dir};
         for (\$i = 1; \$i <= {$this->targetDirMaxMatches}; ++\$i) {
@@ -974,7 +974,7 @@ public function __construct()
         }
         if ($this->asFiles) {
             $code = str_replace('$parameters', "\$buildParameters;\n    private \$parameters", $code);
-            $code = str_replace('__construct()', '__construct(array $buildParameters = array())', $code);
+            $code = str_replace('__construct()', '__construct(array $buildParameters = array(), $dir = __DIR__)', $code);
             $code .= "        \$this->buildParameters = \$buildParameters;\n";
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -280,9 +280,9 @@ class ProjectServiceContainer extends Container
     private $parameters;
     private $targetDirs = array();
 
-    public function __construct(array $buildParameters = array())
+    public function __construct(array $buildParameters = array(), $dir = __DIR__)
     {
-        $dir = $this->targetDirs[0] = \dirname(__DIR__);
+        $dir = $this->targetDirs[0] = \dirname($dir);
         for ($i = 1; $i <= 5; ++$i) {
             $this->targetDirs[$i] = $dir = \dirname($dir);
         }
@@ -502,6 +502,6 @@ return new \Container%s\ProjectServiceContainer(array(
     'container.build_hash' => '%s',
     'container.build_id' => '%s',
     'container.build_time' => %d,
-));
+), __DIR__.DIRECTORY_SEPARATOR.'Container%s');
 
 )

Original file line number	Diff line number	Diff line change
`@@ -280,9 +280,9 @@ class ProjectServiceContainer extends Container`
`280`	`280`	`private $parameters;`
`281`	`281`	`private $targetDirs = array();`
`282`	`282`
`283`		`- public function __construct(array $buildParameters = array())`
	`283`	`+ public function __construct(array $buildParameters = array(), $dir = __DIR__)`
`284`	`284`	`{`
`285`		`- $dir = $this->targetDirs[0] = \dirname(__DIR__);`
	`285`	`+ $dir = $this->targetDirs[0] = \dirname($dir);`
`286`	`286`	`for ($i = 1; $i <= 5; ++$i) {`
`287`	`287`	`$this->targetDirs[$i] = $dir = \dirname($dir);`
`288`	`288`	`}`
`@@ -502,6 +502,6 @@ return new \Container%s\ProjectServiceContainer(array(`
`502`	`502`	`'container.build_hash' => '%s',`
`503`	`503`	`'container.build_id' => '%s',`
`504`	`504`	`'container.build_time' => %d,`
`505`		`-));`
	`505`	`+), __DIR__.DIRECTORY_SEPARATOR.'Container%s');`
`506`	`506`
`507`	`507`	`)`