symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎
Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php‎
Lines changed: 11 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Config/ResourceCheckerConfigCache.php‎
Lines changed: 5 additions & 1 deletion b/‎src/Symfony/Component/Config/ResourceCheckerConfigCache.php‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Config/Tests/ResourceCheckerConfigCacheTest.php‎
Lines changed: 7 additions & 1 deletion b/‎src/Symfony/Component/Config/Tests/ResourceCheckerConfigCacheTest.php‎
Lines changed: 7 additions & 1 deletion
@@ -361,6 +361,11 @@ public function load(array $configs, ContainerBuilder $container)
         $container->registerForAutoconfiguration(ObjectInitializerInterface::class)
             ->addTag('validator.initializer');
 
+        if (!$container->getParameter('kernel.debug')) {
+            // remove tagged iterator argument for resource checkers
+            $container->getDefinition('config_cache_factory')->setArguments(array());
+        }
+
         if (\PHP_VERSION_ID < 70000) {
             $this->addClassesToCompile(array(
                 'Symfony\\Component\\Config\\ConfigCache',
 
@@ -988,6 +988,17 @@ public function testCachePoolServices()
         $this->assertCachePoolServiceDefinitionIsCreated($container, 'cache.def', 'cache.app', 11);
     }
 
+    public function testRemovesResourceCheckerConfigCacheFactoryArgumentOnlyIfNoDebug()
+    {
+        $container = $this->createContainer(array('kernel.debug' => true));
+        (new FrameworkExtension())->load(array(), $container);
+        $this->assertCount(1, $container->getDefinition('config_cache_factory')->getArguments());
+
+        $container = $this->createContainer(array('kernel.debug' => false));
+        (new FrameworkExtension())->load(array(), $container);
+        $this->assertEmpty($container->getDefinition('config_cache_factory')->getArguments());
+    }
+
     protected function createContainer(array $data = array())
     {
         return new ContainerBuilder(new ParameterBag(array_merge(array(
 
@@ -68,7 +68,11 @@ public function isFresh()
             return false;
         }
 
-        if (!$this->resourceCheckers) {
+        if ($this->resourceCheckers instanceof \Traversable && !$this->resourceCheckers instanceof \Countable) {
+            $this->resourceCheckers = iterator_to_array($this->resourceCheckers);
+        }
+
+        if (!count($this->resourceCheckers)) {
             return true; // shortcut - if we don't have any checkers we don't need to bother with the meta file at all
         }
 
 
@@ -57,14 +57,20 @@ public function testCacheIsNotFreshIfEmpty()
         $this->assertFalse($cache->isFresh());
     }
 
-    public function testCacheIsFreshIfNocheckerProvided()
+    public function testCacheIsFreshIfNoCheckerProvided()
     {
         /* For example in prod mode, you may choose not to run any checkers
            at all. In that case, the cache should always be considered fresh. */
         $cache = new ResourceCheckerConfigCache($this->cacheFile);
         $this->assertTrue($cache->isFresh());
     }
 
+    public function testCacheIsFreshIfEmptyCheckerIteratorProvided()
+    {
+        $cache = new ResourceCheckerConfigCache($this->cacheFile, new \ArrayIterator(array()));
+        $this->assertTrue($cache->isFresh());
+    }
+
     public function testResourcesWithoutcheckersAreIgnoredAndConsideredFresh()
     {
         /* As in the previous test, but this time we have a resource. */
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,11 @@ public function isFresh()`
`68`	`68`	`return false;`
`69`	`69`	`}`
`70`	`70`
`71`		`- if (!$this->resourceCheckers) {`
	`71`	`+ if ($this->resourceCheckers instanceof \Traversable && !$this->resourceCheckers instanceof \Countable) {`
	`72`	`+ $this->resourceCheckers = iterator_to_array($this->resourceCheckers);`
	`73`	`+ }`
	`74`	`+`
	`75`	`+ if (!count($this->resourceCheckers)) {`
`72`	`76`	`return true; // shortcut - if we don't have any checkers we don't need to bother with the meta file at all`
`73`	`77`	`}`
`74`	`78`
Original file line number	Diff line number	Diff line change
`@@ -57,14 +57,20 @@ public function testCacheIsNotFreshIfEmpty()`
`57`	`57`	`$this->assertFalse($cache->isFresh());`
`58`	`58`	`}`
`59`	`59`
`60`		`- public function testCacheIsFreshIfNocheckerProvided()`
	`60`	`+ public function testCacheIsFreshIfNoCheckerProvided()`
`61`	`61`	`{`
`62`	`62`	`/* For example in prod mode, you may choose not to run any checkers`
`63`	`63`	`at all. In that case, the cache should always be considered fresh. */`
`64`	`64`	`$cache = new ResourceCheckerConfigCache($this->cacheFile);`
`65`	`65`	`$this->assertTrue($cache->isFresh());`
`66`	`66`	`}`
`67`	`67`
	`68`	`+ public function testCacheIsFreshIfEmptyCheckerIteratorProvided()`
	`69`	`+ {`
	`70`	`+ $cache = new ResourceCheckerConfigCache($this->cacheFile, new \ArrayIterator(array()));`
	`71`	`+ $this->assertTrue($cache->isFresh());`
	`72`	`+ }`
	`73`	`+`
`68`	`74`	`public function testResourcesWithoutcheckersAreIgnoredAndConsideredFresh()`
`69`	`75`	`{`
`70`	`76`	`/* As in the previous test, but this time we have a resource. */`