Merge 4.1 into main

Author: soyuka

.github/workflows/ci.yml

@@ -3,6 +3,8 @@ name: CI
 on:
   push:
   pull_request:
+  pull_request_target:
+    types: [opened, reopened, synchronize]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -14,24 +16,22 @@ env:
 
 jobs:
   commitlint:
-    if: github.event_name == 'pull_request'
-    env:
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    if: github.event_name == 'pull_request_target'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Run commitlint
         run: |
-            commit=$(gh api \
-              /repos/${{ github.repository }}/pulls/${{github.event.number}}/commits \
-              | jq -r '.[0].commit.message' \
-              | head -n 1)
+            base_sha="${{ github.event.pull_request.base.sha }}"
+            head_sha="${{ github.event.pull_request.head.sha }}"
+            first_commit_sha=$(git rev-list --no-merges --reverse $base_sha..$head_sha | head -n 1)
+            commit_message=$(git log -1 --pretty=%B $first_commit_sha)
             # we can't use npx see https://github.com/conventional-changelog/commitlint/issues/613
             echo '{}' > package.json
             npm install --no-fund --no-audit @commitlint/config-conventional @commitlint/cli
-            echo $commit | ./node_modules/.bin/commitlint -g .commitlintrc
+            echo "$commit_message" | ./node_modules/.bin/commitlint -g .commitlintrc
 
   architecture:
     name: Check components interdependencies
@@ -1050,7 +1050,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - '8.3'
+          - '8.4'
       fail-fast: false
     env:
       APP_ENV: sqlite
@@ -1063,20 +1063,13 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           tools: pecl, composer
-          extensions: intl, bcmath, curl, openssl, mbstring, pdo_sqlite, fileinfo
+          extensions: intl, bcmath, curl, openssl, mbstring, pdo_sqlite, fileinfo, mongodb
           coverage: none
           ini-values: memory_limit=-1
-      # Not in pecl
-      - name: Setup mongodb
-        run: |
-          curl -sLO https://github.com/mongodb/mongo-php-driver/releases/download/1.17.2/php_mongodb-1.17.2-8.3-nts-x64.zip
-          unzip -q php_mongodb-1.17.2-8.3-nts-x64.zip php_mongodb.dll
-          mv php_mongodb.dll C:\tools\php\ext
-          echo "extension=php_mongodb.dll" >> C:\tools\php\php.ini
       - name: Get composer cache directory
         id: composercache
-        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
         shell: bash
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
       - name: Cache dependencies
         uses: actions/cache@v4
         with:
@@ -1085,18 +1078,22 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
       - name: Keep windows path
         id: get-cwd
+        shell: bash
         run: |
           cwd=$(php -r 'echo(str_replace("\\", "\\\\", $_SERVER["argv"][1]));' '${{ github.workspace }}')
           echo cwd=$cwd >> $GITHUB_OUTPUT
-        shell: bash
       - name: Update project dependencies
+        shell: bash
         run: |
+          php -m
           composer global require soyuka/pmu
           composer global config allow-plugins.soyuka/pmu true --no-interaction
           composer global link . --working-directory='${{ steps.get-cwd.outputs.cwd }}'
       - name: Clear test app cache
+        shell: bash
         run: tests/Fixtures/app/console cache:clear --ansi
       - name: Run Behat tests
+        shell: bash
         run: vendor/bin/behat --out=std --format=progress --profile=default --no-interaction
 
   phpunit-symfony-lowest:

features/doctrine/issue6039/entity_class_option.feature

