symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/ContainerBuilder.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+5-1Lines changed: 5 additions & 1 deletion b/‎src/Symfony/Component/DependencyInjection/ContainerBuilder.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+5-1Lines changed: 5 additions & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectExtension.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectExtension.php
+8-1Lines changed: 8 additions & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectExtension.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectExtension.php
+8-1Lines changed: 8 additions & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/null_config.yml
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/null_config.yml
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
+11Lines changed: 11 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
+11Lines changed: 11 additions & 0 deletions
@@ -271,12 +271,16 @@ public function addClassResource(\ReflectionClass $class)
      * @throws BadMethodCallException When this ContainerBuilder is frozen
      * @throws \LogicException        if the container is frozen
      */
-    public function loadFromExtension($extension, array $values = array())
+    public function loadFromExtension($extension, array $values = null)
     {
         if ($this->isFrozen()) {
             throw new BadMethodCallException('Cannot load from an extension on a frozen container.');
         }
 
+        if (func_num_args() < 2) {
+            $values = array();
+        }
+
         $namespace = $this->getExtension($extension)->getAlias();
 
         $this->extensionConfigs[$namespace][] = $values;
 
@@ -425,7 +425,7 @@ private function loadFromExtensions(array $content)
                 continue;
             }
 
-            if (!is_array($values)) {
+            if (!is_array($values) && null !== $values) {
                 $values = array();
             }
 
 
@@ -8,7 +8,14 @@ class ProjectExtension implements ExtensionInterface
 {
     public function load(array $configs, ContainerBuilder $configuration)
     {
-        $config = call_user_func_array('array_merge', $configs);
+        $configuration->setParameter('project.configs', $configs);
+        $configs = array_filter($configs);
+
+        if ($configs) {
+            $config = call_user_func_array('array_merge', $configs);
+        } else {
+            $config = array();
+        }
 
         $configuration->setDefinition('project.service.bar', new Definition('FooClass'));
         $configuration->setParameter('project.parameter.bar', isset($config['foo']) ? $config['foo'] : 'foobar');
 
@@ -0,0 +1 @@
+project: ~
@@ -207,6 +207,17 @@ public function testExtensions()
         }
     }
 
+    public function testExtensionWithNullConfig()
+    {
+        $container = new ContainerBuilder();
+        $container->registerExtension(new \ProjectExtension());
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('null_config.yml');
+        $container->compile();
+
+        $this->assertSame(array(null), $container->getParameter('project.configs'));
+    }
+
     public function testSupports()
     {
         $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator());
Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,7 @@ private function loadFromExtensions(array $content)`
`425`	`425`	`continue;`
`426`	`426`	`}`
`427`	`427`
`428`		`- if (!is_array($values)) {`
	`428`	`+ if (!is_array($values) && null !== $values) {`
`429`	`429`	`$values = array();`
`430`	`430`	`}`
`431`	`431`
Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,17 @@ public function testExtensions()`
`207`	`207`	`}`
`208`	`208`	`}`
`209`	`209`
	`210`	`+ public function testExtensionWithNullConfig()`
	`211`	`+ {`
	`212`	`+ $container = new ContainerBuilder();`
	`213`	`+ $container->registerExtension(new \ProjectExtension());`
	`214`	`+ $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));`
	`215`	`+ $loader->load('null_config.yml');`
	`216`	`+ $container->compile();`
	`217`	`+`
	`218`	`+ $this->assertSame(array(null), $container->getParameter('project.configs'));`
	`219`	`+ }`
	`220`	`+`
`210`	`221`	`public function testSupports()`
`211`	`222`	`{`
`212`	`223`	`$loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator());`