Merge branch '3.3' into 3.4

* 3.3: (64 commits)
  Show exception is checked twice in ExceptionController of twig
  allow SSI fragments configuration in XML files
  Display a better error message when the toolbar cannot be displayed
  render hidden _method field in form_rest()
  Add Doctrine Cache to dev dependencies to fix failing unit tests.
  return fallback locales whenever possible
  Fix Predis client cluster with pipeline
  [Dotenv] Test load() with multiple paths
  [Console] Fix catching exception type in QuestionHelper
  Improved the exception page when there is no message
  [WebProfilerBundle] Eliminate line wrap on count columnt (routing)
  [Validator] replace hardcoded service id
  [Routing] Fix XmlFileLoader exception message
  [DI] Dedup tags when using instanceof/autoconfigure
  [Translation] Fix FileLoader::loadResource() php doc
  Sessions: configurable "use_strict_mode" option for NativeSessionStorage
  [FrameworkBundle] [Command] Clean bundle directory, fixes #23177
  fixed CS
  [WebProfilerBundle] Fix the icon for the Cache panel
  [WebServerBundle] Fix router script path and check existence
  ...

Author: xabbuh

Resource/ComposerResource.php

@@ -18,16 +18,13 @@
  */
 class ComposerResource implements SelfCheckingResourceInterface, \Serializable
 {
-    private $versions;
     private $vendors;
 
-    private static $runtimeVersion;
     private static $runtimeVendors;
 
     public function __construct()
     {
         self::refresh();
-        $this->versions = self::$runtimeVersion;
         $this->vendors = self::$runtimeVendors;
     }
 
@@ -51,36 +48,23 @@ public function isFresh($timestamp)
     {
         self::refresh();
 
-        if (self::$runtimeVersion !== $this->versions) {
-            return false;
-        }
-
         return self::$runtimeVendors === $this->vendors;
     }
 
     public function serialize()
     {
-        return serialize(array($this->versions, $this->vendors));
+        return serialize($this->vendors);
     }
 
     public function unserialize($serialized)
     {
-        list($this->versions, $this->vendors) = unserialize($serialized);
+        $this->vendors = unserialize($serialized);
     }
 
     private static function refresh()
     {
-        if (null !== self::$runtimeVersion) {
-            return;
-        }
-
-        self::$runtimeVersion = array();
         self::$runtimeVendors = array();
 
-        foreach (get_loaded_extensions() as $ext) {
-            self::$runtimeVersion[$ext] = phpversion($ext);
-        }
-
         foreach (get_declared_classes() as $class) {
             if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
                 $r = new \ReflectionClass($class);

Resource/GlobResource.php

@@ -134,7 +134,7 @@ function (\SplFileInfo $file) { return '.' !== $file->getBasename()[0]; }
 
         $prefixLen = strlen($this->prefix);
         foreach ($finder->followLinks()->sortByName()->in($this->prefix) as $path => $info) {
-            if (preg_match($regex, substr($path, $prefixLen)) && $info->isFile()) {
+            if (preg_match($regex, substr('\\' === \DIRECTORY_SEPARATOR ? str_replace('\\', '/', $path) : $path, $prefixLen)) && $info->isFile()) {
                 yield $path => $info;
             }
         }

Tests/Resource/GlobResourceTest.php

@@ -36,6 +36,15 @@ public function testIterator()
         $this->assertEquals(array($file => new \SplFileInfo($file)), $paths);
         $this->assertInstanceOf('SplFileInfo', current($paths));
         $this->assertSame($dir, $resource->getPrefix());
+
+        $resource = new GlobResource($dir, '/**/Resource', true);
+
+        $paths = iterator_to_array($resource);
+
+        $file = $dir.DIRECTORY_SEPARATOR.'Resource'.DIRECTORY_SEPARATOR.'ConditionalClass.php';
+        $this->assertEquals(array($file => $file), $paths);
+        $this->assertInstanceOf('SplFileInfo', current($paths));
+        $this->assertSame($dir, $resource->getPrefix());
     }
 
     public function testIsFreshNonRecursiveDetectsNewFile()

composer.json

@@ -20,10 +20,12 @@
         "symfony/filesystem": "~2.8|~3.0|~4.0"
     },
     "require-dev": {
+        "symfony/finder": "~3.3|~4.0",
         "symfony/yaml": "~3.0|~4.0",
         "symfony/dependency-injection": "~3.3|~4.0"
     },
     "conflict": {
+        "symfony/finder": "<3.3",
         "symfony/dependency-injection": "<3.3"
     },
     "suggest": {