Merge branch '4.2'

* 4.2: (27 commits)
  [VarExporter] dont call userland code with uninitialized objects
  Fix typos in doc blocks
  [Debug] ignore underscore vs backslash namespaces in DebugClassLoader
  [TwigBridge][Form] Prevent multiple rendering of form collection prototypes
  [FrameworkBundle] fix describing routes with no controllers
  [DI] move RegisterServiceSubscribersPass before DecoratorServicePass
  Update ValidationListener.php
  [Yaml] ensures that the mb_internal_encoding is reset to its initial value
  [Messenger] Restore message handlers laziness
  [WebLink] Fixed documentation link
  [Security] getTargetPath of TargetPathTrait must return string or null
  [Hackday][Serializer] Deserialization ignores argument type hint from phpdoc for array in constructor argument
  Optimize perf by replacing call_user_func with dynamic vars
  [Cache] Fix dsn parsing
  [Routing] fix dumping same-path routes with placeholders
  [WebProfilerBundle][TwigBundle] CSS fixes
  Add a docblock for FormFactoryInterface
  [Security] defer log message in guard authenticator
  [Validator] Added IBAN format for Vatican City State
  merge conflicts
  ...

Author: nicolas-grekas

CallbackTransformer.php

@@ -41,7 +41,7 @@ public function __construct(callable $transform, callable $reverseTransform)
      */
     public function transform($data)
     {
-        return \call_user_func($this->transform, $data);
+        return ($this->transform)($data);
     }
 
     /**
@@ -57,6 +57,6 @@ public function transform($data)
      */
     public function reverseTransform($data)
     {
-        return \call_user_func($this->reverseTransform, $data);
+        return ($this->reverseTransform)($data);
     }
 }

ChoiceList/ArrayChoiceList.php

@@ -155,7 +155,7 @@ public function getValuesForChoices(array $choices)
             $givenValues = array();
 
             foreach ($choices as $i => $givenChoice) {
-                $givenValues[$i] = (string) \call_user_func($this->valueCallback, $givenChoice);
+                $givenValues[$i] = (string) ($this->valueCallback)($givenChoice);
             }
 
             return array_intersect($givenValues, array_keys($this->choices));
@@ -202,7 +202,7 @@ protected function flatten(array $choices, $value, &$choicesByValues, &$keysByVa
                 continue;
             }
 
-            $choiceValue = (string) \call_user_func($value, $choice);
+            $choiceValue = (string) $value($choice);
             $choicesByValues[$choiceValue] = $choice;
             $keysByValues[$choiceValue] = $key;
             $structuredValues[$key] = $choiceValue;

ChoiceList/Factory/DefaultChoiceListFactory.php

