Merge branch '2.8' into 3.4

* 2.8:
  Remove duplicate condition
  fix useless space in docblock
  remove unneeded tearDown method
  [FrameworkBundle] Fix broken exception message
  Revert "fixed CS"
  Skip empty proxy code
  [Security] Fix "exclude-from-classmap"
  add missing double-quotes to extra_fields output message
  Convert InsufficientAuthenticationException to HttpException

Author: nicolas-grekas

Extension/Validator/Constraints/FormValidator.php

@@ -127,7 +127,7 @@ public function validate($form, Constraint $constraint)
         if (!$config->getOption('allow_extra_fields') && \count($form->getExtraData()) > 0) {
             $this->context->setConstraint($constraint);
             $this->context->buildViolation($config->getOption('extra_fields_message'))
-                ->setParameter('{{ extra_fields }}', implode('", "', array_keys($form->getExtraData())))
+                ->setParameter('{{ extra_fields }}', '"'.implode('", "', array_keys($form->getExtraData())).'"')
                 ->setInvalidValue($form->getExtraData())
                 ->setCode(Form::NO_SUCH_FIELD_ERROR)
                 ->addViolation();

FormConfigBuilderInterface.php

@@ -257,10 +257,10 @@ public function setRequestHandler(RequestHandlerInterface $requestHandler);
      *
      * Should be set to true only for root forms.
      *
-     * @param bool $initialize true to initialize the form automatically,
+     * @param bool $initialize True to initialize the form automatically,
      *                         false to suppress automatic initialization.
      *                         In the second case, you need to call
-     *                         {@link FormInterface::initialize()} manually
+     *                         {@link FormInterface::initialize()} manually.
      *
      * @return $this The configuration object
      */

FormInterface.php

@@ -127,9 +127,9 @@ public function getData();
     /**
      * Returns the normalized data of the field.
      *
-     * @return mixed when the field is not submitted, the default data is returned.
+     * @return mixed When the field is not submitted, the default data is returned.
      *               When the field is submitted, the normalized submitted data is
-     *               returned if the field is valid, null otherwise
+     *               returned if the field is valid, null otherwise.
      */
     public function getNormData();
 

FormRendererEngineInterface.php

@@ -38,10 +38,10 @@ public function setTheme(FormView $view, $themes /*, $useDefaultThemes = true */
      * The type of the resource is decided by the implementation. The resource
      * is later passed to {@link renderBlock()} by the rendering algorithm.
      *
-     * @param FormView $view      the view for determining the used themes.
+     * @param FormView $view      The view for determining the used themes.
      *                            First the themes attached directly to the
      *                            view with {@link setTheme()} are considered,
-     *                            then the ones of its parent etc
+     *                            then the ones of its parent etc.
      * @param string   $blockName The name of the block to render
      *
      * @return mixed the renderer resource or false, if none was found
@@ -70,10 +70,10 @@ public function getResourceForBlockName(FormView $view, $blockName);
      * The type of the resource is decided by the implementation. The resource
      * is later passed to {@link renderBlock()} by the rendering algorithm.
      *
-     * @param FormView $view               the view for determining the used themes.
+     * @param FormView $view               The view for determining the used themes.
      *                                     First the themes  attached directly to
      *                                     the view with {@link setTheme()} are
-     *                                     considered, then the ones of its parent etc
+     *                                     considered, then the ones of its parent etc.
      * @param array    $blockNameHierarchy The block name hierarchy, with the root block
      *                                     at the beginning
      * @param int      $hierarchyLevel     The level in the hierarchy at which to start
@@ -108,10 +108,10 @@ public function getResourceForBlockNameHierarchy(FormView $view, array $blockNam
      * The type of the resource is decided by the implementation. The resource
      * is later passed to {@link renderBlock()} by the rendering algorithm.
      *
-     * @param FormView $view               the view for determining the used themes.
+     * @param FormView $view               The view for determining the used themes.
      *                                     First the themes  attached directly to
      *                                     the view with {@link setTheme()} are
-     *                                     considered, then the ones of its parent etc
+     *                                     considered, then the ones of its parent etc.
      * @param array    $blockNameHierarchy The block name hierarchy, with the root block
      *                                     at the beginning
      * @param int      $hierarchyLevel     The level in the hierarchy at which to start

Tests/Extension/Validator/Constraints/FormValidatorTest.php

@@ -592,12 +592,33 @@ public function testViolationIfExtraData()
         $this->validator->validate($form, new Form());
 
         $this->buildViolation('Extra!')
-            ->setParameter('{{ extra_fields }}', 'foo')
+            ->setParameter('{{ extra_fields }}', '"foo"')
             ->setInvalidValue(array('foo' => 'bar'))
             ->setCode(Form::NO_SUCH_FIELD_ERROR)
             ->assertRaised();
     }
 
+    public function testViolationFormatIfMultipleExtraFields()
+    {
+        $form = $this->getBuilder('parent', null, array('extra_fields_message' => 'Extra!'))
+            ->setCompound(true)
+            ->setDataMapper($this->getDataMapper())
+            ->add($this->getBuilder('child'))
+            ->getForm();
+
+        $form->submit(array('foo' => 'bar', 'baz' => 'qux', 'quux' => 'quuz'));
+
+        $this->expectNoValidate();
+
+        $this->validator->validate($form, new Form());
+
+        $this->buildViolation('Extra!')
+            ->setParameter('{{ extra_fields }}', '"foo", "baz", "quux"')
+            ->setInvalidValue(array('foo' => 'bar', 'baz' => 'qux', 'quux' => 'quuz'))
+            ->setCode(Form::NO_SUCH_FIELD_ERROR)
+            ->assertRaised();
+    }
+
     public function testNoViolationIfAllowExtraData()
     {
         $context = $this->getMockExecutionContext();

Util/OrderedHashMapIterator.php

@@ -62,11 +62,11 @@ class OrderedHashMapIterator implements \Iterator
      *                              keys
      * @param array $orderedKeys    The keys of the map in the order in which
      *                              they should be iterated
-     * @param array $managedCursors an array from which to reference the
+     * @param array $managedCursors An array from which to reference the
      *                              iterator's cursor as long as it is alive.
      *                              This array is managed by the corresponding
      *                              {@link OrderedHashMap} instance to support
-     *                              recognizing the deletion of elements
+     *                              recognizing the deletion of elements.
      */
     public function __construct(array &$elements, array &$orderedKeys, array &$managedCursors)
     {