chore: remove unused vars (#4875)

dannyvw · web-flow · commit 9c95c8b09317 · 2022-08-05T11:31:46.000+02:00
diff --git a/src/JsonSchema/SchemaFactory.php b/src/JsonSchema/SchemaFactory.php
@@ -295,7 +295,6 @@ private function getMetadata(string $className, string $type = Schema::TYPE_OUTP
             }
         }
 
-        $attribute = Schema::TYPE_OUTPUT === $type ? 'output' : 'input';
         $inputOrOutput = ['class' => $className];
 
         if ($operation) {
diff --git a/src/Symfony/EventListener/AddFormatListener.php b/src/Symfony/EventListener/AddFormatListener.php
@@ -16,7 +16,6 @@
 use ApiPlatform\Api\FormatMatcher;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\Util\OperationRequestInitiatorTrait;
-use ApiPlatform\Util\RequestAttributesExtractor;
 use Negotiation\Negotiator;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
@@ -56,7 +55,6 @@ public function onKernelRequest(RequestEvent $event): void
             return;
         }
 
-        $attributes = RequestAttributesExtractor::extractAttributes($request);
         $formats = $operation?->getOutputFormats() ?? $this->formats;
 
         $this->addRequestFormats($request, $formats);
diff --git a/src/Symfony/EventListener/ValidateListener.php b/src/Symfony/EventListener/ValidateListener.php
@@ -15,7 +15,6 @@
 
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\Util\OperationRequestInitiatorTrait;
-use ApiPlatform\Util\RequestAttributesExtractor;
 use ApiPlatform\Validator\Exception\ValidationException;
 use ApiPlatform\Validator\ValidatorInterface;
 use Symfony\Component\HttpFoundation\Response;
@@ -52,7 +51,6 @@ public function onKernelView(ViewEvent $event): void
             $controllerResult instanceof Response
             || $request->isMethodSafe()
             || $request->isMethod('DELETE')
-            || !($attributes = RequestAttributesExtractor::extractAttributes($request))
         ) {
             return;
         }
diff --git a/src/Symfony/Routing/IriConverter.php b/src/Symfony/Routing/IriConverter.php
@@ -86,12 +86,10 @@ public function getResourceFromIri(string $iri, array $context = [], ?Operation
         }
         $attributes = AttributesExtractor::extractAttributes($parameters);
 
