Merge 4.0

Author: soyuka

src/Laravel/ApiPlatformProvider.php

@@ -19,6 +19,8 @@
 use ApiPlatform\GraphQl\ExecutorInterface;
 use ApiPlatform\GraphQl\Resolver\Factory\ResolverFactory;
 use ApiPlatform\GraphQl\Resolver\Factory\ResolverFactoryInterface;
+use ApiPlatform\GraphQl\Resolver\QueryCollectionResolverInterface;
+use ApiPlatform\GraphQl\Resolver\QueryItemResolverInterface;
 use ApiPlatform\GraphQl\Resolver\ResourceFieldResolver;
 use ApiPlatform\GraphQl\Serializer\Exception\ErrorNormalizer as GraphQlErrorNormalizer;
 use ApiPlatform\GraphQl\Serializer\Exception\HttpExceptionNormalizer as GraphQlHttpExceptionNormalizer;
@@ -1194,10 +1196,12 @@ private function registerGraphQl(Application $app): void
 
         $app->singleton(ResolverProvider::class, function (Application $app) {
             $resolvers = iterator_to_array($app->tagged('api_platform.graphql.resolver'));
+            $taggedItemResolvers = iterator_to_array($app->tagged(QueryItemResolverInterface::class));
+            $taggedCollectionResolvers = iterator_to_array($app->tagged(QueryCollectionResolverInterface::class));
 
             return new ResolverProvider(
                 $app->make(GraphQlReadProvider::class),
-                new ServiceLocator($resolvers),
+                new ServiceLocator([...$resolvers, ...$taggedItemResolvers, ...$taggedCollectionResolvers]),
             );
         });
 

src/Laravel/workbench/app/Providers/WorkbenchServiceProvider.php

@@ -18,8 +18,8 @@
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\ServiceProvider;
 use Orchestra\Testbench\Foundation\Events\ServeCommandStarted;
+use Orchestra\Testbench\Workbench\Actions\AddAssetSymlinkFolders;
 use Orchestra\Testbench\Workbench\Workbench;
-use Orchestra\Workbench\Listeners\AddAssetSymlinkFolders;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 
@@ -40,7 +40,7 @@ public function register(): void
      */
     public function boot(): void
     {
-        $assets = new AddAssetSymlinkFolders(Workbench::configuration(), $this->app->make(Filesystem::class));
+        $assets = new AddAssetSymlinkFolders($this->app->make(Filesystem::class), Workbench::configuration());
         $input = new ArrayInput([]);
         $output = new NullOutput();
         $assets->handle(new ServeCommandStarted($input, $output, new Factory(new OutputStyle($input, $output))));