Merge branch '1.8' into 2.0

GuilhemN · GuilhemN · commit e0bd6c81a759 · 2016-06-07T23:03:13.000+02:00
diff --git a/DependencyInjection/FOSRestExtension.php b/DependencyInjection/FOSRestExtension.php
@@ -21,6 +21,14 @@
 
 class FOSRestExtension extends Extension
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfiguration(array $config, ContainerBuilder $container)
+    {
+        return new Configuration($container->getParameter('kernel.debug'));
+    }
+
     /**
      * Loads the services based on your application configuration.
      *
diff --git a/Tests/DependencyInjection/FOSRestExtensionTest.php b/Tests/DependencyInjection/FOSRestExtensionTest.php
@@ -603,6 +603,13 @@ public static function getShowExceptionData()
         );
     }
 
+    public function testGetConfiguration()
+    {
+        $configuration = $this->extension->getConfiguration(array(), $this->container);
+
+        $this->assertInstanceOf('FOS\RestBundle\DependencyInjection\Configuration', $configuration);
+    }
+
     /**
      * Assert that loader definition described properly.
      *

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,14 @@`
`21`	`21`
`22`	`22`	`class FOSRestExtension extends Extension`
`23`	`23`	`{`
	`24`	`+ /**`
	`25`	`+ * {@inheritdoc}`
	`26`	`+ */`
	`27`	`+ public function getConfiguration(array $config, ContainerBuilder $container)`
	`28`	`+ {`
	`29`	`+ return new Configuration($container->getParameter('kernel.debug'));`
	`30`	`+ }`
	`31`	`+`
`24`	`32`	`/**`
`25`	`33`	`* Loads the services based on your application configuration.`
`26`	`34`	`*`
Original file line number	Diff line number	Diff line change
`@@ -603,6 +603,13 @@ public static function getShowExceptionData()`
`603`	`603`	`);`
`604`	`604`	`}`
`605`	`605`
	`606`	`+ public function testGetConfiguration()`
	`607`	`+ {`
	`608`	`+ $configuration = $this->extension->getConfiguration(array(), $this->container);`
	`609`	`+`
	`610`	`+ $this->assertInstanceOf('FOS\RestBundle\DependencyInjection\Configuration', $configuration);`
	`611`	`+ }`
	`612`	`+`
`606`	`613`	`/**`
`607`	`614`	`* Assert that loader definition described properly.`
`608`	`615`	`*`