Skip to content
Closed

Sf6.1 #4799

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Bridge/Symfony/Bundle/Command/GraphQlExportCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
*/
class GraphQlExportCommand extends Command
{
protected static $defaultName = 'api:graphql:export';


private $schemaBuilder;

public function __construct(SchemaBuilderInterface $schemaBuilder)
Expand All @@ -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');
Expand Down
4 changes: 2 additions & 2 deletions src/Bridge/Symfony/Bundle/Command/OpenApiCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
*/
final class OpenApiCommand extends Command
{
protected static $defaultName = 'api:openapi:export';


private $openApiFactory;
private $normalizer;

Expand All @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion src/Bridge/Symfony/Bundle/Command/SwaggerCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
*/
final class SwaggerCommand extends Command
{
protected static $defaultName = 'api:swagger:export';

private $normalizer;
private $resourceNameCollectionFactory;
Expand Down Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion src/GraphQl/Serializer/Exception/ErrorNormalizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Hal/Serializer/EntrypointNormalizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Hydra/Serializer/CollectionFiltersNormalizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Hydra/Serializer/CollectionNormalizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Hydra/Serializer/ErrorNormalizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/JsonApi/Serializer/EntrypointNormalizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/JsonApi/Serializer/ErrorNormalizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/JsonSchema/Command/JsonSchemaGenerateCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
*/
final class JsonSchemaGenerateCommand extends Command
{
protected static $defaultName = 'api:json-schema:generate';

private $schemaFactory;
private $formats;
Expand All @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion src/OpenApi/Serializer/OpenApiNormalizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Problem/Serializer/ErrorNormalizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Serializer/AbstractCollectionNormalizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Swagger/Serializer/ApiGatewayNormalizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Swagger/Serializer/DocumentationNormalizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down