bug #38139 [DI] dump OS-indepent paths in the compiled container (nicolas-grekas)

fabpot · fabpot · commit 44dd80f3fd22 · 2020-09-10T18:59:53.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [DI] dump OS-indepent paths in the compiled container | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #38123 | License | MIT | Doc PR | - This allows compiling on Windows and running on Linux (Docker). Commits ------- 4dcf9e7 [DI] dump OS-indepent paths in the compiled container
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -2017,7 +2017,15 @@ private function export($value)
             $suffix = $matches[0][1] + \strlen($matches[0][0]);
             $matches[0][1] += \strlen($matches[1][0]);
             $prefix = $matches[0][1] ? $this->doExport(substr($value, 0, $matches[0][1]), true).'.' : '';
-            $suffix = isset($value[$suffix]) ? '.'.$this->doExport(substr($value, $suffix), true) : '';
+
+            if ('\\' === \DIRECTORY_SEPARATOR && isset($value[$suffix])) {
+                $cookie = '\\'.random_int(100000, \PHP_INT_MAX);
+                $suffix = '.'.$this->doExport(str_replace('\\', $cookie, substr($value, $suffix)), true);
+                $suffix = str_replace('\\'.$cookie, "'.\\DIRECTORY_SEPARATOR.'", $suffix);
+            } else {
+                $suffix = isset($value[$suffix]) ? '.'.$this->doExport(substr($value, $suffix), true) : '';
+            }
+
             $dirname = $this->asFiles ? '$this->containerDir' : '__DIR__';
             $offset = 2 + $this->targetDirMaxMatches - \count($matches);
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -233,7 +233,7 @@ public function testDumpAsFiles()
         $dumper = new PhpDumper($container);
         $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'hot_path_tag' => 'hot']), true);
         if ('\\' === \DIRECTORY_SEPARATOR) {
-            $dump = str_replace('\\\\Fixtures\\\\includes\\\\foo.php', '/Fixtures/includes/foo.php', $dump);
+            $dump = str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dump);
         }
         $this->assertStringMatchesFormatFile(self::$fixturesPath.'/php/services9_as_files.txt', $dump);
     }
@@ -260,7 +260,7 @@ public function testDumpAsFilesWithFactoriesInlined()
         $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'hot_path_tag' => 'hot', 'build_time' => 1563381341]), true);
 
         if ('\\' === \DIRECTORY_SEPARATOR) {
-            $dump = str_replace('\\\\Fixtures\\\\includes\\\\', '/Fixtures/includes/', $dump);
+            $dump = str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dump);
         }
         $this->assertStringMatchesFormatFile(self::$fixturesPath.'/php/services9_inlined_factories.txt', $dump);
     }
@@ -286,7 +286,7 @@ public function testDumpAsFilesWithLazyFactoriesInlined()
         $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'hot_path_tag' => 'hot', 'build_time' => 1563381341]), true);
 
         if ('\\' === \DIRECTORY_SEPARATOR) {
-            $dump = str_replace('\\\\Fixtures\\\\includes\\\\', '/Fixtures/includes/', $dump);
+            $dump = str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dump);
         }
         $this->assertStringMatchesFormatFile(self::$fixturesPath.'/php/services9_lazy_inlined_factories.txt', $dump);
     }
@@ -304,7 +304,7 @@ public function testNonSharedLazyDumpAsFiles()
         $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__]), true);
 
         if ('\\' === \DIRECTORY_SEPARATOR) {
-            $dump = str_replace('\\\\Fixtures\\\\includes\\\\foo_lazy.php', '/Fixtures/includes/foo_lazy.php', $dump);
+            $dump = str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dump);
         }
         $this->assertStringMatchesFormatFile(self::$fixturesPath.'/php/services_non_shared_lazy_as_files.txt', $dump);
     }
@@ -980,7 +980,7 @@ public function testArrayParameters()
 
         $dumper = new PhpDumper($container);
 
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_array_params.php', str_replace('\\\\Dumper', '/Dumper', $dumper->dump(['file' => self::$fixturesPath.'/php/services_array_params.php'])));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_array_params.php', str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dumper->dump(['file' => self::$fixturesPath.'/php/services_array_params.php'])));
     }
 
     public function testExpressionReferencingPrivateService()
