|
@@ -9,7 +9,7 @@ discard block |
|
|
block discarded – undo |
|
9
|
9
|
* file that was distributed with this source code. |
|
10
|
10
|
*/ |
|
11
|
11
|
|
|
12
|
|
-declare(strict_types=1); |
|
|
12
|
+declare(strict_types = 1); |
|
13
|
13
|
|
|
14
|
14
|
namespace ApiPlatform\Core\Swagger\Serializer; |
|
15
|
15
|
|
|
@@ -65,7 +65,7 @@ discard block |
|
|
block discarded – undo |
|
65
|
65
|
/** |
|
66
|
66
|
* @param ContainerInterface|FilterCollection|null $filterLocator The new filter locator or the deprecated filter collection |
|
67
|
67
|
*/ |
|
68
|
|
- public function __construct(ResourceMetadataFactoryInterface $resourceMetadataFactory, PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory, ResourceClassResolverInterface $resourceClassResolver, OperationMethodResolverInterface $operationMethodResolver, OperationPathResolverInterface $operationPathResolver, UrlGeneratorInterface $urlGenerator = null, $filterLocator = null, NameConverterInterface $nameConverter = null, $oauthEnabled = false, ?string $oauthType = '', ?string $oauthFlow = '', ?string $oauthTokenUrl = '', ?string $oauthAuthorizationUrl = '', array $oauthScopes = [], array $apiKeys = [], SubresourceOperationFactoryInterface $subresourceOperationFactory = null) |
|
|
68
|
+ public function __construct(ResourceMetadataFactoryInterface $resourceMetadataFactory, PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory, ResourceClassResolverInterface $resourceClassResolver, OperationMethodResolverInterface $operationMethodResolver, OperationPathResolverInterface $operationPathResolver, UrlGeneratorInterface $urlGenerator = null, $filterLocator = null, NameConverterInterface $nameConverter = null, $oauthEnabled = false, ? string $oauthType = '', ? string $oauthFlow = '', ? string $oauthTokenUrl = '', ? string $oauthAuthorizationUrl = '', array $oauthScopes = [], array $apiKeys = [], SubresourceOperationFactoryInterface $subresourceOperationFactory = null) |
|
69
|
69
|
{ |
|
70
|
70
|
if ($urlGenerator) { |
|
71
|
71
|
@trigger_error(sprintf('Passing an instance of %s to %s() is deprecated since version 2.1 and will be removed in 3.0.', UrlGeneratorInterface::class, __METHOD__), E_USER_DEPRECATED); |
|
@@ -135,7 +135,7 @@ discard block |
|
|
block discarded – undo |
|
135
|
135
|
$parametersMemory = []; |
|
136
|
136
|
$pathOperation['parameters'] = []; |
|
137
|
137
|
|
|
138
|
|
- foreach ($subresourceOperation['identifiers'] as list($identifier, , $hasIdentifier)) { |
|
|
138
|
+ foreach ($subresourceOperation['identifiers'] as list($identifier,, $hasIdentifier)) { |
|
139
|
139
|
if (true === $hasIdentifier) { |
|
140
|
140
|
$pathOperation['parameters'][] = ['name' => $identifier, 'in' => 'path', 'required' => true, 'type' => 'string']; |
|
141
|
141
|
$parametersMemory[] = $identifier; |
|
@@ -426,7 +426,7 @@ discard block |
|
|
block discarded – undo |
|
426
|
426
|
$definitionKey = $this->getDefinitionKey($resourceMetadata->getShortName(), (array) ($serializerContext['groups'] ?? [])); |
|
427
|
427
|
|
|
428
|
428
|
if (!isset($definitions[$definitionKey])) { |
|
429
|
|
- $definitions[$definitionKey] = []; // Initialize first to prevent infinite loop |
|
|
429
|
+ $definitions[$definitionKey] = []; // Initialize first to prevent infinite loop |
|
430
|
430
|
$definitions[$definitionKey] = $this->getDefinitionSchema($resourceClass, $resourceMetadata, $definitions, $serializerContext); |
|
431
|
431
|
} |
|
432
|
432
|
|