@@ -118,7 +118,7 @@ private static function addChoiceView($choice, $value, $label, $keys, &$index, $
         // $value may be an integer or a string, since it's stored in the array
         // keys. We want to guarantee it's a string though.
         $key = $keys[$value];
-        $nextIndex = \is_int($index) ? $index++ : \call_user_func($index, $choice, $key, $value);
+        $nextIndex = \is_int($index) ? $index++ : $index($choice, $key, $value);
 
         // BC normalize label to accept a false value
         if (null === $label) {
@@ -127,7 +127,7 @@ private static function addChoiceView($choice, $value, $label, $keys, &$index, $
         } elseif (false !== $label) {
             // If "choice_label" is set to false and "expanded" is true, the value false
             // should be passed on to the "label" option of the checkboxes/radio buttons
-            $dynamicLabel = \call_user_func($label, $choice, $key, $value);
+            $dynamicLabel = $label($choice, $key, $value);
             $label = false === $dynamicLabel ? false : (string) $dynamicLabel;
         }
 
@@ -137,11 +137,11 @@ private static function addChoiceView($choice, $value, $label, $keys, &$index, $
             $label,
             // The attributes may be a callable or a mapping from choice indices
             // to nested arrays
-            \is_callable($attr) ? \call_user_func($attr, $choice, $key, $value) : (isset($attr[$key]) ? $attr[$key] : array())
+            \is_callable($attr) ? $attr($choice, $key, $value) : (isset($attr[$key]) ? $attr[$key] : array())
         );
 
         // $isPreferred may be null if no choices are preferred
-        if ($isPreferred && \call_user_func($isPreferred, $choice, $key, $value)) {
+        if ($isPreferred && $isPreferred($choice, $key, $value)) {
             $preferredViews[$nextIndex] = $view;
         } else {
             $otherViews[$nextIndex] = $view;
@@ -200,7 +200,7 @@ private static function addChoiceViewsGroupedBy($groupBy, $label, $choices, $key
 
     private static function addChoiceViewGroupedBy($groupBy, $choice, $value, $label, $keys, &$index, $attr, $isPreferred, &$preferredViews, &$otherViews)
     {
-        $groupLabel = \call_user_func($groupBy, $choice, $keys[$value], $value);
+        $groupLabel = $groupBy($choice, $keys[$value], $value);
 
         if (null === $groupLabel) {
             // If the callable returns null, don't group the choice

ChoiceList/Loader/CallbackChoiceLoader.php

@@ -46,7 +46,7 @@ public function loadChoiceList($value = null)
             return $this->choiceList;
         }
 
-        return $this->choiceList = new ArrayChoiceList(\call_user_func($this->callback), $value);
+        return $this->choiceList = new ArrayChoiceList(($this->callback)(), $value);
     }
 
     /**

ChoiceList/Loader/IntlCallbackChoiceLoader.php

@@ -30,11 +30,6 @@ public function loadChoicesForValues(array $values, $value = null)
             return array();
         }
 
-        // If no callable is set, values are the same as choices
-        if (null === $value) {
-            return $values;
-        }
-
         return $this->loadChoiceList($value)->getChoicesForValues($values);
     }
 

Extension/Core/EventListener/ResizeFormListener.php

@@ -135,7 +135,7 @@ public function onSubmit(FormEvent $event)
             /** @var FormInterface $child */
             foreach ($form as $name => $child) {
                 $isNew = !isset($previousData[$name]);
-                $isEmpty = \is_callable($this->deleteEmpty) ? \call_user_func($this->deleteEmpty, $child->getData()) : $child->isEmpty();
+                $isEmpty = \is_callable($this->deleteEmpty) ? ($this->deleteEmpty)($child->getData()) : $child->isEmpty();
 
                 // $isNew can only be true if allowAdd is true, so we don't
                 // need to check allowAdd again

Extension/Core/Type/CountryType.php

@@ -106,11 +106,6 @@ public function loadChoicesForValues(array $values, $value = null)
             return array();
         }
 
-        // If no callable is set, values are the same as choices
-        if (null === $value) {
-            return $values;
-        }
-
         return $this->loadChoiceList($value)->getChoicesForValues($values);
     }
 

Extension/Core/Type/CurrencyType.php

@@ -106,11 +106,6 @@ public function loadChoicesForValues(array $values, $value = null)
             return array();
         }
 
-        // If no callable is set, values are the same as choices
-        if (null === $value) {
-            return $values;
-        }
-
         return $this->loadChoiceList($value)->getChoicesForValues($values);
     }
 

Extension/Core/Type/LanguageType.php

@@ -106,11 +106,6 @@ public function loadChoicesForValues(array $values, $value = null)
             return array();
         }
 
-        // If no callable is set, values are the same as choices
-        if (null === $value) {
-            return $values;
-        }
-
         return $this->loadChoiceList($value)->getChoicesForValues($values);
     }
 

Extension/Core/Type/LocaleType.php

@@ -106,11 +106,6 @@ public function loadChoicesForValues(array $values, $value = null)
             return array();
         }
 
-        // If no callable is set, values are the same as choices
-        if (null === $value) {
-            return $values;
-        }
-
         return $this->loadChoiceList($value)->getChoicesForValues($values);
     }
 

Extension/HttpFoundation/HttpFoundationRequestHandler.php

