Merge branch '5.4' into 6.4

* 5.4:
  add test using deprecated reflection doc block feature to legacy group
  [HttpClient] Test with guzzle promises v2

Tests/Extractor/PhpDocExtractorTest.php

@@ -53,7 +53,6 @@ public static function invalidTypesProvider()
         return [
             'pub' => ['pub', null, null],
             'stat' => ['stat', null, null],
-            'foo' => ['foo', 'Foo.', null],
             'bar' => ['bar', 'Bar.', null],
         ];
     }
@@ -68,6 +67,16 @@ public function testInvalid($property, $shortDescription, $longDescription)
         $this->assertSame($longDescription, $this->extractor->getLongDescription('Symfony\Component\PropertyInfo\Tests\Fixtures\InvalidDummy', $property));
     }
 
+    /**
+     * @group legacy
+     */
+    public function testEmptyParamAnnotation()
+    {
+        $this->assertNull($this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\InvalidDummy', 'foo'));
+        $this->assertSame('Foo.', $this->extractor->getShortDescription('Symfony\Component\PropertyInfo\Tests\Fixtures\InvalidDummy', 'foo'));
+        $this->assertNull($this->extractor->getLongDescription('Symfony\Component\PropertyInfo\Tests\Fixtures\InvalidDummy', 'foo'));
+    }
+
     /**
      * @dataProvider typesWithNoPrefixesProvider
      */