Merge branch '4.1' into main

Resolve merge conflict in tests/Functional/ValidationTest.php by combining test cases.

Author: soyuka

ApiPlatformProvider.php

@@ -158,10 +158,10 @@
 use Illuminate\Routing\Router;
 use Illuminate\Support\ServiceProvider;
 use Negotiation\Negotiator;
-use phpDocumentor\Reflection\DocBlockFactory;
+use PHPStan\PhpDocParser\Parser\PhpDocParser;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
-use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
+use Symfony\Component\PropertyInfo\Extractor\PhpStanExtractor;
 use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
 use Symfony\Component\PropertyInfo\PropertyInfoExtractor;
 use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface;
@@ -196,13 +196,13 @@ public function register(): void
         $this->mergeConfigFrom(__DIR__.'/config/api-platform.php', 'api-platform');
 
         $this->app->singleton(PropertyInfoExtractorInterface::class, function () {
-            $phpDocExtractor = class_exists(DocBlockFactory::class) ? new PhpDocExtractor() : null;
+            $phpstanExtractor = class_exists(PhpDocParser::class) ? new PhpStanExtractor() : null;
             $reflectionExtractor = new ReflectionExtractor();
 
             return new PropertyInfoExtractor(
                 [$reflectionExtractor],
-                $phpDocExtractor ? [$phpDocExtractor, $reflectionExtractor] : [$reflectionExtractor],
-                $phpDocExtractor ? [$phpDocExtractor] : [],
+                $phpstanExtractor ? [$phpstanExtractor, $reflectionExtractor] : [$reflectionExtractor],
+                [],
                 [$reflectionExtractor],
                 [$reflectionExtractor]
             );

Eloquent/PropertyAccess/PropertyAccessor.php

@@ -32,7 +32,9 @@ public function __construct(
     }
 
     /**
-     * @param array<mixed, mixed>|object $objectOrArray
+     * @param object|array<mixed, mixed> $objectOrArray
+     *
+     * @param-out object|array<mixed, mixed> $objectOrArray
      */
     public function setValue(object|array &$objectOrArray, string|PropertyPathInterface $propertyPath, mixed $value): void
     {

composer.json

@@ -49,17 +49,17 @@
         "illuminate/container": "^11.0 || ^12.0",
         "symfony/type-info": "^7.2",
         "symfony/web-link": "^6.4 || ^7.1",
-        "willdurand/negotiation": "^3.1",
-        "phpstan/phpdoc-parser": "^1.29 || ^2.0",
-        "phpdocumentor/reflection-docblock": "^5.1"
+        "willdurand/negotiation": "^3.1"
     },
     "require-dev": {
+        "api-platform/graphql": "^4.1",
         "doctrine/dbal": "^4.0",
         "larastan/larastan": "^2.0 || ^3.0",
+        "laravel/sanctum": "^4.0",
         "orchestra/testbench": "^9.1",
-        "phpunit/phpunit": "11.5.x-dev",
-        "api-platform/graphql": "^4.1",
-        "laravel/sanctum": "^4.0"
+        "phpdocumentor/type-resolver": "^1.7",
+        "phpstan/phpdoc-parser": "^1.29 || ^2.0",
+        "phpunit/phpunit": "11.5.x-dev"
     },
     "autoload": {
         "psr-4": {
@@ -75,7 +75,7 @@
     },
     "suggest": {
         "api-platform/graphql": "Enable GraphQl support.",
-        "phpdocumentor/reflection-docblock": ""
+        "phpstan/phpdoc-parser": "To support extracting metadata from PHPDoc."
     },
     "extra": {
         "laravel": {