Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit a2f20157428c · 2017-08-22T18:06:26.000+02:00
* 3.3:
  [Dotenv] Get env using $_SERVER to work with fastcgi_param and workaround thread safety issues
  [Dotenv][WebServerBundle] Override previously loaded variables
  [DI] Use GlobResource for non-tracked directories
  [WebProfilerBundle] Re add missing link to the controller
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -1441,7 +1441,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
                 $fileRecorder('yml', $file);
             }
 
-            if ($container->fileExists($dir = $dirname.'/Resources/config/serialization')) {
+            if ($container->fileExists($dir = $dirname.'/Resources/config/serialization', '/^$/')) {
                 $this->registerMappingFilesFromDir($dir, $fileRecorder);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1441,7 +1441,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder`
`1441`	`1441`	`$fileRecorder('yml', $file);`
`1442`	`1442`	`}`
`1443`	`1443`
`1444`		`- if ($container->fileExists($dir = $dirname.'/Resources/config/serialization')) {`
	`1444`	`+ if ($container->fileExists($dir = $dirname.'/Resources/config/serialization', '/^$/')) {`
`1445`	`1445`	`$this->registerMappingFilesFromDir($dir, $fileRecorder);`
`1446`	`1446`	`}`
`1447`	`1447`	`}`