Merge branch '2.7' into 2.8

* 2.7: (95 commits)
  [DependencyInjection] provide better error message when using deprecated configuration options
  [console][TableCell] get cell width without decoration.
  Improve the config validation in TwigBundle
  [VarDumper] Changed tooltip to expand-all keybinding in OS X
  [Bridge\PhpUnit] Fix composer installed phpunit detection
  [VarDumper] Fix generic casters calling order
  [2.7][SecurityBundle] Remove SecurityContext from Compile
  [WebProfilerBundle][logger] added missing deprecation message.
  Fix profiler CSS
  [Security][Acl] enforce string identifiers
  [FrameworkBundle] make `templating.helper.router` service available again for BC reasons
  [BrowserKit] Fix bug when uri starts with http.
  bumped Symfony version to 2.7.1
  updated VERSION for 2.7.0
  updated CHANGELOG for 2.7.0
  bumped Symfony version to 2.6.10
  updated VERSION for 2.6.9
  updated CHANGELOG for 2.6.9
  fixed tests
  bumped Symfony version to 2.3.31
  ...

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Translation/Loader/JsonFileLoader.php

Author: fabpot

ChoiceList/Factory/DefaultChoiceListFactory.php

@@ -20,6 +20,7 @@
 use Symfony\Component\Form\ChoiceList\View\ChoiceListView;
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
 use Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface as LegacyChoiceListInterface;
+use Symfony\Component\Form\Extension\Core\View\ChoiceView as LegacyChoiceView;
 
 /**
  * Default implementation of {@link ChoiceListFactoryInterface}.
@@ -140,9 +141,16 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, $value = nul
     public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, $index = null, $groupBy = null, $attr = null)
     {
         // Backwards compatibility
-        if ($list instanceof LegacyChoiceListInterface && null === $preferredChoices
+        if ($list instanceof LegacyChoiceListInterface && empty($preferredChoices)
             && null === $label && null === $index && null === $groupBy && null === $attr) {
-            return new ChoiceListView($list->getRemainingViews(), $list->getPreferredViews());
+            $mapToNonLegacyChoiceView = function (LegacyChoiceView $choiceView) {
+                return new ChoiceView($choiceView->label, $choiceView->value, $choiceView->data);
+            };
+
+            return new ChoiceListView(
+                array_map($mapToNonLegacyChoiceView, $list->getRemainingViews()),
+                array_map($mapToNonLegacyChoiceView, $list->getPreferredViews())
+            );
         }
 
         $preferredViews = array();

Extension/Core/DataTransformer/DateTimeToStringTransformer.php

@@ -215,7 +215,7 @@ public function reverseTransform($value)
             }
 
             if ($this->inputTimezone !== $this->outputTimezone) {
-                $dateTime->setTimeZone(new \DateTimeZone($this->inputTimezone));
+                $dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
             }
         } catch (TransformationFailedException $e) {
             throw $e;

FormBuilder.php

@@ -62,7 +62,7 @@ public function add($child, $type = null, array $options = array())
             throw new BadMethodCallException('FormBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
         }
 
-        if ($child instanceof self) {
+        if ($child instanceof FormBuilderInterface) {
             $this->children[$child->getName()] = $child;
 
             // In case an unresolved child with the same name exists
@@ -72,7 +72,7 @@ public function add($child, $type = null, array $options = array())
         }
 
         if (!is_string($child) && !is_int($child)) {
-            throw new UnexpectedTypeException($child, 'string, integer or Symfony\Component\Form\FormBuilder');
+            throw new UnexpectedTypeException($child, 'string, integer or Symfony\Component\Form\FormBuilderInterface');
         }
 
         if (null !== $type && !is_string($type) && !$type instanceof FormTypeInterface) {

Tests/AbstractBootstrap3LayoutTest.php

@@ -118,12 +118,12 @@ public function testErrors()
             [@class="list-unstyled"]
             [
                 ./li
-                    [.="[trans]Error 1[/trans]"]
+                    [.=" [trans]Error 1[/trans]"]
                     [
                         ./span[@class="glyphicon glyphicon-exclamation-sign"]
                     ]
                 /following-sibling::li
-                    [.="[trans]Error 2[/trans]"]
+                    [.=" [trans]Error 2[/trans]"]
                     [
                         ./span[@class="glyphicon glyphicon-exclamation-sign"]
                     ]

Tests/AbstractLayoutTest.php

@@ -61,7 +61,7 @@ protected function assertMatchesXpath($html, $expression, $count = 1)
         try {
             // Wrap in <root> node so we can load HTML with multiple tags at
             // the top level
-            $dom->loadXml('<root>'.$html.'</root>');
+            $dom->loadXML('<root>'.$html.'</root>');
         } catch (\Exception $e) {
             $this->fail(sprintf(
                 "Failed loading HTML:\n\n%s\n\nError: %s",

Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php

@@ -18,6 +18,7 @@
 use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView;
 use Symfony\Component\Form\ChoiceList\View\ChoiceListView;
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
+use Symfony\Component\Form\Extension\Core\View\ChoiceView as LegacyChoiceView;
 
 class DefaultChoiceListFactoryTest extends \PHPUnit_Framework_TestCase
 {
@@ -735,8 +736,9 @@ function ($object, $key, $value) {
      */
     public function testCreateViewForLegacyChoiceList()
     {
-        $preferred = array(new ChoiceView('Preferred', 'x', 'x'));
-        $other = array(new ChoiceView('Other', 'y', 'y'));
+        // legacy ChoiceList instances provide legacy ChoiceView objects
+        $preferred = array(new LegacyChoiceView('x', 'x', 'Preferred'));
+        $other = array(new LegacyChoiceView('y', 'y', 'Other'));
 
         $list = $this->getMock('Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface');
 
@@ -749,8 +751,8 @@ public function testCreateViewForLegacyChoiceList()
 
         $view = $this->factory->createView($list);
 
-        $this->assertSame($other, $view->choices);
-        $this->assertSame($preferred, $view->preferredChoices);
+        $this->assertEquals(array(new ChoiceView('Other', 'y', 'y')), $view->choices);
+        $this->assertEquals(array(new ChoiceView('Preferred', 'x', 'x')), $view->preferredChoices);
     }
 
     private function assertScalarListWithGeneratedValues(ChoiceListInterface $list)

Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php

@@ -140,7 +140,7 @@ public function testReverseTransformWithDifferentTimezones()
 
         $output = new \DateTime('2010-02-03 16:05:06 Asia/Hong_Kong');
         $input = $output->format('Y-m-d H:i:s');
-        $output->setTimeZone(new \DateTimeZone('America/New_York'));
+        $output->setTimezone(new \DateTimeZone('America/New_York'));
 
         $this->assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input));
     }

Tests/FormBuilderTest.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Form\Tests;
 
+use Symfony\Component\Form\ButtonBuilder;
 use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\SubmitButtonBuilder;
 
 class FormBuilderTest extends \PHPUnit_Framework_TestCase
 {
@@ -154,6 +156,12 @@ public function testCreateNoTypeNo()
         $this->builder->create('foo');
     }
 
+    public function testAddButton()
+    {
+        $this->builder->add(new ButtonBuilder('reset'));
+        $this->builder->add(new SubmitButtonBuilder('submit'));
+    }
+
     public function testGetUnknown()
     {
         $this->setExpectedException('Symfony\Component\Form\Exception\InvalidArgumentException', 'The child with the name "foo" does not exist.');