-        if ($operation instanceof HttpOperation) {
-            try {
-                $uriVariables = $this->getOperationUriVariables($operation, $parameters, $attributes['resource_class']);
-            } catch (InvalidIdentifierException $e) {
-                throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
-            }
+        try {
+            $uriVariables = $this->getOperationUriVariables($operation, $parameters, $attributes['resource_class']);
+        } catch (InvalidIdentifierException $e) {
+            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
         }
 
         if ($item = $this->provider->provide($operation, $uriVariables, $context)) {
@@ -134,7 +132,7 @@ public function getIriFromResource($item, int $referenceType = UrlGeneratorInter
             $forceCollection = $operation instanceof CollectionOperationInterface;
             try {
                 $operation = $this->resourceMetadataCollectionFactory->create($resourceClass)->getOperation(null, $forceCollection, true);
-            } catch (OperationNotFoundException $e) {
+            } catch (OperationNotFoundException) {
             }
         }
 
diff --git a/tests/Doctrine/Common/Filter/ExistsFilterTestTrait.php b/tests/Doctrine/Common/Filter/ExistsFilterTestTrait.php
@@ -20,7 +20,7 @@ trait ExistsFilterTestTrait
 {
     public function testGetDescription(): void
     {
-        $filter = $filter = $this->buildFilter(['name' => null, 'description' => null]);
+        $filter = $this->buildFilter(['name' => null, 'description' => null]);
 
         $this->assertEquals([
             'exists[description]' => [
diff --git a/tests/Doctrine/EventListener/PurgeHttpCacheListenerTest.php b/tests/Doctrine/EventListener/PurgeHttpCacheListenerTest.php
@@ -188,8 +188,6 @@ public function testNotAResourceClass(): void
         $resourceClassResolverProphecy->getResourceClass(Argument::type(ContainNonResource::class))->willReturn(ContainNonResource::class)->shouldBeCalled();
         $resourceClassResolverProphecy->isResourceClass(NotAResource::class)->willReturn(false)->shouldBeCalled();
 
-        $emProphecy = $this->prophesize(EntityManagerInterface::class);
-
         $uowProphecy = $this->prophesize(UnitOfWork::class);
         $uowProphecy->getScheduledEntityInsertions()->willReturn([$containNonResource])->shouldBeCalled();
         $uowProphecy->getScheduledEntityUpdates()->willReturn([])->shouldBeCalled();
diff --git a/tests/Fixtures/TestBundle/GraphQl/Resolver/UploadMultipleMediaObjectResolver.php b/tests/Fixtures/TestBundle/GraphQl/Resolver/UploadMultipleMediaObjectResolver.php
@@ -39,7 +39,7 @@ public function __invoke($item, array $context): MediaObject
 
         // Some process to save the files.
 
-        foreach ($context['args']['input']['files'] as $key => $uploadedFile) {
+        foreach ($uploadedFiles as $key => $uploadedFile) {
             $mediaObject = new MediaObject();
             $mediaObject->id = $key;
             $mediaObject->contentUrl = $uploadedFile->getFilename();
diff --git a/tests/GraphQl/Resolver/Factory/ItemMutationResolverFactoryTest.php b/tests/GraphQl/Resolver/Factory/ItemMutationResolverFactoryTest.php
@@ -124,20 +124,18 @@ public function testResolveNullResourceClass(): void
     {
         $resourceClass = null;
         $rootClass = 'rootClass';
-        $operationName = 'create';
-        $operation = (new Mutation())->withName($operationName);
+        $operation = (new Mutation())->withName('create');
         $source = ['source'];
         $args = ['args'];
         $info = $this->prophesize(ResolveInfo::class)->reveal();
 
         $this->assertNull(($this->itemMutationResolverFactory)($resourceClass, $rootClass, $operation)($source, $args, null, $info));
     }
 
-    public function testResolveNullOperationName(): void
+    public function testResolveNullOperation(): void
     {
         $resourceClass = \stdClass::class;
         $rootClass = 'rootClass';
-        $operationName = null;
         $source = ['source'];
         $args = ['args'];
         $info = $this->prophesize(ResolveInfo::class)->reveal();
diff --git a/tests/GraphQl/Resolver/Stage/ReadStageTest.php b/tests/GraphQl/Resolver/Stage/ReadStageTest.php
@@ -18,7 +18,6 @@
 use ApiPlatform\GraphQl\Resolver\Stage\ReadStage;
 use ApiPlatform\GraphQl\Serializer\ItemNormalizer;
 use ApiPlatform\GraphQl\Serializer\SerializerContextBuilderInterface;
-use ApiPlatform\Metadata\GetCollection;
 use ApiPlatform\Metadata\GraphQl\Mutation;
 use ApiPlatform\Metadata\GraphQl\Operation;
 use ApiPlatform\Metadata\GraphQl\Query;
@@ -202,8 +201,6 @@ public function testApplyCollection(array $args, ?string $rootClass, ?array $sou
             'source' => $source,
         ];
 
-        $collectionOperation = (new GetCollection())->withFilters($expectedFilters);
-
         /** @var Operation $operation */
         $operation = (new QueryCollection())->withName($operationName);
         $normalizationContext = ['normalization' => true, 'operation' => $operation];
@@ -237,7 +234,7 @@ public function testPreserveOrderOfOrderFiltersIfNested(): void
             'info' => $info,
             'source' => null,
         ];
-        $collectionOperation = (new GetCollection());
+
         /** @var Operation $operation */
         $operation = (new QueryCollection())->withName($operationName);
 
diff --git a/tests/GraphQl/Resolver/Stage/SecurityPostDenormalizeStageTest.php b/tests/GraphQl/Resolver/Stage/SecurityPostDenormalizeStageTest.php
@@ -49,7 +49,6 @@ protected function setUp(): void
 
     public function testNoSecurity(): void
     {
-        $operationName = 'item_query';
         $resourceClass = 'myResource';
         $operation = new Query();
 
diff --git a/tests/GraphQl/Resolver/Stage/SerializeStageTest.php b/tests/GraphQl/Resolver/Stage/SerializeStageTest.php
@@ -57,7 +57,6 @@ protected function setUp(): void
      */
     public function testApplyDisabled(array $context, bool $paginationEnabled, ?array $expectedResult): void
     {
-        $operationName = 'item_query';
         $resourceClass = 'myResource';
         /** @var Operation $operation */
         $operation = (new Query())->withSerialize(false);
diff --git a/tests/GraphQl/Resolver/Stage/WriteStageTest.php b/tests/GraphQl/Resolver/Stage/WriteStageTest.php
@@ -51,7 +51,6 @@ protected function setUp(): void
     public function testNoData(): void
     {
         $resourceClass = 'myResource';
-        $operationName = 'item_query';
         /** @var Operation $operation */
         $operation = (new Query())->withName('item_query');
 
@@ -62,7 +61,6 @@ public function testNoData(): void
 
     public function testApplyDisabled(): void
     {
-        $operationName = 'item_query';
         $resourceClass = 'myResource';
         /** @var Operation $operation */
         $operation = (new Query())->withName('item_query')->withWrite(false);
diff --git a/tests/Symfony/Bundle/Test/ApiTestCaseTest.php b/tests/Symfony/Bundle/Test/ApiTestCaseTest.php
@@ -122,7 +122,7 @@ public function testAssertMatchesJsonSchema(): void
 }
 JSON;
 
-        $res = self::createClient()->request('GET', '/');
+        self::createClient()->request('GET', '/');
         $this->assertMatchesJsonSchema($jsonSchema);
         $this->assertMatchesJsonSchema(json_decode($jsonSchema, true));
     }
diff --git a/tests/Symfony/Routing/ApiLoaderTest.php b/tests/Symfony/Routing/ApiLoaderTest.php
@@ -285,8 +285,6 @@ private function getApiLoaderWithResourceMetadataCollection(ResourceMetadataColl
 
     private function getRoute(string $path, string $controller, ?bool $stateless, string $resourceClass, array $identifiers, string $operationName, array $extraDefaults = [], array $methods = [], array $requirements = [], array $options = [], string $host = '', array $schemes = [], string $condition = ''): Route
     {
-        $isCollection = str_contains($operationName, 'collection');
-
         return new Route(
             $path,
             [
diff --git a/tests/Symfony/Routing/IriConverterTest.php b/tests/Symfony/Routing/IriConverterTest.php
@@ -14,7 +14,6 @@
 namespace ApiPlatform\Tests\Symfony\Routing;
 
 use ApiPlatform\Api\IdentifiersExtractorInterface;
-use ApiPlatform\Api\IriConverterInterface;
 use ApiPlatform\Api\ResourceClassResolverInterface;
 use ApiPlatform\Api\UrlGeneratorInterface;
 use ApiPlatform\Exception\InvalidArgumentException;
@@ -281,8 +280,6 @@ private function getIriConverter(?ObjectProphecy $stateProviderProphecy = null,
             $resourceMetadataCollectionFactoryProphecy = $this->prophesize(ResourceMetadataCollectionFactoryInterface::class);
         }
 
-        $iriConverter = $this->prophesize(IriConverterInterface::class);
-
         return new IriConverter($stateProviderProphecy->reveal(), $routerProphecy->reveal(), $identifiersExtractorProphecy->reveal(), $this->getResourceClassResolver(), $resourceMetadataCollectionFactoryProphecy->reveal(), $uriVariablesConverter);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,6 @@ private function getMetadata(string $className, string $type = Schema::TYPE_OUTP`
`295`	`295`	`}`
`296`	`296`	`}`
`297`	`297`
`298`		`- $attribute = Schema::TYPE_OUTPUT === $type ? 'output' : 'input';`
`299`	`298`	`$inputOrOutput = ['class' => $className];`
`300`	`299`
`301`	`300`	`if ($operation) {`
Original file line number	Diff line number	Diff line change
`@@ -86,12 +86,10 @@ public function getResourceFromIri(string $iri, array $context = [], ?Operation`
`86`	`86`	`}`
`87`	`87`	`$attributes = AttributesExtractor::extractAttributes($parameters);`
`88`	`88`
`89`		`- if ($operation instanceof HttpOperation) {`
`90`		`- try {`
`91`		`- $uriVariables = $this->getOperationUriVariables($operation, $parameters, $attributes['resource_class']);`
`92`		`- } catch (InvalidIdentifierException $e) {`
`93`		`- throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);`
`94`		`- }`
	`89`	`+ try {`
	`90`	`+ $uriVariables = $this->getOperationUriVariables($operation, $parameters, $attributes['resource_class']);`
	`91`	`+ } catch (InvalidIdentifierException $e) {`
	`92`	`+ throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);`
`95`	`93`	`}`
`96`	`94`
`97`	`95`	`if ($item = $this->provider->provide($operation, $uriVariables, $context)) {`
`@@ -134,7 +132,7 @@ public function getIriFromResource($item, int $referenceType = UrlGeneratorInter`
`134`	`132`	`$forceCollection = $operation instanceof CollectionOperationInterface;`
`135`	`133`	`try {`
`136`	`134`	`$operation = $this->resourceMetadataCollectionFactory->create($resourceClass)->getOperation(null, $forceCollection, true);`
`137`		`- } catch (OperationNotFoundException $e) {`
	`135`	`+ } catch (OperationNotFoundException) {`
`138`	`136`	`}`
`139`	`137`	`}`
`140`	`138`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ trait ExistsFilterTestTrait`
`20`	`20`	`{`
`21`	`21`	`public function testGetDescription(): void`
`22`	`22`	`{`
`23`		`- $filter = $filter = $this->buildFilter(['name' => null, 'description' => null]);`
	`23`	`+ $filter = $this->buildFilter(['name' => null, 'description' => null]);`
`24`	`24`
`25`	`25`	`$this->assertEquals([`
`26`	`26`	`'exists[description]' => [`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ protected function setUp(): void`
`49`	`49`
`50`	`50`	`public function testNoSecurity(): void`
`51`	`51`	`{`
`52`		`- $operationName = 'item_query';`
`53`	`52`	`$resourceClass = 'myResource';`
`54`	`53`	`$operation = new Query();`
`55`	`54`