bug #40877 [Config] Make sure one can build cache on Windows and then run in (Docker) Linux (Nyholm)

nicolas-grekas · nicolas-grekas · commit 71c6c42399fa · 2021-04-21T11:08:36.000+02:00
This PR was merged into the 5.3-dev branch. Discussion ---------- [Config] Make sure one can build cache on Windows and then run in (Docker) Linux | Q | A | ------------- | --- | Branch? | 5.x | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | The generated ConfigBuilders should use the `\DirectorySeparator` constant. The resulting string will look like this: ```php <?php namespace Symfony\Config; require_once __DIR__.\DIRECTORY_SEPARATOR.'Twig'.\DIRECTORY_SEPARATOR.'GlobalConfig.php'; require_once __DIR__.\DIRECTORY_SEPARATOR.'Twig'.\DIRECTORY_SEPARATOR.'DateConfig.php'; require_once __DIR__.\DIRECTORY_SEPARATOR.'Twig'.\DIRECTORY_SEPARATOR.'NumberFormatConfig.php'; /** * This class is automatically generated to help creating config. * * @experimental in 5.3 */ class TwigConfig implements \Symfony\Component\Config\Builder\ConfigBuilderInterface { private $formThemes; ``` Commits ------- 555c7dd [Config] Make sure one can build cache on Windows and then run in (Docker) Linux
diff --git a/src/Symfony/Component/Config/Builder/ClassBuilder.php b/src/Symfony/Component/Config/Builder/ClassBuilder.php
@@ -64,7 +64,7 @@ public function build(): string
                 }
                 unset($path[$key]);
             }
-            $require .= sprintf('require_once __DIR__.\'%s\';', \DIRECTORY_SEPARATOR.implode(\DIRECTORY_SEPARATOR, $path))."\n";
+            $require .= sprintf('require_once __DIR__.\DIRECTORY_SEPARATOR.\'%s\';', implode('\'.\DIRECTORY_SEPARATOR.\'', $path))."\n";
         }
 
         $implements = [] === $this->implements ? '' : 'implements '.implode(', ', $this->implements);

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function build(): string`
`64`	`64`	`}`
`65`	`65`	`unset($path[$key]);`
`66`	`66`	`}`
`67`		`- $require .= sprintf('require_once __DIR__.\'%s\';', \DIRECTORY_SEPARATOR.implode(\DIRECTORY_SEPARATOR, $path))."\n";`
	`67`	`+ $require .= sprintf('require_once __DIR__.\DIRECTORY_SEPARATOR.\'%s\';', implode('\'.\DIRECTORY_SEPARATOR.\'', $path))."\n";`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`$implements = [] === $this->implements ? '' : 'implements '.implode(', ', $this->implements);`