Merge branch '2.7' into 2.8

* 2.7:
  [VarDumper] Fix tests on PHP 7
  [DomCrawler] Clarify the value returned by getPhpFiles()
  [DependencyInjection] Fix symfony#16461 Let Container::set() replace existing aliases
  avoid (string) catchable fatal error for instances of __PHP_Incomplete_Class
  remove unnecessary retrieval and setting of data
  avoid (string) catchable fatal error for __PHP_Incomplete_Class instances
  sendContent return as parent.
  [FrameworkBundle] Fix a typo
  Added more exceptions to singularify method

Author: nicolas-grekas

src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php

@@ -47,8 +47,9 @@ protected function configure()
             ))
             ->setDescription('Updates the translation file')
             ->setHelp(<<<'EOF'
-The <info>%command.name%</info> command extract translation strings from templates
+The <info>%command.name%</info> command extracts translation strings from templates
 of a given bundle or the app folder. It can display them or merge the new ones into the translation files.
+
 When new translation strings are found it can automatically add a prefix to the translation
 message.
 

src/Symfony/Component/DependencyInjection/Container.php

@@ -200,6 +200,10 @@ public function set($id, $service, $scope = self::SCOPE_CONTAINER)
             $this->scopedServices[$scope][$id] = $service;
         }
 
+        if (isset($this->aliases[$id])) {
+            unset($this->aliases[$id]);
+        }
+
         $this->services[$id] = $service;
 
         if (method_exists($this, $method = 'synchronize'.strtr($id, $this->underscoreMap).'Service')) {

src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php

@@ -253,6 +253,16 @@ public function testAddAliases()
         $this->assertTrue(isset($aliases['foobar']));
     }
 
+    public function testSetReplacesAlias()
+    {
+        $builder = new ContainerBuilder();
+        $builder->setAlias('alias', 'aliased');
+        $builder->set('aliased', new \stdClass());
+
+        $builder->set('alias', $foo = new \stdClass());
+        $this->assertSame($foo, $builder->get('alias'), '->set() replaces an existing alias');
+    }
+
     public function testAddGetCompilerPass()
     {
         $builder = new ContainerBuilder();

src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php

@@ -192,6 +192,14 @@ public function testSetAlsoCallsSynchronizeService()
         $this->assertTrue($c->synchronized, '->set() calls synchronize*Service() if it is defined for the service');
     }
 
