Merge branch '4.1' into main · Coffee2CodeNL/api-platform-core@56922b9 · GitHub
Skip to content

Commit 56922b9

Browse files
soyukasoyuka
committed
Merge branch '4.1' into main
Resolve merge conflict in tests/Functional/ValidationTest.php by combining test cases.
2 parents a42034d + e9e49d7 commit 56922b9

49 files changed

Lines changed: 386 additions & 1788 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 16 additions & 12 deletions

‎features/doctrine/issue6039/entity_class_option.feature‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/Doctrine/Odm/State/LinksHandlerTrait.php‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,8 @@ private function handleLinks(Builder $aggregationBuilder, array $identifiers, ar
5959
/**
6060
* @throws RuntimeException
6161
*/
62-
private function buildAggregation(string $toClass, array $links, array $identifiers, array $context, array $executeOptions, string $previousAggregationClass, Builder $previousAggregationBuilder, ?Operation $operation = null): Builder
62+
private function buildAggregation(string $toClass, array $links, array $identifiers, array $context, array $executeOptions, string $previousAggregationClass, Builder $previousAggregationBuilder, Operation $operation): Builder
6363
{
64-
if (!$operation) {
65-
trigger_deprecation('api-platform/core', '3.2', 'In API Platform 4 the last argument "operation" will be required and this trait will be internal. Use the "handleLinks" feature instead.');
66-
}
67-
6864
if (\count($links) <= 0) {
6965
return $previousAggregationBuilder;
7066
}
@@ -88,10 +84,8 @@ private function buildAggregation(string $toClass, array $links, array $identifi
8884

8985
$manager = $this->managerRegistry->getManagerForClass($aggregationClass);
9086
if (!$manager instanceof DocumentManager) {
91-
if ($operation) {
92-
$aggregationClass = $this->getLinkFromClass($link, $operation);
93-
$manager = $this->managerRegistry->getManagerForClass($aggregationClass);
94-
}
87+
$aggregationClass = $this->getLinkFromClass($link, $operation);
88+
$manager = $this->managerRegistry->getManagerForClass($aggregationClass);
9589

9690
if (!$manager instanceof DocumentManager) {
9791
throw new RuntimeException(\sprintf('The manager for "%s" must be an instance of "%s".', $aggregationClass, DocumentManager::class));

‎src/GraphQl/Action/EntrypointAction.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,10 @@ public function __construct(
4141
private readonly SchemaBuilderInterface $schemaBuilder,
4242
private readonly ExecutorInterface $executor,
4343
private readonly ?GraphiQlAction $graphiQlAction,
44-
private readonly ?GraphQlPlaygroundAction $graphQlPlaygroundAction,
4544
private readonly NormalizerInterface $normalizer,
4645
private readonly ErrorHandlerInterface $errorHandler,
4746
bool $debug = false,
4847
private readonly bool $graphiqlEnabled = false,
49-
private readonly bool $graphQlPlaygroundEnabled = false,
5048
private readonly ?string $defaultIde = null,
5149
?Negotiator $negotiator = null,
5250
) {
@@ -64,10 +62,6 @@ public function __invoke(Request $request): Response
6462
if ('graphiql' === $this->defaultIde && $this->graphiqlEnabled && $this->graphiQlAction) {
6563
return ($this->graphiQlAction)($request);
6664
}
67-
68-
if ('graphql-playground' === $this->defaultIde && $this->graphQlPlaygroundEnabled && $this->graphQlPlaygroundAction) {
69-
return ($this->graphQlPlaygroundAction)($request);
70-
}
7165
}
7266

7367
[$query, $operationName, $variables] = $this->parseRequest($request);

‎src/GraphQl/Action/GraphQlPlaygroundAction.php‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎src/GraphQl/Tests/Action/EntrypointActionTest.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
use ApiPlatform\GraphQl\Action\EntrypointAction;
1717
use ApiPlatform\GraphQl\Action\GraphiQlAction;
18-
use ApiPlatform\GraphQl\Action\GraphQlPlaygroundAction;
1918
use ApiPlatform\GraphQl\Error\ErrorHandler;
2019
use ApiPlatform\GraphQl\ExecutorInterface;
2120
use ApiPlatform\GraphQl\Serializer\Exception\ErrorNormalizer;
@@ -270,8 +269,7 @@ private function getEntrypointAction(array $variables = ['graphqlVariable']): En
270269
$routerProphecy->generate('api_graphql_entrypoint')->willReturn('/graphiql');
271270

272271
$graphiQlAction = new GraphiQlAction($twigProphecy->reveal(), $routerProphecy->reveal(), true);
273-
$graphQlPlaygroundAction = new GraphQlPlaygroundAction($twigProphecy->reveal(), $routerProphecy->reveal(), true);
274272

275-
return new EntrypointAction($schemaBuilderProphecy->reveal(), $executorProphecy->reveal(), $graphiQlAction, $graphQlPlaygroundAction, $normalizer, $errorHandler, false, true, true, 'graphiql');
273+
return new EntrypointAction($schemaBuilderProphecy->reveal(), $executorProphecy->reveal(), $graphiQlAction, $normalizer, $errorHandler, false, true, 'graphiql');
276274
}
277275
}

‎src/GraphQl/Tests/Action/GraphQlPlaygroundActionTest.php‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎src/JsonSchema/SchemaFactory.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,11 @@ private function buildLegacyPropertySchema(Schema $schema, string $definitionNam
246246
$subDefinitionName = $this->definitionNameFactory->create($className, $format, $className, null, $serializerContext);
247247

248248
if (isset($subSchema->getDefinitions()[$subDefinitionName])) {
249-
unset($subSchema->getDefinitions()[$subDefinitionName]['properties']['@id']);
249+
// @see https://github.com/api-platform/core/issues/7162
250+
// Need to rebuild the definition without @id property and set it back to the sub-schema
251+
$subSchemaDefinition = $subSchema->getDefinitions()[$subDefinitionName]->getArrayCopy();
252+
unset($subSchemaDefinition['properties']['@id']);
253+
$subSchema->getDefinitions()[$subDefinitionName] = new \ArrayObject($subSchemaDefinition);
250254
}
251255
}
252256

‎src/Laravel/ApiPlatformProvider.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,10 @@
158158
use Illuminate\Routing\Router;
159159
use Illuminate\Support\ServiceProvider;
160160
use Negotiation\Negotiator;
161-
use phpDocumentor\Reflection\DocBlockFactory;
161+
use PHPStan\PhpDocParser\Parser\PhpDocParser;
162162
use Psr\Log\LoggerInterface;
163163
use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
164-
use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
164+
use Symfony\Component\PropertyInfo\Extractor\PhpStanExtractor;
165165
use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
166166
use Symfony\Component\PropertyInfo\PropertyInfoExtractor;
167167
use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface;
@@ -196,13 +196,13 @@ public function register(): void
196196
$this->mergeConfigFrom(__DIR__.'/config/api-platform.php', 'api-platform');
197197

198198
$this->app->singleton(PropertyInfoExtractorInterface::class, function () {
199-
$phpDocExtractor = class_exists(DocBlockFactory::class) ? new PhpDocExtractor() : null;
199+
$phpstanExtractor = class_exists(PhpDocParser::class) ? new PhpStanExtractor() : null;
200200
$reflectionExtractor = new ReflectionExtractor();
201201

202202
return new PropertyInfoExtractor(
203203
[$reflectionExtractor],
204-
$phpDocExtractor ? [$phpDocExtractor, $reflectionExtractor] : [$reflectionExtractor],
205-
$phpDocExtractor ? [$phpDocExtractor] : [],
204+
$phpstanExtractor ? [$phpstanExtractor, $reflectionExtractor] : [$reflectionExtractor],
205+
[],
206206
[$reflectionExtractor],
207207
[$reflectionExtractor]
208208
);

‎src/Laravel/Eloquent/PropertyAccess/PropertyAccessor.php‎

Lines changed: 3 additions & 1 deletion

0 commit comments

Comments
 (0)