Merge branch '3.4' into 4.2

* 3.4:
  Remove "internal" annotation from datacollector serialization methods
  replace mocks with real objects in tests
  Fix phpunit 8 compatibility
  render integer types with grouping as text input
  ignore _method forms in NativeRequestHandler
  don't lose int precision with not needed type casts

Author: nicolas-grekas

Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php

@@ -46,4 +46,12 @@ public function reverseTransform($value)
 
         return null !== $result ? (int) $result : null;
     }
+
+    /**
+     * @internal
+     */
+    protected function castParsedValue($value)
+    {
+        return $value;
+    }
 }

Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php

@@ -181,9 +181,7 @@ public function reverseTransform($value)
             throw new TransformationFailedException('I don\'t have a clear idea what infinity looks like');
         }
 
-        if (\is_int($result) && $result === (int) $float = (float) $result) {
-            $result = $float;
-        }
+        $result = $this->castParsedValue($result);
 
         if (false !== $encoding = mb_detect_encoding($value, null, true)) {
             $length = mb_strlen($value, $encoding);
@@ -228,6 +226,18 @@ protected function getNumberFormatter()
         return $formatter;
     }
 
+    /**
+     * @internal
+     */
+    protected function castParsedValue($value)
+    {
+        if (\is_int($value) && $value === (int) $float = (float) $value) {
+            return $float;
+        }
+
+        return $value;
+    }
+
     /**
      * Rounds a number according to the configured scale and rounding mode.
      *

Extension/Core/Type/IntegerType.php

@@ -14,6 +14,8 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\DataTransformer\IntegerToLocalizedStringTransformer;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class IntegerType extends AbstractType
@@ -26,6 +28,16 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->addViewTransformer(new IntegerToLocalizedStringTransformer($options['grouping'], $options['rounding_mode']));
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function buildView(FormView $view, FormInterface $form, array $options)
+    {
+        if ($options['grouping']) {
+            $view->vars['type'] = 'text';
+        }
+    }
+
     /**
      * {@inheritdoc}
      */

Extension/DataCollector/FormDataCollector.php

@@ -229,9 +229,6 @@ public function getData()
         return $this->data;
     }
 
-    /**
-     * @internal
-     */
     public function serialize()
     {
         foreach ($this->data['forms_by_hash'] as &$form) {

NativeRequestHandler.php

@@ -115,6 +115,10 @@ public function handleRequest(FormInterface $form, $request = null)
             return;
         }
 
+        if (\is_array($data) && array_key_exists('_method', $data) && $method === $data['_method'] && !$form->has('_method')) {
+            unset($data['_method']);
+        }
+
         $form->submit($data, 'PATCH' !== $method);
     }
 

Tests/AbstractLayoutTest.php

@@ -1796,6 +1796,21 @@ public function testInteger()
         );
     }
 
+    public function testIntegerTypeWithGroupingRendersAsTextInput()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\IntegerType', 123, [
+            'grouping' => true,
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+'/input
+    [@type="text"]
+    [@name="name"]
+    [@value="123"]
+'
+        );
+    }
+
     public function testLanguage()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\LanguageType', 'de');

Tests/AbstractRequestHandlerTest.php

@@ -200,7 +200,7 @@ public function testMergeParamsAndFiles($method)
         $form = $this->createForm('param1', $method, true);
         $form->add($this->createForm('field1'));
         $form->add($this->createBuilder('field2', false, ['allow_file_upload' => true])->getForm());
-        $file = $this->getMockFile();
+        $file = $this->getUploadedFile();
 
         $this->setRequestData($method, [
             'param1' => [
@@ -225,7 +225,7 @@ public function testMergeParamsAndFiles($method)
     public function testParamTakesPrecedenceOverFile($method)
     {
         $form = $this->createForm('param1', $method);
-        $file = $this->getMockFile();
+        $file = $this->getUploadedFile();
 
         $this->setRequestData($method, [
             'param1' => 'DATA',
@@ -247,7 +247,7 @@ public function testSubmitFileIfNoParam($method)
         $form = $this->createBuilder('param1', false, ['allow_file_upload' => true])
             ->setMethod($method)
             ->getForm();
-        $file = $this->getMockFile();
+        $file = $this->getUploadedFile();
 
         $this->setRequestData($method, [
             'param1' => null,
@@ -269,14 +269,14 @@ public function testSubmitMultipleFiles($method)
         $form = $this->createBuilder('param1', false, ['allow_file_upload' => true])
             ->setMethod($method)
             ->getForm();
-        $file = $this->getMockFile();
+        $file = $this->getUploadedFile();
 
         $this->setRequestData($method, [
             'param1' => null,
         ], [
-            'param2' => $this->getMockFile('2'),
+            'param2' => $this->getUploadedFile('2'),
             'param1' => $file,
-            'param3' => $this->getMockFile('3'),
+            'param3' => $this->getUploadedFile('3'),
         ]);
 
         $this->requestHandler->handleRequest($form, $this->request);
@@ -332,7 +332,7 @@ public function getPostMaxSizeFixtures()
 
     public function testUploadedFilesAreAccepted()
     {
-        $this->assertTrue($this->requestHandler->isFileUpload($this->getMockFile()));
+        $this->assertTrue($this->requestHandler->isFileUpload($this->getUploadedFile()));
     }
 
     public function testInvalidFilesAreRejected()
@@ -344,7 +344,7 @@ abstract protected function setRequestData($method, $data, $files = []);
 
     abstract protected function getRequestHandler();
 
-    abstract protected function getMockFile($suffix = '');
+    abstract protected function getUploadedFile($suffix = '');
 
     abstract protected function getInvalidFile();
 

Tests/DependencyInjection/FormPassTest.php

@@ -20,8 +20,9 @@
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\AbstractTypeExtension;
+use Symfony\Component\Form\Command\DebugCommand;
 use Symfony\Component\Form\DependencyInjection\FormPass;
-use Symfony\Component\Form\FormRegistryInterface;
+use Symfony\Component\Form\FormRegistry;
 
 /**
  * @author Bernhard Schussek <[email protected]>
@@ -71,8 +72,12 @@ public function testAddTaggedTypesToDebugCommand()
     {
         $container = $this->createContainerBuilder();
 
+        $container->register('form.registry', FormRegistry::class);
+        $commandDefinition = new Definition(DebugCommand::class, [new Reference('form.registry')]);
+        $commandDefinition->setPublic(true);
+
         $container->setDefinition('form.extension', $this->createExtensionDefinition());
-        $container->setDefinition('console.command.form_debug', $this->createDebugCommandDefinition());
+        $container->setDefinition('console.command.form_debug', $commandDefinition);
         $container->register('my.type1', __CLASS__.'_Type1')->addTag('form.type')->setPublic(true);
         $container->register('my.type2', __CLASS__.'_Type2')->addTag('form.type')->setPublic(true);
 
@@ -379,19 +384,6 @@ private function createExtensionDefinition()
         return $definition;
     }
 
-    private function createDebugCommandDefinition()
-    {
-        $definition = new Definition('Symfony\Component\Form\Command\DebugCommand');
-        $definition->setPublic(true);
-        $definition->setArguments([
-            $formRegistry = $this->getMockBuilder(FormRegistryInterface::class)->getMock(),
-            [],
-            ['Symfony\Component\Form\Extension\Core\Type'],
-        ]);
-
-        return $definition;
-    }
-
     private function createContainerBuilder()
     {
         $container = new ContainerBuilder();