+    public function testSetReplacesAlias()
+    {
+        $c = new ProjectServiceContainer();
+
+        $c->set('alias', $foo = new \stdClass());
+        $this->assertSame($foo, $c->get('alias'), '->set() replaces an existing alias');
+    }
+
     public function testGet()
     {
         $sc = new ProjectServiceContainer();

src/Symfony/Component/DomCrawler/Form.php

@@ -157,8 +157,12 @@ public function getPhpValues()
      *
      * This method converts fields with the array notation
      * (like foo[bar] to arrays) like PHP does.
+     * The returned array is consistent with the array for field values
+     * (@see getPhpValues), rather than uploaded files found in $_FILES.
+     * For a compound file field foo[bar] it will create foo[bar][name],
+     * instead of foo[name][bar] which would be found in $_FILES.
      *
-     * @return array An array of field values.
+     * @return array An array of file field values.
      */
     public function getPhpFiles()
     {

src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php

@@ -94,9 +94,10 @@ public function __construct($fieldName, $tokenManager, $tokenId, $errorMessage,
     public function preSubmit(FormEvent $event)
     {
         $form = $event->getForm();
-        $data = $event->getData();
 
         if ($form->isRoot() && $form->getConfig()->getOption('compound')) {
+            $data = $event->getData();
+
             if (!isset($data[$this->fieldName]) || !$this->tokenManager->isTokenValid(new CsrfToken($this->tokenId, $data[$this->fieldName]))) {
                 $errorMessage = $this->errorMessage;
 
@@ -109,10 +110,9 @@ public function preSubmit(FormEvent $event)
 
             if (is_array($data)) {
                 unset($data[$this->fieldName]);
+                $event->setData($data);
             }
         }
-
-        $event->setData($data);
     }
 
     /**

src/Symfony/Component/HttpFoundation/BinaryFileResponse.php

@@ -27,6 +27,9 @@ class BinaryFileResponse extends Response
 {
     protected static $trustXSendfileTypeHeader = false;
 
+    /**
+     * @var File
+     */
     protected $file;
     protected $offset;
     protected $maxlen;
@@ -180,7 +183,7 @@ public function prepare(Request $request)
             $this->headers->set('Content-Type', $this->file->getMimeType() ?: 'application/octet-stream');
         }
 
-        if ('HTTP/1.0' != $request->server->get('SERVER_PROTOCOL')) {
+        if ('HTTP/1.0' !== $request->server->get('SERVER_PROTOCOL')) {
             $this->setProtocolVersion('1.1');
         }
 
@@ -197,17 +200,17 @@ public function prepare(Request $request)
             if (false === $path) {
                 $path = $this->file->getPathname();
             }
-            if (strtolower($type) == 'x-accel-redirect') {
+            if (strtolower($type) === 'x-accel-redirect') {
                 // Do X-Accel-Mapping substitutions.
                 // @link http://wiki.nginx.org/X-accel#X-Accel-Redirect
                 foreach (explode(',', $request->headers->get('X-Accel-Mapping', '')) as $mapping) {
                     $mapping = explode('=', $mapping, 2);
 
-                    if (2 == count($mapping)) {
+                    if (2 === count($mapping)) {
                         $pathPrefix = trim($mapping[0]);
                         $location = trim($mapping[1]);
 
-                        if (substr($path, 0, strlen($pathPrefix)) == $pathPrefix) {
+                        if (substr($path, 0, strlen($pathPrefix)) === $pathPrefix) {
                             $path = $location.substr($path, strlen($pathPrefix));
                             break;
                         }
@@ -218,7 +221,7 @@ public function prepare(Request $request)
             $this->maxlen = 0;
         } elseif ($request->headers->has('Range')) {
             // Process the range headers.
-            if (!$request->headers->has('If-Range') || $this->getEtag() == $request->headers->get('If-Range')) {
+            if (!$request->headers->has('If-Range') || $this->getEtag() === $request->headers->get('If-Range')) {
                 $range = $request->headers->get('Range');
                 $fileSize = $this->file->getSize();
 
@@ -253,17 +256,17 @@ public function prepare(Request $request)
 
     /**
      * Sends the file.
+     *
+     * {@inheritdoc}
      */
     public function sendContent()
     {
         if (!$this->isSuccessful()) {
-            parent::sendContent();
-
-            return;
+            return parent::sendContent();
         }
 
         if (0 === $this->maxlen) {
-            return;
+            return $this;
         }
 
         $out = fopen('php://output', 'wb');
@@ -277,6 +280,8 @@ public function sendContent()
         if ($this->deleteFileAfterSend) {
             unlink($this->file->getPathname());
         }
+
+        return $this;
     }
 
     /**

src/Symfony/Component/HttpKernel/DataCollector/Util/ValueExporter.php

@@ -35,6 +35,10 @@ public function exportValue($value, $depth = 1, $deep = false)
             return sprintf('Object(%s)', get_class($value));
         }
 
+        if ($value instanceof \__PHP_Incomplete_Class) {
+            return sprintf('__PHP_Incomplete_Class(%s)', $this->getClassNameFromIncomplete($value));
+        }
+
         if (is_array($value)) {
             if (empty($value)) {
                 return '[]';
@@ -75,4 +79,11 @@ public function exportValue($value, $depth = 1, $deep = false)
 
         return (string) $value;
     }
+
+    private function getClassNameFromIncomplete(\__PHP_Incomplete_Class $value)
+    {
+        $array = new \ArrayObject($value);
+
+        return $array['__PHP_Incomplete_Class_Name'];
+    }
 }

src/Symfony/Component/HttpKernel/Tests/DataCollector/Util/ValueExporterTest.php

@@ -39,4 +39,12 @@ public function testDateTimeImmutable()
         $dateTime = new \DateTimeImmutable('2014-06-10 07:35:40', new \DateTimeZone('UTC'));
         $this->assertSame('Object(DateTimeImmutable) - 2014-06-10T07:35:40+0000', $this->valueExporter->exportValue($dateTime));
     }
+
+    public function testIncompleteClass()
+    {
+        $foo = new \__PHP_Incomplete_Class();
+        $array = new \ArrayObject($foo);
+        $array['__PHP_Incomplete_Class_Name'] = 'AppBundle/Foo';
+        $this->assertSame('__PHP_Incomplete_Class(AppBundle/Foo)', $this->valueExporter->exportValue($foo));
+    }
 }

src/Symfony/Component/PropertyAccess/StringUtil.php

@@ -39,6 +39,9 @@ class StringUtil
         // nebulae (nebula)
         array('ea', 2, true, true, 'a'),
 
+        // services (service)
+        array('secivres', 8, true, true, 'service'),
+
         // mice (mouse), lice (louse)
         array('eci', 3, false, true, 'ouse'),
 
@@ -66,6 +69,12 @@ class StringUtil
         // movies (movie)
         array('seivom', 6, true, true, 'movie'),
 
+        // news (news)
+        array('swen', 4, true, true, 'news'),
+
+        // series (series)
+        array('seires', 6, true, true, 'series'),
+
         // babies (baby)
         array('sei', 3, false, true, 'y'),