refactor(json-schema): schema factory

Author: soyuka

src/Util/ResourceClassInfoTrait.php

@@ -14,8 +14,6 @@
 namespace ApiPlatform\Util;
 
 use ApiPlatform\Api\ResourceClassResolverInterface;
-use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
-use ApiPlatform\Exception\ResourceClassNotFoundException;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 
 /**
@@ -33,7 +31,7 @@ trait ResourceClassInfoTrait
     private $resourceClassResolver;
 
     /**
-     * @var ResourceMetadataFactoryInterface|ResourceMetadataCollectionFactoryInterface|null
+     * @var ResourceMetadataCollectionFactoryInterface|null
      */
     private $resourceMetadataFactory;
 
@@ -66,19 +64,10 @@ private function isResourceClass(string $class): bool
             return $this->resourceClassResolver->isResourceClass($class);
         }
 
-        if ($this->resourceMetadataFactory instanceof ResourceMetadataCollectionFactoryInterface) {
+        if ($this->resourceMetadataFactory) {
             return \count($this->resourceMetadataFactory->create($class)) > 0 ? true : false;
         }
 
-        // TODO: 3.0 remove
-        if ($this->resourceMetadataFactory instanceof ResourceMetadataFactoryInterface) {
-            try {
-                $this->resourceMetadataFactory->create($class);
-            } catch (ResourceClassNotFoundException $e) {
-                return false;
-            }
-        }
-
         // assume that it's a resource class
         return true;
     }

tests/JsonSchema/SchemaFactoryTest.php

@@ -109,11 +109,11 @@ public function testBuildSchemaForOperationWithOverriddenSerializerGroups(): voi
             AbstractNormalizer::ALLOW_EXTRA_ATTRIBUTES => false,
         ])->withShortName($shortName)->withValidationContext(['groups' => ['validation_groups_dummy_put']]);
         $resourceMetadataFactoryProphecy->create(OverriddenOperationDummy::class)
-                                        ->willReturn(
-                                            new ResourceMetadataCollection(OverriddenOperationDummy::class, [
-                                                (new ApiResource())->withOperations(new Operations(['put' => $operation])),
-                                            ])
-                                        );
+            ->willReturn(
+                new ResourceMetadataCollection(OverriddenOperationDummy::class, [
+                    (new ApiResource())->withOperations(new Operations(['put' => $operation])),
+                ])
+            );
 
         $serializerGroup = 'overridden_operation_dummy_put';
         $validationGroups = 'validation_groups_dummy_put';