Merge branch '3.0'

Author: Tobion

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

@@ -721,9 +721,8 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
                 ->in($dirs)
             ;
 
-            $locales = array();
             foreach ($finder as $file) {
-                list($domain, $locale, $format) = explode('.', $file->getBasename(), 3);
+                list(, $locale) = explode('.', $file->getBasename(), 3);
                 if (!isset($files[$locale])) {
                     $files[$locale] = array();
                 }

src/Symfony/Component/Form/DataTransformerInterface.php

@@ -58,7 +58,7 @@ public function transform($value);
      *
      * This method must be able to deal with empty values. Usually this will
      * be an empty string, but depending on your implementation other empty
-     * values are possible as well (such as empty strings). The reasoning behind
+     * values are possible as well (such as NULL). The reasoning behind
      * this is that value transformers must be chainable. If the
      * reverseTransform() method of the first value transformer outputs an
      * empty string, the second value transformer must be able to process that

src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php

@@ -356,21 +356,6 @@ public function getBlockPrefix()
         return 'choice';
     }
 
-    private static function flipRecursive($choices, &$output = array())
-    {
-        foreach ($choices as $key => $value) {
-            if (is_array($value)) {
-                $output[$key] = array();
-                self::flipRecursive($value, $output[$key]);
-                continue;
-            }
-
-            $output[$value] = $key;
-        }
-
-        return $output;
-    }
-
     /**
      * Adds the sub fields for an expanded choice field.
      *
@@ -446,9 +431,7 @@ private function createChoiceListView(ChoiceListInterface $choiceList, array $op
         // If no explicit grouping information is given, use the structural
         // information from the "choices" option for creating groups
         if (!$options['group_by'] && $options['choices']) {
-            $options['group_by'] = !$options['choices_as_values']
-                ? self::flipRecursive($options['choices'])
-                : $options['choices'];
+            $options['group_by'] = $options['choices'];
         }
 
         return $this->choiceListFactory->createView(

src/Symfony/Component/Form/FormBuilderInterface.php

@@ -24,7 +24,7 @@ interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuild
      * object hierarchy.
      *
      * @param string|int|FormBuilderInterface $child
-     * @param string|FormTypeInterface        $type
+     * @param string|null                     $type
      * @param array                           $options
      *
      * @return FormBuilderInterface The builder object.
@@ -34,9 +34,9 @@ public function add($child, $type = null, array $options = array());
     /**
      * Creates a form builder.
      *
-     * @param string                   $name    The name of the form or the name of the property
-     * @param string|FormTypeInterface $type    The type of the form or null if name is a property
-     * @param array                    $options The options
+     * @param string      $name    The name of the form or the name of the property
+     * @param string|null $type    The type of the form or null if name is a property
+     * @param array       $options The options
      *
      * @return FormBuilderInterface The created builder.
      */

src/Symfony/Component/Form/Forms.php

@@ -24,11 +24,11 @@
  * $formFactory = Forms::createFormFactory();
  *
  * $form = $formFactory->createBuilder()
- *     ->add('firstName', 'text')
- *     ->add('lastName', 'text')
- *     ->add('age', 'integer')
- *     ->add('gender', 'choice', array(
- *         'choices' => array('m' => 'Male', 'f' => 'Female'),
+ *     ->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'),
  *     ))
  *     ->getForm();
  * </code>

src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php

@@ -623,8 +623,6 @@ public function testNoViolationIfAllowExtraData()
 
         $context->expects($this->never())
             ->method('addViolation');
-        $context->expects($this->never())
-            ->method('addViolationAt');
 
         $this->validator->initialize($context);
         $this->validator->validate($form, new Form());

src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorExtensionTest.php

@@ -38,10 +38,6 @@ public function test2Dot5ValidationApi()
             ->method('addPropertyConstraint')
             ->with('children', $this->isInstanceOf('Symfony\Component\Validator\Constraints\Valid'));
 
-        $validator
-            ->expects($this->never())
-            ->method('getMetadataFactory');
-
         $extension = new ValidatorExtension($validator);
         $guesser = $extension->loadTypeGuesser();
 

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

@@ -19,7 +19,14 @@ public function testAutoloadMainExtension()
     {
         $container = $this->getMock(
             'Symfony\\Component\\DependencyInjection\\ContainerBuilder',
-            array('getExtensionConfig', 'loadFromExtension', 'getParameterBag')
+            array(
+                'getExtensionConfig',
+                'loadFromExtension',
+                'getParameterBag',
+                'getDefinitions',
+                'getAliases',
+                'getExtensions',
+            )
         );
         $params = $this->getMock('Symfony\\Component\\DependencyInjection\\ParameterBag\\ParameterBag');
 

src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php

@@ -111,9 +111,6 @@ public function testSubRequestWithDifferentMethod()
                        ->will($this->returnValue(array()));
 
         $context = new RequestContext();
-        $requestMatcher->expects($this->any())
-                       ->method('getContext')
-                       ->will($this->returnValue($context));
 
         $listener = new RouterListener($requestMatcher, $this->requestStack, new RequestContext());
         $listener->onKernelRequest($event);

src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php

@@ -14,6 +14,7 @@
 use Symfony\Component\HttpKernel\HttpCache\HttpCache;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * @group time-sensitive
@@ -27,15 +28,11 @@ public function testTerminateDelegatesTerminationOnlyForTerminableInterface()
             ->getMock();
 
         // does not implement TerminableInterface
-        $kernelMock = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\HttpKernelInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $kernelMock->expects($this->never())
-            ->method('terminate');
+        $kernel = new TestKernel();
+        $httpCache = new HttpCache($kernel, $storeMock);
+        $httpCache->terminate(Request::create('/'), new Response());
 
-        $kernel = new HttpCache($kernelMock, $storeMock);
-        $kernel->terminate(Request::create('/'), new Response());
+        $this->assertFalse($kernel->terminateCalled, 'terminate() is never called if the kernel class does not implement TerminableInterface');
 
         // implements TerminableInterface
         $kernelMock = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Kernel')
@@ -1225,3 +1222,17 @@ public function testEsiCacheRemoveValidationHeadersIfEmbeddedResponses()
         $this->assertNull($this->response->getLastModified());
     }
 }
+
+class TestKernel implements HttpKernelInterface
+{
+    public $terminateCalled = false;
+
+    public function terminate(Request $request, Response $response)
+    {
+        $this->terminateCalled = true;
+    }
+
+    public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
+    {
+    }
+}