@@ -73,7 +73,7 @@ public function handleRequest(FormInterface $form, $request = null)
                 $form->submit(null, false);
 
                 $form->addError(new FormError(
-                    \call_user_func($form->getConfig()->getOption('upload_max_size_message')),
+                    $form->getConfig()->getOption('upload_max_size_message')(),
                     null,
                     array('{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize())
                 ));

Extension/Validator/Constraints/FormValidator.php

@@ -180,7 +180,7 @@ private static function getValidationGroups(FormInterface $form)
     private static function resolveValidationGroups($groups, FormInterface $form)
     {
         if (!\is_string($groups) && \is_callable($groups)) {
-            $groups = \call_user_func($groups, $form);
+            $groups = $groups($form);
         }
 
         if ($groups instanceof GroupSequence) {

Extension/Validator/EventListener/ValidationListener.php

@@ -51,7 +51,7 @@ public function validateForm(FormEvent $event)
         $form = $event->getForm();
 
         if ($form->isRoot()) {
-            // Validate the form in group "Default"
+            // Form groups are validated internally (FormValidator). Here we don't set groups as they are retrieved into the validator.
             foreach ($this->validator->validate($form) as $violation) {
                 // Allow the "invalid" constraint to be put onto
                 // non-synchronized forms

Extension/Validator/Type/UploadValidatorExtension.php

@@ -48,7 +48,7 @@ public function configureOptions(OptionsResolver $resolver)
         $translationDomain = $this->translationDomain;
         $resolver->setNormalizer('upload_max_size_message', function (Options $options, $message) use ($translator, $translationDomain) {
             return function () use ($translator, $translationDomain, $message) {
-                return $translator->trans(\call_user_func($message), array(), $translationDomain);
+                return $translator->trans($message(), array(), $translationDomain);
             };
         });
     }

Form.php

@@ -532,11 +532,12 @@ public function submit($submittedData, $clearMissing = true)
             $submittedData = null;
         } elseif (is_scalar($submittedData)) {
             $submittedData = (string) $submittedData;
-        } elseif ($this->config->getOption('allow_file_upload')) {
-            // no-op
-        } elseif ($this->config->getRequestHandler()->isFileUpload($submittedData)) {
+        } elseif (!$this->config->getOption('allow_file_upload') && $this->config->getRequestHandler()->isFileUpload($submittedData)) {
             $submittedData = null;
             $this->transformationFailure = new TransformationFailedException('Submitted data was expected to be text or number, file upload given.');
+        } elseif (\is_array($submittedData) && !$this->config->getCompound() && !$this->config->hasOption('multiple')) {
+            $submittedData = null;
+            $this->transformationFailure = new TransformationFailedException('Submitted data was expected to be text or number, array given.');
         }
 
         $dispatcher = $this->config->getEventDispatcher();

FormFactoryInterface.php

@@ -12,6 +12,8 @@
 namespace Symfony\Component\Form;
 
 /**
+ * Allows creating a form based on a name, a class or a property.
+ *
  * @author Bernhard Schussek <[email protected]>
  */
 interface FormFactoryInterface

NativeRequestHandler.php

@@ -78,7 +78,7 @@ public function handleRequest(FormInterface $form, $request = null)
                 $form->submit(null, false);
 
                 $form->addError(new FormError(
-                    \call_user_func($form->getConfig()->getOption('upload_max_size_message')),
+                    $form->getConfig()->getOption('upload_max_size_message')(),
                     null,
                     array('{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize())
                 ));

Tests/ChoiceList/Loader/IntlCallbackChoiceLoaderTest.php

@@ -84,6 +84,11 @@ public function testLoadChoicesForValuesLoadsChoiceListOnFirstCall()
         );
     }
 
+    public function testLoadChoicesForValuesDropsNonExistentChoices()
+    {
+        $this->assertSame(array(), self::$loader->loadChoicesForValues(array('foo')));
+    }
+
     public function testLoadValuesForChoicesLoadsChoiceListOnFirstCall()
     {
         $this->assertSame(

Tests/CompoundFormTest.php

@@ -1081,6 +1081,22 @@ public function testDisabledButtonIsNotSubmitted()
         $this->assertFalse($submit->isSubmitted());
     }
 
+    public function testArrayTransformationFailureOnSubmit()
+    {
+        $this->form->add($this->getBuilder('foo')->setCompound(false)->getForm());
+        $this->form->add($this->getBuilder('bar', null, null, array('multiple' => false))->setCompound(false)->getForm());
+
+        $this->form->submit(array(
+            'foo' => array('foo'),
+            'bar' => array('bar'),
+        ));
+
+        $this->assertNull($this->form->get('foo')->getData());
+        $this->assertSame('Submitted data was expected to be text or number, array given.', $this->form->get('foo')->getTransformationFailure()->getMessage());
+
+        $this->assertSame(array('bar'), $this->form->get('bar')->getData());
+    }
+
     public function testFileUpload()
     {
         $reqHandler = new HttpFoundationRequestHandler();

Tests/Extension/Core/Type/CountryTypeTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
+use Symfony\Component\Form\Extension\Core\Type\CountryType;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
 class CountryTypeTest extends BaseTypeTest
@@ -80,4 +81,14 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = 'FR', $expectedD
     {
         parent::testSubmitNullUsesDefaultEmptyData($emptyData, $expectedData);
     }
+
+    /**
+     * @group legacy
+     */
+    public function testInvalidChoiceValuesAreDropped()
+    {
+        $type = new CountryType();
+
+        $this->assertSame(array(), $type->loadChoicesForValues(array('foo')));
+    }
 }

Tests/Extension/Core/Type/CurrencyTypeTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
+use Symfony\Component\Form\Extension\Core\Type\CurrencyType;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
 class CurrencyTypeTest extends BaseTypeTest
@@ -61,4 +62,14 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = 'EUR', $expected
     {
         parent::testSubmitNullUsesDefaultEmptyData($emptyData, $expectedData);
     }
+
+    /**
+     * @group legacy
+     */
+    public function testInvalidChoiceValuesAreDropped()
+    {
+        $type = new CurrencyType();
+
+        $this->assertSame(array(), $type->loadChoicesForValues(array('foo')));
+    }
 }

Tests/Extension/Core/Type/LanguageTypeTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
+use Symfony\Component\Form\Extension\Core\Type\LanguageType;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
 class LanguageTypeTest extends BaseTypeTest
@@ -73,4 +74,14 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = 'en', $expectedD
     {
         parent::testSubmitNullUsesDefaultEmptyData($emptyData, $expectedData);
     }
+
+    /**
+     * @group legacy
+     */
+    public function testInvalidChoiceValuesAreDropped()
+    {
+        $type = new LanguageType();
+
+        $this->assertSame(array(), $type->loadChoicesForValues(array('foo')));
+    }
 }

Tests/Extension/Core/Type/LocaleTypeTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
+use Symfony\Component\Form\Extension\Core\Type\LocaleType;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
 class LocaleTypeTest extends BaseTypeTest
@@ -61,4 +62,14 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = 'en', $expectedD
     {
         parent::testSubmitNullUsesDefaultEmptyData($emptyData, $expectedData);
     }
+
+    /**
+     * @group legacy
+     */
+    public function testInvalidChoiceValuesAreDropped()
+    {
+        $type = new LocaleType();
+
+        $this->assertSame(array(), $type->loadChoicesForValues(array('foo')));
+    }
 }