@@ -1143,7 +1143,7 @@ public function testHotPathOptimizations()
 
         $dump = $dumper->dump(['hot_path_tag' => 'container.hot_path', 'inline_class_loader_parameter' => 'inline_requires', 'file' => self::$fixturesPath.'/php/services_inline_requires.php']);
         if ('\\' === \DIRECTORY_SEPARATOR) {
-            $dump = str_replace("'\\\\includes\\\\HotPath\\\\", "'/includes/HotPath/", $dump);
+            $dump = str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dump);
         }
 
         $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_inline_requires.php', $dump);

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ public function testDumpAsFiles()`
`233`	`233`	`$dumper = new PhpDumper($container);`
`234`	`234`	`$dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'hot_path_tag' => 'hot']), true);`
`235`	`235`	`if ('\\' === \DIRECTORY_SEPARATOR) {`
`236`		`- $dump = str_replace('\\\\Fixtures\\\\includes\\\\foo.php', '/Fixtures/includes/foo.php', $dump);`
	`236`	`+ $dump = str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dump);`
`237`	`237`	`}`
`238`	`238`	`$this->assertStringMatchesFormatFile(self::$fixturesPath.'/php/services9_as_files.txt', $dump);`
`239`	`239`	`}`
`@@ -260,7 +260,7 @@ public function testDumpAsFilesWithFactoriesInlined()`
`260`	`260`	`$dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'hot_path_tag' => 'hot', 'build_time' => 1563381341]), true);`
`261`	`261`
`262`	`262`	`if ('\\' === \DIRECTORY_SEPARATOR) {`
`263`		`- $dump = str_replace('\\\\Fixtures\\\\includes\\\\', '/Fixtures/includes/', $dump);`
	`263`	`+ $dump = str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dump);`
`264`	`264`	`}`
`265`	`265`	`$this->assertStringMatchesFormatFile(self::$fixturesPath.'/php/services9_inlined_factories.txt', $dump);`
`266`	`266`	`}`
`@@ -286,7 +286,7 @@ public function testDumpAsFilesWithLazyFactoriesInlined()`
`286`	`286`	`$dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'hot_path_tag' => 'hot', 'build_time' => 1563381341]), true);`
`287`	`287`
`288`	`288`	`if ('\\' === \DIRECTORY_SEPARATOR) {`
`289`		`- $dump = str_replace('\\\\Fixtures\\\\includes\\\\', '/Fixtures/includes/', $dump);`
	`289`	`+ $dump = str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dump);`
`290`	`290`	`}`
`291`	`291`	`$this->assertStringMatchesFormatFile(self::$fixturesPath.'/php/services9_lazy_inlined_factories.txt', $dump);`
`292`	`292`	`}`
`@@ -304,7 +304,7 @@ public function testNonSharedLazyDumpAsFiles()`
`304`	`304`	`$dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__]), true);`
`305`	`305`
`306`	`306`	`if ('\\' === \DIRECTORY_SEPARATOR) {`
`307`		`- $dump = str_replace('\\\\Fixtures\\\\includes\\\\foo_lazy.php', '/Fixtures/includes/foo_lazy.php', $dump);`
	`307`	`+ $dump = str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dump);`
`308`	`308`	`}`
`309`	`309`	`$this->assertStringMatchesFormatFile(self::$fixturesPath.'/php/services_non_shared_lazy_as_files.txt', $dump);`
`310`	`310`	`}`
`@@ -980,7 +980,7 @@ public function testArrayParameters()`
`980`	`980`
`981`	`981`	`$dumper = new PhpDumper($container);`
`982`	`982`
`983`		`- $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_array_params.php', str_replace('\\\\Dumper', '/Dumper', $dumper->dump(['file' => self::$fixturesPath.'/php/services_array_params.php'])));`
	`983`	`+ $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_array_params.php', str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dumper->dump(['file' => self::$fixturesPath.'/php/services_array_params.php'])));`
`984`	`984`	`}`
`985`	`985`
`986`	`986`	`public function testExpressionReferencingPrivateService()`
`@@ -1143,7 +1143,7 @@ public function testHotPathOptimizations()`
`1143`	`1143`
`1144`	`1144`	`$dump = $dumper->dump(['hot_path_tag' => 'container.hot_path', 'inline_class_loader_parameter' => 'inline_requires', 'file' => self::$fixturesPath.'/php/services_inline_requires.php']);`
`1145`	`1145`	`if ('\\' === \DIRECTORY_SEPARATOR) {`
`1146`		`- $dump = str_replace("'\\\\includes\\\\HotPath\\\\", "'/includes/HotPath/", $dump);`
	`1146`	`+ $dump = str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dump);`
`1147`	`1147`	`}`
`1148`	`1148`
`1149`	`1149`	`$this->assertStringEqualsFile(self::$fixturesPath.'/php/services_inline_requires.php', $dump);`