Merge 3.4

Author: soyuka

.github/workflows/guides.yaml

@@ -43,8 +43,9 @@ jobs:
             -   name: Install project dependencies
                 working-directory: docs
                 run: |
-                    composer update --no-interaction --no-progress --ansi
-                    cp -r ../src ./vendor/api-platform/core/
+                    composer global require soyuka/pmu
+                    composer global config allow-plugins.soyuka/pmu true --no-interaction
+                    composer global link ..
             -   name: Test guides
                 working-directory: docs
                 env:

docs/composer.json

@@ -15,7 +15,8 @@
         }
     ],
     "require": {
-        "api-platform/core": "dev-main",
+        "api-platform/symfony": "^3.4 || ^4.0",
+        "api-platform/doctrine-orm": "^3.4 || ^4.0",
         "symfony/expression-language": "^7.0",
         "nelmio/cors-bundle": "^2.2",
         "phpstan/phpdoc-parser": "^1.15",
@@ -34,8 +35,7 @@
         "zenstruck/foundry": "^1.31",
         "symfony/http-client": "^7.0",
         "symfony/browser-kit": "^7.0",
-        "justinrainbow/json-schema": "^5.2",
-        "webonyx/graphql-php": "^15.11"
+        "justinrainbow/json-schema": "^5.2"
     },
     "config": {
         "allow-plugins": {

src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php

@@ -25,6 +25,7 @@
 use ApiPlatform\Doctrine\Orm\State\LinksHandlerInterface as OrmLinksHandlerInterface;
 use ApiPlatform\Elasticsearch\Extension\RequestBodySearchCollectionExtensionInterface;
 use ApiPlatform\GraphQl\Error\ErrorHandlerInterface;
+use ApiPlatform\GraphQl\Executor;
 use ApiPlatform\GraphQl\Resolver\MutationResolverInterface;
 use ApiPlatform\GraphQl\Resolver\QueryCollectionResolverInterface;
 use ApiPlatform\GraphQl\Resolver\QueryItemResolverInterface;
@@ -561,7 +562,6 @@ private function registerJsonProblemConfiguration(array $errorFormats, XmlFileLo
     private function registerGraphQlConfiguration(ContainerBuilder $container, array $config, XmlFileLoader $loader): void
     {
         $enabled = $this->isConfigEnabled($container, $config['graphql']);
-
         $graphqlIntrospectionEnabled = $enabled && $this->isConfigEnabled($container, $config['graphql']['introspection']);
 
         $graphiqlEnabled = $enabled && $this->isConfigEnabled($container, $config['graphql']['graphiql']);
@@ -580,6 +580,10 @@ private function registerGraphQlConfiguration(ContainerBuilder $container, array
             return;
         }
 
+        if (!class_exists(Executor::class)) {
+            throw new \RuntimeException('Graphql is enabled but not installed, run: composer require "api-platform/graphql".');
+        }
+
         $container->setParameter('api_platform.graphql.default_ide', $config['graphql']['default_ide']);
         $container->setParameter('api_platform.graphql.nesting_separator', $config['graphql']['nesting_separator']);
 

src/Symfony/composer.json

@@ -42,7 +42,8 @@
         "symfony/property-info": "^6.4 || ^7.1",
         "symfony/property-access": "^6.4 || ^7.1",
         "symfony/serializer": "^6.4 || ^7.1",
-        "symfony/security-core": "^6.4 || ^7.0"
+        "symfony/security-core": "^6.4 || ^7.0",
+        "willdurand/negotiation": "^3.0"
     },
     "require-dev": {
         "phpspec/prophecy-phpunit": "^2.2",