Tests/Extension/Core/Type/UrlTypeTest.php

@@ -83,14 +83,6 @@ public function testThrowExceptionIfDefaultProtocolIsInvalid()
         ));
     }
 
-    public function testSubmitWithNonStringDataDoesNotBreakTheFixUrlProtocolListener()
-    {
-        $form = $this->factory->create(static::TESTED_TYPE);
-        $form->submit(array('domain.com', 'www.domain.com'));
-
-        $this->assertSame(array('domain.com', 'www.domain.com'), $form->getData());
-    }
-
     public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expectedData = 'http://empty')
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, array(

Tests/Extension/Validator/Constraints/FormValidatorTest.php

@@ -220,7 +220,7 @@ public function testDontValidateConstraintsIfNoValidationGroups()
             ->getForm();
 
         // Launch transformer
-        $form->submit(array());
+        $form->submit('foo');
 
         $this->expectNoValidate();
 

Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php

@@ -41,6 +41,6 @@ public function testPostMaxSizeTranslation()
         $extension->configureOptions($resolver);
         $options = $resolver->resolve();
 
-        $this->assertEquals('translated max {{ max }}!', \call_user_func($options['upload_max_size_message']));
+        $this->assertEquals('translated max {{ max }}!', $options['upload_max_size_message']());
     }
 }