From ac16081cb72bbc3a8e8103a89426704e5175a4b7 Mon Sep 17 00:00:00 2001 From: Maikel Ortega Hernandez Date: Wed, 22 Jun 2022 01:51:23 -0500 Subject: [PATCH 1/3] sf6.1 command deprecations remove --- src/Bridge/Symfony/Bundle/Command/GraphQlExportCommand.php | 4 ++-- src/Bridge/Symfony/Bundle/Command/OpenApiCommand.php | 4 ++-- src/Bridge/Symfony/Bundle/Command/SwaggerCommand.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Bridge/Symfony/Bundle/Command/GraphQlExportCommand.php b/src/Bridge/Symfony/Bundle/Command/GraphQlExportCommand.php index acdfa39fde6..4e04effd8bb 100644 --- a/src/Bridge/Symfony/Bundle/Command/GraphQlExportCommand.php +++ b/src/Bridge/Symfony/Bundle/Command/GraphQlExportCommand.php @@ -30,8 +30,7 @@ */ class GraphQlExportCommand extends Command { - protected static $defaultName = 'api:graphql:export'; - + private $schemaBuilder; public function __construct(SchemaBuilderInterface $schemaBuilder) @@ -47,6 +46,7 @@ public function __construct(SchemaBuilderInterface $schemaBuilder) protected function configure(): void { $this + ->setName('api:graphql:export') ->setDescription('Export the GraphQL schema in Schema Definition Language (SDL)') ->addOption('comment-descriptions', null, InputOption::VALUE_NONE, 'Use preceding comments as the description') ->addOption('output', 'o', InputOption::VALUE_REQUIRED, 'Write output to file'); diff --git a/src/Bridge/Symfony/Bundle/Command/OpenApiCommand.php b/src/Bridge/Symfony/Bundle/Command/OpenApiCommand.php index 68314d55098..ec9394168be 100644 --- a/src/Bridge/Symfony/Bundle/Command/OpenApiCommand.php +++ b/src/Bridge/Symfony/Bundle/Command/OpenApiCommand.php @@ -29,8 +29,7 @@ */ final class OpenApiCommand extends Command { - protected static $defaultName = 'api:openapi:export'; - + private $openApiFactory; private $normalizer; @@ -47,6 +46,7 @@ public function __construct(OpenApiFactoryInterface $openApiFactory, NormalizerI protected function configure() { $this + ->setName('api:openapi:export') ->setDescription('Dump the Open API documentation') ->addOption('yaml', 'y', InputOption::VALUE_NONE, 'Dump the documentation in YAML') ->addOption('output', 'o', InputOption::VALUE_OPTIONAL, 'Write output to file') diff --git a/src/Bridge/Symfony/Bundle/Command/SwaggerCommand.php b/src/Bridge/Symfony/Bundle/Command/SwaggerCommand.php index 61198eaceb5..3f9c7ee15bc 100644 --- a/src/Bridge/Symfony/Bundle/Command/SwaggerCommand.php +++ b/src/Bridge/Symfony/Bundle/Command/SwaggerCommand.php @@ -33,7 +33,6 @@ */ final class SwaggerCommand extends Command { - protected static $defaultName = 'api:swagger:export'; private $normalizer; private $resourceNameCollectionFactory; @@ -69,6 +68,7 @@ public function __construct(NormalizerInterface $normalizer, ResourceNameCollect protected function configure() { $this + ->setName('api:swagger:export') ->setDescription('Dump the Swagger v2 documentation') ->addOption('yaml', 'y', InputOption::VALUE_NONE, 'Dump the documentation in YAML') ->addOption('spec-version', null, InputOption::VALUE_OPTIONAL, sprintf('OpenAPI version to use (%s)', implode(' or ', $this->swaggerVersions)), (string) ($this->swaggerVersions[0] ?? 2)) From 4ffab931802739c50da1e92caa3a4905a9322109 Mon Sep 17 00:00:00 2001 From: Maikel Ortega Hernandez Date: Wed, 22 Jun 2022 02:01:57 -0500 Subject: [PATCH 2/3] fix deprecation on JsonSchemaGenerateCommand --- src/JsonSchema/Command/JsonSchemaGenerateCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/JsonSchema/Command/JsonSchemaGenerateCommand.php b/src/JsonSchema/Command/JsonSchemaGenerateCommand.php index 9be6a2c03d3..3de04e22143 100644 --- a/src/JsonSchema/Command/JsonSchemaGenerateCommand.php +++ b/src/JsonSchema/Command/JsonSchemaGenerateCommand.php @@ -31,7 +31,6 @@ */ final class JsonSchemaGenerateCommand extends Command { - protected static $defaultName = 'api:json-schema:generate'; private $schemaFactory; private $formats; @@ -50,6 +49,7 @@ public function __construct(SchemaFactoryInterface $schemaFactory, array $format protected function configure() { $this + ->setName('api:json-schema:generate') ->setDescription('Generates the JSON Schema for a resource operation.') ->addArgument('resource', InputArgument::REQUIRED, 'The Fully Qualified Class Name (FQCN) of the resource') ->addOption('itemOperation', null, InputOption::VALUE_REQUIRED, 'The item operation') From f57519e154b1585e4df594dff4a77d2a72a26bff Mon Sep 17 00:00:00 2001 From: Maikel Ortega Hernandez Date: Sun, 26 Jun 2022 14:52:14 -0500 Subject: [PATCH 3/3] removed deprecations alerts sf6.1 --- src/GraphQl/Serializer/Exception/ErrorNormalizer.php | 2 +- src/GraphQl/Serializer/Exception/HttpExceptionNormalizer.php | 2 +- src/GraphQl/Serializer/Exception/RuntimeExceptionNormalizer.php | 2 +- .../Serializer/Exception/ValidationExceptionNormalizer.php | 2 +- src/Hal/Serializer/EntrypointNormalizer.php | 2 +- src/Hydra/Serializer/CollectionFiltersNormalizer.php | 2 +- src/Hydra/Serializer/CollectionNormalizer.php | 2 +- src/Hydra/Serializer/ErrorNormalizer.php | 2 +- src/JsonApi/Serializer/ConstraintViolationListNormalizer.php | 2 +- src/JsonApi/Serializer/EntrypointNormalizer.php | 2 +- src/JsonApi/Serializer/ErrorNormalizer.php | 2 +- src/OpenApi/Serializer/OpenApiNormalizer.php | 2 +- src/Problem/Serializer/ErrorNormalizer.php | 2 +- src/Serializer/AbstractCollectionNormalizer.php | 2 +- src/Serializer/AbstractConstraintViolationListNormalizer.php | 2 +- src/Swagger/Serializer/ApiGatewayNormalizer.php | 2 +- src/Swagger/Serializer/DocumentationNormalizer.php | 2 +- .../Serializer/Normalizer/OverrideDocumentationNormalizer.php | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/GraphQl/Serializer/Exception/ErrorNormalizer.php b/src/GraphQl/Serializer/Exception/ErrorNormalizer.php index 05b214f1c58..172411a8d43 100644 --- a/src/GraphQl/Serializer/Exception/ErrorNormalizer.php +++ b/src/GraphQl/Serializer/Exception/ErrorNormalizer.php @@ -37,7 +37,7 @@ public function normalize($object, $format = null, array $context = []): array /** * {@inheritdoc} */ - public function supportsNormalization($data, $format = null): bool + public function supportsNormalization($data, $format = null, array $context = []): bool { return $data instanceof Error; } diff --git a/src/GraphQl/Serializer/Exception/HttpExceptionNormalizer.php b/src/GraphQl/Serializer/Exception/HttpExceptionNormalizer.php index 4c7e97c2b90..0f3e20b2f90 100644 --- a/src/GraphQl/Serializer/Exception/HttpExceptionNormalizer.php +++ b/src/GraphQl/Serializer/Exception/HttpExceptionNormalizer.php @@ -45,7 +45,7 @@ public function normalize($object, $format = null, array $context = []): array /** * {@inheritdoc} */ - public function supportsNormalization($data, $format = null): bool + public function supportsNormalization($data, $format = null, array $context = []): bool { return $data instanceof Error && $data->getPrevious() instanceof HttpExceptionInterface; } diff --git a/src/GraphQl/Serializer/Exception/RuntimeExceptionNormalizer.php b/src/GraphQl/Serializer/Exception/RuntimeExceptionNormalizer.php index 61bc85fe7e8..b06cdba318b 100644 --- a/src/GraphQl/Serializer/Exception/RuntimeExceptionNormalizer.php +++ b/src/GraphQl/Serializer/Exception/RuntimeExceptionNormalizer.php @@ -42,7 +42,7 @@ public function normalize($object, $format = null, array $context = []): array /** * {@inheritdoc} */ - public function supportsNormalization($data, $format = null): bool + public function supportsNormalization($data, $format = null, array $context = []): bool { return $data instanceof Error && $data->getPrevious() instanceof \RuntimeException; } diff --git a/src/GraphQl/Serializer/Exception/ValidationExceptionNormalizer.php b/src/GraphQl/Serializer/Exception/ValidationExceptionNormalizer.php index f00473ff966..40c2daac242 100644 --- a/src/GraphQl/Serializer/Exception/ValidationExceptionNormalizer.php +++ b/src/GraphQl/Serializer/Exception/ValidationExceptionNormalizer.php @@ -75,7 +75,7 @@ public function normalize($object, $format = null, array $context = []): array /** * {@inheritdoc} */ - public function supportsNormalization($data, $format = null): bool + public function supportsNormalization($data, $format = null, array $context = []): bool { return $data instanceof Error && $data->getPrevious() instanceof ValidationException; } diff --git a/src/Hal/Serializer/EntrypointNormalizer.php b/src/Hal/Serializer/EntrypointNormalizer.php index 556eed3b00c..451573000ad 100644 --- a/src/Hal/Serializer/EntrypointNormalizer.php +++ b/src/Hal/Serializer/EntrypointNormalizer.php @@ -69,7 +69,7 @@ public function normalize($object, $format = null, array $context = []) /** * {@inheritdoc} */ - public function supportsNormalization($data, $format = null): bool + public function supportsNormalization($data, $format = null, array $context = []): bool { return self::FORMAT === $format && $data instanceof Entrypoint; } diff --git a/src/Hydra/Serializer/CollectionFiltersNormalizer.php b/src/Hydra/Serializer/CollectionFiltersNormalizer.php index 18d2cad2d71..46f918583e6 100644 --- a/src/Hydra/Serializer/CollectionFiltersNormalizer.php +++ b/src/Hydra/Serializer/CollectionFiltersNormalizer.php @@ -52,7 +52,7 @@ public function __construct(NormalizerInterface $collectionNormalizer, ResourceM /** * {@inheritdoc} */ - public function supportsNormalization($data, $format = null): bool + public function supportsNormalization($data, $format = null, array $context = []): bool { return $this->collectionNormalizer->supportsNormalization($data, $format); } diff --git a/src/Hydra/Serializer/CollectionNormalizer.php b/src/Hydra/Serializer/CollectionNormalizer.php index 2040f0332aa..c7f3590b2d6 100644 --- a/src/Hydra/Serializer/CollectionNormalizer.php +++ b/src/Hydra/Serializer/CollectionNormalizer.php @@ -59,7 +59,7 @@ public function __construct(ContextBuilderInterface $contextBuilder, ResourceCla /** * {@inheritdoc} */ - public function supportsNormalization($data, $format = null): bool + public function supportsNormalization($data, $format = null, array $context = []): bool { return self::FORMAT === $format && is_iterable($data); } diff --git a/src/Hydra/Serializer/ErrorNormalizer.php b/src/Hydra/Serializer/ErrorNormalizer.php index 6b071eb8a29..0b0fcef5a09 100644 --- a/src/Hydra/Serializer/ErrorNormalizer.php +++ b/src/Hydra/Serializer/ErrorNormalizer.php @@ -68,7 +68,7 @@ public function normalize($object, $format = null, array $context = []) /** * {@inheritdoc} */ - public function supportsNormalization($data, $format = null): bool + public function supportsNormalization($data, $format = null, array $context = []): bool { return self::FORMAT === $format && ($data instanceof \Exception || $data instanceof FlattenException || $data instanceof LegacyFlattenException); } diff --git a/src/JsonApi/Serializer/ConstraintViolationListNormalizer.php b/src/JsonApi/Serializer/ConstraintViolationListNormalizer.php index 4573f56cca7..850304568cd 100644 --- a/src/JsonApi/Serializer/ConstraintViolationListNormalizer.php +++ b/src/JsonApi/Serializer/ConstraintViolationListNormalizer.php @@ -62,7 +62,7 @@ public function normalize($object, $format = null, array $context = []) /** * {@inheritdoc} */ - public function supportsNormalization($data, $format = null): bool + public function supportsNormalization($data, $format = null, array $context = []): bool { return self::FORMAT === $format && $data instanceof ConstraintViolationListInterface; } diff --git a/src/JsonApi/Serializer/EntrypointNormalizer.php b/src/JsonApi/Serializer/EntrypointNormalizer.php index 3edda694427..d59e4e03571 100644 --- a/src/JsonApi/Serializer/EntrypointNormalizer.php +++ b/src/JsonApi/Serializer/EntrypointNormalizer.php @@ -71,7 +71,7 @@ public function normalize($object, $format = null, array $context = []) /** * {@inheritdoc} */ - public function supportsNormalization($data, $format = null): bool + public function supportsNormalization($data, $format = null, array $context = []): bool { return self::FORMAT === $format && $data instanceof Entrypoint; } diff --git a/src/JsonApi/Serializer/ErrorNormalizer.php b/src/JsonApi/Serializer/ErrorNormalizer.php index 84e24d7bc84..db8bf0052b3 100644 --- a/src/JsonApi/Serializer/ErrorNormalizer.php +++ b/src/JsonApi/Serializer/ErrorNormalizer.php @@ -69,7 +69,7 @@ public function normalize($object, $format = null, array $context = []) /** * {@inheritdoc} */ - public function supportsNormalization($data, $format = null): bool + public function supportsNormalization($data, $format = null, array $context = []): bool { return self::FORMAT === $format && ($data instanceof \Exception || $data instanceof FlattenException || $data instanceof LegacyFlattenException); } diff --git a/src/OpenApi/Serializer/OpenApiNormalizer.php b/src/OpenApi/Serializer/OpenApiNormalizer.php index db37bffbb2a..bdce3f3166d 100644 --- a/src/OpenApi/Serializer/OpenApiNormalizer.php +++ b/src/OpenApi/Serializer/OpenApiNormalizer.php @@ -74,7 +74,7 @@ private function recursiveClean($data): array /** * {@inheritdoc} */ - public function supportsNormalization($data, $format = null): bool + public function supportsNormalization($data, $format = null, array $context = []): bool { return self::FORMAT === $format && $data instanceof OpenApi; } diff --git a/src/Problem/Serializer/ErrorNormalizer.php b/src/Problem/Serializer/ErrorNormalizer.php index 17e98cb5df5..e8cd8213553 100644 --- a/src/Problem/Serializer/ErrorNormalizer.php +++ b/src/Problem/Serializer/ErrorNormalizer.php @@ -67,7 +67,7 @@ public function normalize($object, $format = null, array $context = []) /** * {@inheritdoc} */ - public function supportsNormalization($data, $format = null): bool + public function supportsNormalization($data, $format = null, array $context = []): bool { return self::FORMAT === $format && ($data instanceof \Exception || $data instanceof FlattenException || $data instanceof LegacyFlattenException); } diff --git a/src/Serializer/AbstractCollectionNormalizer.php b/src/Serializer/AbstractCollectionNormalizer.php index 2e947f8c147..1149bd921a9 100644 --- a/src/Serializer/AbstractCollectionNormalizer.php +++ b/src/Serializer/AbstractCollectionNormalizer.php @@ -55,7 +55,7 @@ public function __construct(ResourceClassResolverInterface $resourceClassResolve * * @return bool */ - public function supportsNormalization($data, $format = null) + public function supportsNormalization($data, $format = null, array $context = []) { return static::FORMAT === $format && is_iterable($data); } diff --git a/src/Serializer/AbstractConstraintViolationListNormalizer.php b/src/Serializer/AbstractConstraintViolationListNormalizer.php index fba79004543..ffd333919b1 100644 --- a/src/Serializer/AbstractConstraintViolationListNormalizer.php +++ b/src/Serializer/AbstractConstraintViolationListNormalizer.php @@ -42,7 +42,7 @@ public function __construct(array $serializePayloadFields = null, NameConverterI /** * {@inheritdoc} */ - public function supportsNormalization($data, $format = null): bool + public function supportsNormalization($data, $format = null, array $context = []): bool { return static::FORMAT === $format && $data instanceof ConstraintViolationListInterface; } diff --git a/src/Swagger/Serializer/ApiGatewayNormalizer.php b/src/Swagger/Serializer/ApiGatewayNormalizer.php index c7ab8037474..64dc5269803 100644 --- a/src/Swagger/Serializer/ApiGatewayNormalizer.php +++ b/src/Swagger/Serializer/ApiGatewayNormalizer.php @@ -120,7 +120,7 @@ public function normalize($object, $format = null, array $context = []) /** * {@inheritdoc} */ - public function supportsNormalization($data, $format = null): bool + public function supportsNormalization($data, $format = null, array $context = []): bool { return $this->documentationNormalizer->supportsNormalization($data, $format); } diff --git a/src/Swagger/Serializer/DocumentationNormalizer.php b/src/Swagger/Serializer/DocumentationNormalizer.php index 2357f7bf888..c91360eaa57 100644 --- a/src/Swagger/Serializer/DocumentationNormalizer.php +++ b/src/Swagger/Serializer/DocumentationNormalizer.php @@ -797,7 +797,7 @@ private function getFiltersParameters(bool $v3, string $resourceClass, string $o /** * {@inheritdoc} */ - public function supportsNormalization($data, $format = null): bool + public function supportsNormalization($data, $format = null, array $context = []): bool { return self::FORMAT === $format && ($data instanceof Documentation || $this->openApiNormalizer && $data instanceof OpenApi); } diff --git a/tests/Fixtures/TestBundle/Serializer/Normalizer/OverrideDocumentationNormalizer.php b/tests/Fixtures/TestBundle/Serializer/Normalizer/OverrideDocumentationNormalizer.php index fa6414d7ecc..7535a4f5953 100644 --- a/tests/Fixtures/TestBundle/Serializer/Normalizer/OverrideDocumentationNormalizer.php +++ b/tests/Fixtures/TestBundle/Serializer/Normalizer/OverrideDocumentationNormalizer.php @@ -54,7 +54,7 @@ public function normalize($object, $format = null, array $context = []) * @param mixed|null $format * @param mixed $data */ - public function supportsNormalization($data, $format = null): bool + public function supportsNormalization($data, $format = null, array $context = []): bool { return $this->documentationNormalizer->supportsNormalization($data, $format); }