Merge branch '3.2'

* 3.2: Permit empty suffix on Windows fixed CS [FrameworkBundle] Remove unused import [Console][Table] fixed render when using multiple rowspans. add docblocks for Twig url and path function to improve ide completion check for circular refs caused by method calls [Serializer] fix upper camel case conversion (see symfony#21399) [DI] Auto register extension configuration classes as a resource [Console] Updated phpdoc on return types

Author: fabpot

src/Symfony/Bridge/Twig/Extension/RoutingExtension.php

@@ -40,11 +40,25 @@ public function getFunctions()
  );
  }
 
+ /**
+ * @param string $name
+ * @param array $parameters
+ * @param bool $relative
+ *
+ * @return string
+ */
  public function getPath($name, $parameters = array(), $relative = false)
  {
  return $this->generator->generate($name, $parameters, $relative ? UrlGeneratorInterface::RELATIVE_PATH : UrlGeneratorInterface::ABSOLUTE_PATH);
  }
 
+ /**
+ * @param string $name
+ * @param array $parameters
+ * @param bool $schemeRelative
+ *
+ * @return string
+ */
  public function getUrl($name, $parameters = array(), $schemeRelative = false)
  {
  return $this->generator->generate($name, $parameters, $schemeRelative ? UrlGeneratorInterface::NETWORK_PATH : UrlGeneratorInterface::ABSOLUTE_URL);

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -35,7 +35,6 @@
 use Symfony\Component\Serializer\Normalizer\JsonSerializableNormalizer;
 use Symfony\Component\Workflow;
 use Symfony\Component\Workflow\SupportStrategy\ClassInstanceSupportStrategy;
-use Symfony\Component\Yaml\Yaml;
 use Symfony\Component\Console\Application;
 
 /**

src/Symfony/Component/Console/Helper/QuestionHelper.php

@@ -39,7 +39,7 @@ class QuestionHelper extends Helper
  * @param OutputInterface $output An OutputInterface instance
  * @param Question $question The question to ask
  *
- * @return string The user answer
+ * @return mixed The user answer
  *
  * @throws RuntimeException If there is no data to read in the input stream
  */
@@ -397,7 +397,7 @@ private function getHiddenResponse(OutputInterface $output, $inputStream)
  * @param OutputInterface $output An Output instance
  * @param Question $question A Question instance
  *
- * @return string The validated response
+ * @return mixed The validated response
  *
  * @throws \Exception In case the max number of attempts has been reached and no valid response has been given
  */

src/Symfony/Component/Console/Helper/Table.php

@@ -479,6 +479,9 @@ private function fillNextRows($rows, $line)
  foreach ($unmergedRows as $unmergedRowKey => $unmergedRow) {
  $value = isset($lines[$unmergedRowKey - $line]) ? $lines[$unmergedRowKey - $line] : '';
  $unmergedRows[$unmergedRowKey][$column] = new TableCell($value, array('colspan' => $cell->getColspan()));
+ if ($nbLines === $unmergedRowKey - $line) {
+ break;
+ }
  }
  }
  }

src/Symfony/Component/Console/Tests/Helper/TableTest.php

@@ -298,29 +298,29 @@ public function testRenderProvider()
  array(
  array(
  new TableCell('9971-5-0210-0', array('rowspan' => 3)),
- 'Divine Comedy',
+ new TableCell('Divine Comedy', array('rowspan' => 2)),
  'Dante Alighieri',
  ),
- array('A Tale of Two Cities', 'Charles Dickens'),
+ array(),
  array("The Lord of \nthe Rings", "J. R. \nR. Tolkien"),
  new TableSeparator(),
  array('80-902734-1-6', new TableCell("And Then \nThere \nWere None", array('rowspan' => 3)), 'Agatha Christie'),
  array('80-902734-1-7', 'Test'),
  ),
  'default',
 <<<'TABLE'
