Merge branch '2.7' into 2.8

* 2.7: (22 commits)
  Tests and fix for issue in array model data in EntityType field with multiple=true
  [Form] Fixed PercentToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible
  removed useless PHPDoc
  [Form] Fix FormInterface::submit() annotation
  PdoSessionHandler: fix advisory lock for pgsql when session.sid_bits_per_character > 4
  HttpCache does not consider ESI resources in HEAD requests
  Fix translation for "This field was not expected"
  [Routing] Enhance Route(Collection) docblocks
  Added improvement for accuracy in MoneyToLocalizedStringTransformer.
  Removed unused private property
  Use correct verb form in the pull request template
  Use PHP_MAXPATHLEN in Filesystem.
  Added null as explicit return type (?TokenInterface)
  [FrameworkBundle] Fix Routing\DelegatingLoader
  Render all line breaks according to the exception message
  [Form] Fix phpdoc
  [DI] remove confusing code
  [Form] Fixed GroupSequence with "constraints" option
  [Validator] Clarify UUID validator behavior
  [Filesystem] Fixed makePathRelative
  ...

Author: nicolas-grekas

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,9 +2,9 @@
 | ------------- | ---
 | Branch?       | 3.4 or master / 2.7, 2.8 or 3.3 <!-- see comment below -->
 | Bug fix?      | yes/no
-| New feature?  | yes/no <!-- don't forget updating src/**/CHANGELOG.md files -->
+| New feature?  | yes/no <!-- don't forget to update src/**/CHANGELOG.md files -->
 | BC breaks?    | yes/no
-| Deprecations? | yes/no <!-- don't forget updating UPGRADE-*.md files -->
+| Deprecations? | yes/no <!-- don't forget to update UPGRADE-*.md files -->
 | Tests pass?   | yes/no
 | Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
 | License       | MIT

src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php

@@ -27,8 +27,6 @@ class ProxyCacheWarmer implements CacheWarmerInterface
     private $registry;
 
     /**
-     * Constructor.
-     *
      * @param ManagerRegistry $registry A ManagerRegistry instance
      */
     public function __construct(ManagerRegistry $registry)

src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php

@@ -31,8 +31,6 @@ class ContainerAwareLoader extends Loader
     private $container;
 
     /**
-     * Constructor.
-     *
      * @param ContainerInterface $container A ContainerInterface instance
      */
     public function __construct(ContainerInterface $container)

src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php

@@ -97,8 +97,6 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
     private $aliasMap;
 
     /**
-     * Constructor.
-     *
      * The $managerParameters is an ordered list of container parameters that could provide the
      * name of the manager to register these namespaces and alias on. The first non-empty name
      * is used, the others skipped.

src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php

@@ -54,8 +54,6 @@ class DbalSessionHandler implements \SessionHandlerInterface
     private $timeCol = 'sess_time';
 
     /**
-     * Constructor.
-     *
      * @param Connection $con       A connection
      * @param string     $tableName Table name
      */

src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php

@@ -16,8 +16,6 @@
 use Doctrine\DBAL\Logging\SQLLogger;
 
 /**
- * DbalLogger.
- *
  * @author Fabien Potencier <[email protected]>
  */
 class DbalLogger implements SQLLogger
@@ -29,8 +27,6 @@ class DbalLogger implements SQLLogger
     protected $stopwatch;
 
     /**
-     * Constructor.
-     *
      * @param LoggerInterface $logger    A LoggerInterface instance
      * @param Stopwatch       $stopwatch A Stopwatch instance
      */

src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php

@@ -1516,4 +1516,38 @@ public function testSubmitNullExpandedMultiple()
         $this->assertEquals($collection, $form->getNormData());
         $this->assertSame(array(), $form->getViewData(), 'View data is always an array');
     }
+
+    public function testSetDataEmptyArraySubmitNullMultiple()
+    {
+        $emptyArray = array();
+        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+            'em' => 'default',
+            'class' => self::SINGLE_IDENT_CLASS,
+            'multiple' => true,
+        ));
+        $form->setData($emptyArray);
+        $form->submit(null);
+        $this->assertInternalType('array', $form->getData());
+        $this->assertEquals(array(), $form->getData());
+        $this->assertEquals(array(), $form->getNormData());
+        $this->assertSame(array(), $form->getViewData(), 'View data is always an array');
+    }
+
+    public function testSetDataNonEmptyArraySubmitNullMultiple()
+    {
+        $entity1 = new SingleIntIdEntity(1, 'Foo');
+        $this->persist(array($entity1));
+        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+            'em' => 'default',
+            'class' => self::SINGLE_IDENT_CLASS,
+            'multiple' => true,
+        ));
+        $existing = array(0 => $entity1);
+        $form->setData($existing);
+        $form->submit(null);
+        $this->assertInternalType('array', $form->getData());
+        $this->assertEquals(array(), $form->getData());
+        $this->assertEquals(array(), $form->getNormData());
+        $this->assertSame(array(), $form->getViewData(), 'View data is always an array');
+    }
 }

src/Symfony/Bridge/Doctrine/composer.json

@@ -23,7 +23,7 @@
     "require-dev": {
         "symfony/stopwatch": "~2.2|~3.0.0",
         "symfony/dependency-injection": "~2.2|~3.0.0",
-        "symfony/form": "^2.8.18|~3.2.5",
+        "symfony/form": "^2.8.27|~3.3.10",
         "symfony/http-kernel": "~2.2|~3.0.0",
         "symfony/property-access": "~2.3|~3.0.0",
         "symfony/property-info": "~2.8|3.0",

src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php

@@ -56,8 +56,6 @@ class ConsoleHandler extends AbstractProcessingHandler implements EventSubscribe
     );
 
     /**
-     * Constructor.
-     *
      * @param OutputInterface|null $output            The console output to use (the handler remains disabled when passing null
      *                                                until the output is set, e.g. by using console events)
      * @param bool                 $bubble            Whether the messages that are handled can bubble up the stack

src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php

@@ -41,8 +41,6 @@ class ProxyDumper implements DumperInterface
     private $classGenerator;
 
     /**
-     * Constructor.
-     *
      * @param string $salt
      */
     public function __construct($salt = '')