Merge branch '7.0' into 7.1

* 7.0: add test using deprecated reflection doc block feature to legacy group [HttpClient] Test with guzzle promises v2
symfony · Mar 21, 2024 · 759b6e1 · 759b6e1
2 parents 60d0315 + 278574d
commit 759b6e1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -135,7 +135,7 @@
         "doctrine/orm": "^2.15|^3",
         "dragonmantank/cron-expression": "^3.1",
         "egulias/email-validator": "^2.1.10|^3.1|^4",
-        "guzzlehttp/promises": "^1.4",
+        "guzzlehttp/promises": "^1.4|^2.0",
         "league/html-to-markdown": "^5.0",
         "league/uri": "^6.5|^7.0",
         "masterminds/html5": "^2.7.2",

diff --git a/src/Symfony/Component/HttpClient/composer.json b/src/Symfony/Component/HttpClient/composer.json
@@ -32,7 +32,7 @@
         "amphp/http-client": "^4.2.1",
         "amphp/http-tunnel": "^1.0",
         "amphp/socket": "^1.1",
-        "guzzlehttp/promises": "^1.4",
+        "guzzlehttp/promises": "^1.4|^2.0",
         "nyholm/psr7": "^1.0",
         "php-http/httplug": "^1.0|^2.0",
         "psr/http-client": "^1.0",

diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
@@ -67,7 +67,6 @@ public static function invalidTypesProvider()
         return [
             'pub' => ['pub', null, null],
             'stat' => ['stat', null, null],
-            'foo' => ['foo', 'Foo.', null],
             'bar' => ['bar', 'Bar.', null],
         ];
     }
@@ -82,6 +81,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
      */