-+---------------+----------------------+-----------------+
-| ISBN | Title  | Author |
-+---------------+----------------------+-----------------+
-| 9971-5-0210-0 | Divine Comedy  | Dante Alighieri |
-| | A Tale of Two Cities | Charles Dickens |
-| | The Lord of  | J. R. |
-| | the Rings  | R. Tolkien |
-+---------------+----------------------+-----------------+
-| 80-902734-1-6 | And Then  | Agatha Christie |
-| 80-902734-1-7 | There  | Test |
-| | Were None  | |
-+---------------+----------------------+-----------------+
++---------------+---------------+-----------------+
+| ISBN | Title | Author |
++---------------+---------------+-----------------+
+| 9971-5-0210-0 | Divine Comedy | Dante Alighieri |
+| |  |  |
+| | The Lord of | J. R. |
+| | the Rings | R. Tolkien |
++---------------+---------------+-----------------+
+| 80-902734-1-6 | And Then | Agatha Christie |
+| 80-902734-1-7 | There | Test |
+| | Were None | |
++---------------+---------------+-----------------+
 
 TABLE
  ),

src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php

@@ -255,7 +255,7 @@ function () {},
 
  // assertEquals() does not like NAN values.
  $this->assertEquals($array[$i][0], 'float');
- $this->assertTrue(is_nan($array[$i++][1]));
+ $this->assertNan($array[$i++][1]);
  }
 
  public function testRecursionInArguments()

src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\ConfigurationExtensionInterface;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 
 /**
@@ -47,6 +48,9 @@ public function process(ContainerBuilder $container)
  $tmpContainer = new ContainerBuilder($container->getParameterBag());
  $tmpContainer->setResourceTracking($container->isTrackingResources());
  $tmpContainer->addObjectResource($extension);
+ if ($extension instanceof ConfigurationExtensionInterface && null !== $configuration = $extension->getConfiguration($config, $tmpContainer)) {
+ $tmpContainer->addObjectResource($configuration);
+ }
 
  foreach ($exprLangProviders as $provider) {
  $tmpContainer->addExpressionLanguageProvider($provider);

src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php

@@ -74,6 +74,7 @@ public function __construct()
  new RemoveUnusedDefinitionsPass(),
  )),
  new CheckExceptionOnInvalidReferenceBehaviorPass(),
+ new CheckCircularReferencesPass(),
  ));
  }
 

src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php

@@ -113,4 +113,30 @@ public function testProcessInlinesWhenThereAreMultipleReferencesButFromTheSameDe
  $this->assertFalse($container->hasDefinition('b'));
  $this->assertFalse($container->hasDefinition('c'), 'Service C was not inlined.');
  }
+
+ /**
+ * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
+ */
+ public function testCircularReferencesCausedByMethodCallsAreDetectedDuringCompilation()
+ {
+ $container = new ContainerBuilder();
+ $container->setResourceTracking(false);
+
+ $container
+ ->register('foobar', '\stdClass')
+ ->addArgument(new Reference('foo'))
+ ;
+
+ $container
+ ->register('foo', '\stdClass')
+ ->addArgument(new Reference('bar'))
+ ;
+
+ $container
+ ->register('foo', '\stdClass')
+ ->addMethodCall('addFoobar', array(new Reference('foobar')))
+ ;
+
+ $container->compile();
+ }
 }

src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php

@@ -11,6 +11,9 @@
 
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\DependencyInjection\Compiler\MergeExtensionConfigurationPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
@@ -48,4 +51,32 @@ public function testExpressionLanguageProviderForwarding()
 
  $this->assertEquals(array($provider), $tmpProviders);
  }
+
+ public function testExtensionConfigurationIsTrackedByDefault()
+ {
+ $extension = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\Extension\\Extension')->getMock();
+ $extension->expects($this->once())
+ ->method('getConfiguration')
+ ->will($this->returnValue(new FooConfiguration()));
+ $extension->expects($this->any())
+ ->method('getAlias')
+ ->will($this->returnValue('foo'));
+
+ $container = new ContainerBuilder(new ParameterBag());
+ $container->registerExtension($extension);
+ $container->prependExtensionConfig('foo', array('bar' => true));
+
+ $pass = new MergeExtensionConfigurationPass();
+ $pass->process($container);
+
+ $this->assertContains(new FileResource(__FILE__), $container->getResources(), '', false, false);
+ }
+}
+
+class FooConfiguration implements ConfigurationInterface
+{
+ public function getConfigTreeBuilder()
+ {
+ return new TreeBuilder();
+ }
 }