@@ -59,12 +59,8 @@ private function handleLinks(Builder $aggregationBuilder, array $identifiers, ar
     /**
      * @throws RuntimeException
      */
-    private function buildAggregation(string $toClass, array $links, array $identifiers, array $context, array $executeOptions, string $previousAggregationClass, Builder $previousAggregationBuilder, ?Operation $operation = null): Builder
+    private function buildAggregation(string $toClass, array $links, array $identifiers, array $context, array $executeOptions, string $previousAggregationClass, Builder $previousAggregationBuilder, Operation $operation): Builder
     {
-        if (!$operation) {
-            trigger_deprecation('api-platform/core', '3.2', 'In API Platform 4 the last argument "operation" will be required and this trait will be internal. Use the "handleLinks" feature instead.');
-        }
-
         if (\count($links) <= 0) {
             return $previousAggregationBuilder;
         }
@@ -88,10 +84,8 @@ private function buildAggregation(string $toClass, array $links, array $identifi
 
         $manager = $this->managerRegistry->getManagerForClass($aggregationClass);
         if (!$manager instanceof DocumentManager) {
-            if ($operation) {
-                $aggregationClass = $this->getLinkFromClass($link, $operation);
-                $manager = $this->managerRegistry->getManagerForClass($aggregationClass);
-            }
+            $aggregationClass = $this->getLinkFromClass($link, $operation);
+            $manager = $this->managerRegistry->getManagerForClass($aggregationClass);
 
             if (!$manager instanceof DocumentManager) {
                 throw new RuntimeException(\sprintf('The manager for "%s" must be an instance of "%s".', $aggregationClass, DocumentManager::class));

src/Doctrine/Odm/State/LinksHandlerTrait.php

@@ -41,12 +41,10 @@ public function __construct(
         private readonly SchemaBuilderInterface $schemaBuilder,
         private readonly ExecutorInterface $executor,
         private readonly ?GraphiQlAction $graphiQlAction,
-        private readonly ?GraphQlPlaygroundAction $graphQlPlaygroundAction,
         private readonly NormalizerInterface $normalizer,
         private readonly ErrorHandlerInterface $errorHandler,
         bool $debug = false,
         private readonly bool $graphiqlEnabled = false,
-        private readonly bool $graphQlPlaygroundEnabled = false,
         private readonly ?string $defaultIde = null,
         ?Negotiator $negotiator = null,
     ) {
@@ -64,10 +62,6 @@ public function __invoke(Request $request): Response
                 if ('graphiql' === $this->defaultIde && $this->graphiqlEnabled && $this->graphiQlAction) {
                     return ($this->graphiQlAction)($request);
                 }
-
-                if ('graphql-playground' === $this->defaultIde && $this->graphQlPlaygroundEnabled && $this->graphQlPlaygroundAction) {
-                    return ($this->graphQlPlaygroundAction)($request);
-                }
             }
 
             [$query, $operationName, $variables] = $this->parseRequest($request);

src/GraphQl/Action/EntrypointAction.php

@@ -15,7 +15,6 @@
 
 use ApiPlatform\GraphQl\Action\EntrypointAction;
 use ApiPlatform\GraphQl\Action\GraphiQlAction;
-use ApiPlatform\GraphQl\Action\GraphQlPlaygroundAction;
 use ApiPlatform\GraphQl\Error\ErrorHandler;
 use ApiPlatform\GraphQl\ExecutorInterface;
 use ApiPlatform\GraphQl\Serializer\Exception\ErrorNormalizer;
@@ -270,8 +269,7 @@ private function getEntrypointAction(array $variables = ['graphqlVariable']): En
         $routerProphecy->generate('api_graphql_entrypoint')->willReturn('/graphiql');
 
         $graphiQlAction = new GraphiQlAction($twigProphecy->reveal(), $routerProphecy->reveal(), true);
-        $graphQlPlaygroundAction = new GraphQlPlaygroundAction($twigProphecy->reveal(), $routerProphecy->reveal(), true);
 
-        return new EntrypointAction($schemaBuilderProphecy->reveal(), $executorProphecy->reveal(), $graphiQlAction, $graphQlPlaygroundAction, $normalizer, $errorHandler, false, true, true, 'graphiql');
+        return new EntrypointAction($schemaBuilderProphecy->reveal(), $executorProphecy->reveal(), $graphiQlAction, $normalizer, $errorHandler, false, true, 'graphiql');
     }
 }

src/GraphQl/Action/GraphQlPlaygroundAction.php

@@ -246,7 +246,11 @@ private function buildLegacyPropertySchema(Schema $schema, string $definitionNam
                 $subDefinitionName = $this->definitionNameFactory->create($className, $format, $className, null, $serializerContext);
 
                 if (isset($subSchema->getDefinitions()[$subDefinitionName])) {
-                    unset($subSchema->getDefinitions()[$subDefinitionName]['properties']['@id']);
+                    // @see https://github.com/api-platform/core/issues/7162
+                    // Need to rebuild the definition without @id property and set it back to the sub-schema
+                    $subSchemaDefinition = $subSchema->getDefinitions()[$subDefinitionName]->getArrayCopy();
+                    unset($subSchemaDefinition['properties']['@id']);
+                    $subSchema->getDefinitions()[$subDefinitionName] = new \ArrayObject($subSchemaDefinition);
                 }
             }
 

src/GraphQl/Tests/Action/EntrypointActionTest.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]
             );

src/GraphQl/Tests/Action/GraphQlPlaygroundActionTest.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
     {