Merge branch '2.7' into 2.8

* 2.7:
  [Form] fixed BC-break on grouped choice lists
  [WebProfilerBundle] add import for Twig macro
  made Symfony compatible with both Twig 1.x and 2.x
  [Debug/VarDumper] minor cleanups
  [Form] only use PropertyPath if not already callable
  [Form] fix reworked choice list phpdoc
  [DoctrineBridge][Form] Add old tests to legacy group
  Fixed warning when command alias is longer than command name
  removed _self usage when not needed
  Implement the support of timezone objects in the stub IntlDateFormatter
  typofix - https://github.com/vlajos/misspell_fixer
  make doctrine mappings compiler pass exception message more understandable
  fix debug-ext 003.phpt
  [Yaml] Nested merge keys
  [FrameworkBundle] [Command] removed unused variable.
  [Debug] Enhance DebugClassLoader performance on MacOSX
  Add support for variadic arguments in the GetSetNormalizer
  [DoctrineBridge][Form] Fix IdReader when indexing by primary foreign key
  [DoctrineBridge][Form] Fix EntityChoiceList when indexing by primary foreign key

Author: fabpot

ChoiceList/Factory/DefaultChoiceListFactory.php

@@ -64,16 +64,18 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
         // Backwards compatibility
         if ($list instanceof LegacyChoiceListAdapter && empty($preferredChoices)
             && null === $label && null === $index && null === $groupBy && null === $attr) {
-            $mapToNonLegacyChoiceView = function (LegacyChoiceView $choiceView) {
-                return new ChoiceView($choiceView->data, $choiceView->value, $choiceView->label);
+            $mapToNonLegacyChoiceView = function (LegacyChoiceView &$choiceView) {
+                $choiceView = new ChoiceView($choiceView->data, $choiceView->value, $choiceView->label);
             };
 
             $adaptedList = $list->getAdaptedList();
 
-            return new ChoiceListView(
-                array_map($mapToNonLegacyChoiceView, $adaptedList->getRemainingViews()),
-                array_map($mapToNonLegacyChoiceView, $adaptedList->getPreferredViews())
-            );
+            $remainingViews = $adaptedList->getRemainingViews();
+            $preferredViews = $adaptedList->getPreferredViews();
+            array_walk_recursive($remainingViews, $mapToNonLegacyChoiceView);
+            array_walk_recursive($preferredViews, $mapToNonLegacyChoiceView);
+
+            return new ChoiceListView($remainingViews, $preferredViews);
         }
 
         $preferredViews = array();

ChoiceList/Factory/PropertyAccessDecorator.php

@@ -84,7 +84,7 @@ public function getDecoratedFactory()
      */
     public function createListFromChoices($choices, $value = null)
     {
-        if (is_string($value)) {
+        if (is_string($value) && !is_callable($value)) {
             $value = new PropertyPath($value);
         }
 
@@ -134,7 +134,7 @@ public function createListFromFlippedChoices($choices, $value = null)
      */
     public function createListFromLoader(ChoiceLoaderInterface $loader, $value = null)
     {
-        if (is_string($value)) {
+        if (is_string($value) && !is_callable($value)) {
             $value = new PropertyPath($value);
         }
 
@@ -151,20 +151,20 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, $value = nul
     /**
      * {@inheritdoc}
      *
-     * @param ChoiceListInterface                                  $list             The choice list
-     * @param null|array|callable|string|PropertyPath              $preferredChoices The preferred choices
-     * @param null|callable|string|PropertyPath                    $label            The callable or path generating the choice labels
-     * @param null|callable|string|PropertyPath                    $index            The callable or path generating the view indices
-     * @param null|array|\Traversable|callable|string|PropertyPath $groupBy          The callable or path generating the group names
-     * @param null|array|callable|string|PropertyPath              $attr             The callable or path generating the HTML attributes
+     * @param ChoiceListInterface                     $list             The choice list
+     * @param null|array|callable|string|PropertyPath $preferredChoices The preferred choices
+     * @param null|callable|string|PropertyPath       $label            The callable or path generating the choice labels
+     * @param null|callable|string|PropertyPath       $index            The callable or path generating the view indices
+     * @param null|callable|string|PropertyPath       $groupBy          The callable or path generating the group names
+     * @param null|array|callable|string|PropertyPath $attr             The callable or path generating the HTML attributes
      *
      * @return ChoiceListView The choice list view
      */
     public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, $index = null, $groupBy = null, $attr = null)
     {
         $accessor = $this->propertyAccessor;
 
-        if (is_string($label)) {
+        if (is_string($label) && !is_callable($label)) {
             $label = new PropertyPath($label);
         }
 
@@ -174,7 +174,7 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
             };
         }
 
-        if (is_string($preferredChoices)) {
+        if (is_string($preferredChoices) && !is_callable($preferredChoices)) {
             $preferredChoices = new PropertyPath($preferredChoices);
         }
 
@@ -189,7 +189,7 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
             };
         }
 
-        if (is_string($index)) {
+        if (is_string($index) && !is_callable($index)) {
             $index = new PropertyPath($index);
         }
 
@@ -199,7 +199,7 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
             };
         }
 
-        if (is_string($groupBy)) {
+        if (is_string($groupBy) && !is_callable($groupBy)) {
             $groupBy = new PropertyPath($groupBy);
         }
 
@@ -213,7 +213,7 @@ public function createView(ChoiceListInterface $list, $preferredChoices = null,
             };
         }
 
-        if (is_string($attr)) {
+        if (is_string($attr) && !is_callable($attr)) {
             $attr = new PropertyPath($attr);
         }
 

Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php

@@ -737,7 +737,7 @@ function ($object, $key, $value) {
     /**
      * @group legacy
      */
-    public function testCreateViewForLegacyChoiceList()
+    public function testCreateViewForFlatLegacyChoiceList()
     {
         // legacy ChoiceList instances provide legacy ChoiceView objects
         $preferred = array(new LegacyChoiceView('x', 'x', 'Preferred'));
@@ -758,6 +758,36 @@ public function testCreateViewForLegacyChoiceList()
         $this->assertEquals(array(new ChoiceView('x', 'x', 'Preferred')), $view->preferredChoices);
     }
 
+    /**
+     * @group legacy
+     */
+    public function testCreateViewForNestedLegacyChoiceList()
+    {
+        // legacy ChoiceList instances provide legacy ChoiceView objects
+        $preferred = array('Section 1' => array(new LegacyChoiceView('x', 'x', 'Preferred')));
+        $other = array(
+            'Section 2' => array(new LegacyChoiceView('y', 'y', 'Other')),
+            new LegacyChoiceView('z', 'z', 'Other one'),
+        );
+
+        $list = $this->getMock('Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceListInterface');
+
+        $list->expects($this->once())
+            ->method('getPreferredViews')
+            ->will($this->returnValue($preferred));
+        $list->expects($this->once())
+            ->method('getRemainingViews')
+            ->will($this->returnValue($other));
+
+        $view = $this->factory->createView(new LegacyChoiceListAdapter($list));
+
+        $this->assertEquals(array(
+            'Section 2' => array(new ChoiceView('y', 'y', 'Other')),
+            new ChoiceView('z', 'z', 'Other one'),
+        ), $view->choices);
+        $this->assertEquals(array('Section 1' => array(new ChoiceView('x', 'x', 'Preferred'))), $view->preferredChoices);
+    }
+
     private function assertScalarListWithChoiceValues(ChoiceListInterface $list)
     {
         $this->assertSame(array('a', 'b', 'c', 'd'), $list->getValues());