Merge branch '3.4' into 4.1

* 3.4:
  properly fix tests on PHP 5
  fix tests on PHP 5
  bug #29697 [DI] Fixed wrong factory method in exception (Wojciech Gorczyca)
  Changed gender choice types to color
  remove no longer needed PHP version checks
  Fixed groupBy argument value in DefaultChoiceListFactoryTest
  [HttpKernel] Correctly Render Signed URIs Containing Fragments
  [HttpFoundation] Fix request uri when it starts with double slashes

Author: Robin Chalas

Forms.php

@@ -26,8 +26,8 @@
  *         ->add('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType')
  *         ->add('lastName', 'Symfony\Component\Form\Extension\Core\Type\TextType')
  *         ->add('age', 'Symfony\Component\Form\Extension\Core\Type\IntegerType')
- *         ->add('gender', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array(
- *             'choices' => array('Male' => 'm', 'Female' => 'f'),
+ *         ->add('color', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array(
+ *             'choices' => array('Red' => 'r', 'Blue' => 'b'),
  *         ))
  *         ->getForm();
  *

Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php

@@ -443,7 +443,7 @@ public function testCreateViewFlatGroupByEmpty()
             array($this->obj2, $this->obj3),
             null, // label
             null, // index
-            array() // ignored
+            null  // group
         );
 
         $this->assertFlatView($view);

Tests/CompoundFormPerformanceTest.php

@@ -31,8 +31,8 @@ public function testArrayBasedForm()
             $form = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType')
                 ->add('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType')
                 ->add('lastName', 'Symfony\Component\Form\Extension\Core\Type\TextType')
-                ->add('gender', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array(
-                    'choices' => array('male' => 'Male', 'female' => 'Female'),
+                ->add('color', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array(
+                    'choices' => array('red' => 'Red', 'blue' => 'Blue'),
                     'required' => false,
                 ))
                 ->add('age', 'Symfony\Component\Form\Extension\Core\Type\NumberType')