Merge 4.1

Author: soyuka

CHANGELOG.md

@@ -40,6 +40,25 @@ TypeInfo:
 * [cff61eab8](https://github.com/api-platform/core/commit/cff61eab8643f8ed08d59c0684e77740d0d81b04) fix(metadata): append php file resource extractor (#7193)
 * [f3d4afe03](https://github.com/api-platform/core/commit/f3d4afe032385f3b665131a365e42706930f0730) fix(symfony): validator type-info
 
+## v4.1.20
+
+### Bug fixes
+
+* [c41a0bca4](https://github.com/api-platform/core/commit/c41a0bca49778663743a52e9da9ddb3b1439c2f8) fix(jsonld): child class @type shortName (#7312)
+* [d26088ba1](https://github.com/api-platform/core/commit/d26088ba1080f9fb8d94db5b476b0322d2a14ab2) chore: allow doctrine-persistence:^4.0 (#7309)
+
+## v4.1.19
+
+### Bug fixes
+
+* [2c06a22e2](https://github.com/api-platform/core/commit/2c06a22e244e5b0683558589a7ed2d7dd34a16a2) fix(validation): moving dependency from require-dev to require (#7296)
+* [2cde06246](https://github.com/api-platform/core/commit/2cde06246cd593ad094de9c8f0ad1b178608f275) fix(openapi): output `partial` query parameter to OpenAPI when `pagination_client_enabled` is true (#7295)
+* [6bc112193](https://github.com/api-platform/core/commit/6bc11219320315af1a811ab49a4c451498f75430) fix(metadata): do not fail if phpstan/phpdoc-parser is missing (#7279)
+* [871e5d3e1](https://github.com/api-platform/core/commit/871e5d3e1916e0d8bd1b4e1c4d983cd270a0922f) fix(symfony): restore graphql_playground option (#7274)
+* [d1e6772e3](https://github.com/api-platform/core/commit/d1e6772e32f632a5612f79ec58cad874af938694) fix(validation): property path on deepObject style (#7179)
+* [d35e46b14](https://github.com/api-platform/core/commit/d35e46b1426063dbed4b59d1f07dbbde398a390e) fix(hydra): "property" may not be defined (#7293)
+* [f3a54a239](https://github.com/api-platform/core/commit/f3a54a239e21c18716967e579d2cd2120a52ece1) fix: json formatted resource should not get xml errors #7287 (#7297)
+
 ## v4.1.18
 
 ### Bug fixes

src/Doctrine/Common/Filter/DateFilterTrait.php

@@ -91,6 +91,14 @@ private function normalizeValue(mixed $value, string $operator): ?string
             return null;
         }
 
+        if ('' === $value) {
+            $this->getLogger()->notice('Invalid filter ignored', [
+                'exception' => new InvalidArgumentException(\sprintf('Invalid value for "[%s]", expected non-empty string', $operator)),
+            ]);
+
+            return null;
+        }
+
         return $value;
     }
 }

src/JsonApi/Serializer/ConstraintViolationListNormalizer.php

@@ -76,7 +76,13 @@ private function getSourcePointerFromViolation(ConstraintViolationInterface $vio
             return 'data';
         }
 
-        $class = $violation->getRoot()::class;
+        $root = $violation->getRoot();
+
+        if (!\is_object($root)) {
+            return "data/attributes/$fieldName";
+        }
+
+        $class = $root::class;
         $propertyMetadata = $this->propertyMetadataFactory
             ->create(
                 // Im quite sure this requires some thought in case of validations over relationships

src/JsonApi/Tests/Serializer/ConstraintViolationNormalizerTest.php

@@ -93,4 +93,61 @@ public function testNormalize(): void
             (new ConstraintViolationListNormalizer($propertyMetadataFactoryProphecy->reveal(), $nameConverterProphecy->reveal()))->normalize($constraintViolationList)
         );
     }
+
+    public function testNormalizeWithStringRoot(): void
+    {
+        $propertyMetadataFactoryProphecy = $this->prophesize(PropertyMetadataFactoryInterface::class);
+
+        // Create a violation with a string root (simulating query parameter validation)
+        $constraintViolationList = new ConstraintViolationList([
+            new ConstraintViolation('Invalid page value.', 'Invalid page value.', [], 'page', 'page', 'invalid'),
+        ]);
+
+        $normalizer = new ConstraintViolationListNormalizer($propertyMetadataFactoryProphecy->reveal());
+
+        $result = $normalizer->normalize($constraintViolationList);
+
+        $this->assertEquals(
+            [
+                'errors' => [
+                    [
+                        'detail' => 'Invalid page value.',
+                        'source' => [
+                            'pointer' => 'data/attributes/page',
+                        ],
+                    ],
+                ],
+            ],
+            $result
+        );
+    }
+
+    public function testNormalizeWithNullRoot(): void
+    {
+        $propertyMetadataFactoryProphecy = $this->prophesize(PropertyMetadataFactoryInterface::class);
+
+        // Create a violation with a null root
+        $constraintViolationList = new ConstraintViolationList([
+            new ConstraintViolation('Invalid value.', 'Invalid value.', [], null, 'field', 'invalid'),
+        ]);
+
+        $normalizer = new ConstraintViolationListNormalizer($propertyMetadataFactoryProphecy->reveal());
+
+        // This should not throw a TypeError and should handle the null root gracefully
+        $result = $normalizer->normalize($constraintViolationList);
+
+        $this->assertEquals(
+            [
+                'errors' => [
+                    [
+                        'detail' => 'Invalid value.',
+                        'source' => [
+                            'pointer' => 'data/attributes/field',
+                        ],
+                    ],
+                ],
+            ],
+            $result
+        );
+    }
 }

src/JsonLd/ContextBuilder.php

@@ -148,6 +148,7 @@ public function getAnonymousResourceContext(object $object, array $context = [],
         }
 
         // here the object can be different from the resource given by the $context['api_resource'] value
+        // TODO: this is probably not used anymore and is slow we get that @type way earlier, remove this
         if (isset($context['api_resource'])) {
             $jsonLdContext['@type'] = $this->resourceMetadataFactory->create($this->getObjectClass($context['api_resource']))[0]->getShortName();
         }

src/JsonLd/Serializer/ItemNormalizer.php

@@ -118,6 +118,10 @@ public function normalize(mixed $object, ?string $format = null, array $context
                 $context['output']['iri'] = null;
             }
 
+            if ($this->resourceClassResolver->isResourceClass($resourceClass)) {
+                $context['output']['operation'] = $this->resourceMetadataCollectionFactory->create($resourceClass)->getOperation();
+            }
+
             // We should improve what's behind the context creation, its probably more complicated then it should
             $metadata = $this->createJsonLdContext($this->contextBuilder, $object, $context);
         }

src/Laravel/ApiPlatformProvider.php

@@ -86,6 +86,8 @@
 use ApiPlatform\Laravel\Eloquent\Metadata\ModelMetadata;
 use ApiPlatform\Laravel\Eloquent\Metadata\ResourceClassResolver as EloquentResourceClassResolver;
 use ApiPlatform\Laravel\Eloquent\PropertyAccess\PropertyAccessor as EloquentPropertyAccessor;
+use ApiPlatform\Laravel\Eloquent\PropertyInfo\EloquentExtractor;
+use ApiPlatform\Laravel\Eloquent\Serializer\EloquentNameConverter;
 use ApiPlatform\Laravel\Eloquent\Serializer\SerializerContextBuilder as EloquentSerializerContextBuilder;
 use ApiPlatform\Laravel\GraphQl\Controller\EntrypointController as GraphQlEntrypointController;
 use ApiPlatform\Laravel\GraphQl\Controller\GraphiQlController;
@@ -195,15 +197,16 @@ public function register(): void
     {
         $this->mergeConfigFrom(__DIR__.'/config/api-platform.php', 'api-platform');
 
-        $this->app->singleton(PropertyInfoExtractorInterface::class, function () {
+        $this->app->singleton(PropertyInfoExtractorInterface::class, function (Application $app) {
             $phpstanExtractor = class_exists(PhpDocParser::class) ? new PhpStanExtractor() : null;
             $reflectionExtractor = new ReflectionExtractor();
+            $eloquentExtractor = new EloquentExtractor($app->make(ModelMetadata::class));
 
             return new PropertyInfoExtractor(
                 [$reflectionExtractor],
                 $phpstanExtractor ? [$phpstanExtractor, $reflectionExtractor] : [$reflectionExtractor],
                 [],
-                [$reflectionExtractor],
+                [$eloquentExtractor],
                 [$reflectionExtractor]
             );
         });
@@ -262,10 +265,10 @@ public function register(): void
             return new CachePropertyMetadataFactory(
                 new SchemaPropertyMetadataFactory(
                     $app->make(ResourceClassResolverInterface::class),
-                    new PropertyInfoPropertyMetadataFactory(
-                        $app->make(PropertyInfoExtractorInterface::class),
-                        new SerializerPropertyMetadataFactory(
-                            $app->make(SerializerClassMetadataFactory::class),
+                    new SerializerPropertyMetadataFactory(
+                        $app->make(SerializerClassMetadataFactory::class),
+                        new PropertyInfoPropertyMetadataFactory(
+                            $app->make(PropertyInfoExtractorInterface::class),
                             new AttributePropertyMetadataFactory(
                                 new EloquentAttributePropertyMetadataFactory(
                                     new EloquentPropertyMetadataFactory(
@@ -315,7 +318,7 @@ public function register(): void
             $config = $app['config'];
             $nameConverter = $config->get('api-platform.name_converter', SnakeCaseToCamelCaseNameConverter::class);
             if ($nameConverter && class_exists($nameConverter)) {
-                $nameConverter = $app->make($nameConverter);
+                $nameConverter = new EloquentNameConverter($app->make($nameConverter));
             }
 
             $defaultContext = $config->get('api-platform.serializer', []);
@@ -400,9 +403,13 @@ public function register(): void
         });
         $this->app->bind(SerializerContextBuilderInterface::class, EloquentSerializerContextBuilder::class);
         $this->app->singleton(EloquentSerializerContextBuilder::class, function (Application $app) {
+            /** @var ConfigRepository */
+            $config = $app['config'];
+
             return new EloquentSerializerContextBuilder(
                 $app->make(SerializerContextBuilder::class),
-                $app->make(PropertyNameCollectionFactoryInterface::class)
+                $app->make(PropertyNameCollectionFactoryInterface::class),
+                $config->get('api-platform.name_converter', SnakeCaseToCamelCaseNameConverter::class)
             );
         });
 

src/Laravel/Eloquent/Metadata/Factory/Property/EloquentPropertyMetadataFactory.php

@@ -65,7 +65,7 @@ public function create(string $resourceClass, string $property, array $options =
         }
 
         if ($model->getKeyName() === $property) {
-            $propertyMetadata = $propertyMetadata->withIdentifier(true)->withWritable($propertyMetadata->isWritable() ?? false);
+            $propertyMetadata = $propertyMetadata->withIdentifier(true);
         }
 
         foreach ($this->modelMetadata->getAttributes($model) as $p) {
@@ -94,17 +94,6 @@ public function create(string $resourceClass, string $property, array $options =
             $propertyMetadata = $propertyMetadata
                 ->withNativeType($type);
 
-            // If these are set let the SerializerPropertyMetadataFactory do the work
-            if (!isset($options['denormalization_groups'])) {
-                $propertyMetadata = $propertyMetadata
-                    ->withWritable($propertyMetadata->isWritable() ?? true === $p['fillable']);
-            }
-
-            if (!isset($options['normalization_groups'])) {
-                $propertyMetadata = $propertyMetadata
-                    ->withReadable($propertyMetadata->isReadable() ?? false === $p['hidden']);
-            }
-
             return $propertyMetadata;
         }
 

src/Laravel/Eloquent/PropertyInfo/EloquentExtractor.php

@@ -0,0 +1,91 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace ApiPlatform\Laravel\Eloquent\PropertyInfo;
+
+use ApiPlatform\Laravel\Eloquent\Metadata\ModelMetadata;
+use Illuminate\Database\Eloquent\Model;
+use Symfony\Component\PropertyInfo\PropertyAccessExtractorInterface;
+
+class EloquentExtractor implements PropertyAccessExtractorInterface
+{
+    public function __construct(private readonly ModelMetadata $modelMetadata)
+    {
+    }
+
+    /**
+     * @param array<string, mixed> $context
+     */
+    public function isReadable(string $class, string $property, array $context = []): ?bool
+    {
+        if (!is_a($class, Model::class, true)) {
+            return null;
+        }
+
+        try {
+            $refl = new \ReflectionClass($class);
+            $model = $refl->newInstanceWithoutConstructor();
+        } catch (\ReflectionException) {
+            return null;
+        }
+
+        foreach ($this->modelMetadata->getAttributes($model) as $p) {
+            if ($p['name'] !== $property) {
+                continue;
+            }
+
+            if (($visible = $model->getVisible()) && \in_array($property, $visible, true)) {
+                return true;
+            }
+
+            if (($hidden = $model->getHidden()) && \in_array($property, $hidden, true)) {
+                return false;
+            }
+
+            return true;
+        }
+
+        return null;
+    }
+
+    /**
+     * @param array<string, mixed> $context
+     */
+    public function isWritable(string $class, string $property, array $context = []): ?bool
+    {
+        if (!is_a($class, Model::class, true)) {
+            return null;
+        }
+
+        try {
+            $refl = new \ReflectionClass($class);
+            $model = $refl->newInstanceWithoutConstructor();
+        } catch (\ReflectionException) {
+            return null;
+        }
+
+        foreach ($this->modelMetadata->getAttributes($model) as $p) {
+            if ($p['name'] !== $property) {
+                continue;
+            }
+
+            if ($fillable = $model->getFillable()) {
+                return \in_array($property, $fillable, true);
+            }
+
+            return true;
+        }
+
+        return null;
+    }
+}

src/Laravel/Eloquent/Serializer/EloquentNameConverter.php

@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace ApiPlatform\Laravel\Eloquent\Serializer;
+
+use Symfony\Component\Serializer\Exception\UnexpectedPropertyException;
+use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
+
+final class EloquentNameConverter implements NameConverterInterface
+{
+    public function __construct(private readonly NameConverterInterface $nameConverter)
+    {
+    }
+
+    /**
+     * @param array<string, mixed> $context
+     */
+    public function normalize(string $propertyName, ?string $class = null, ?string $format = null, array $context = []): string
+    {
+        try {
+            return $this->nameConverter->normalize($propertyName, $class, $format, $context); // @phpstan-ignore-line
+        } catch (UnexpectedPropertyException $e) {
+            return $this->nameConverter->denormalize($propertyName, $class, $format, $context); // @phpstan-ignore-line
+        }
+    }
+
+    /**
+     * @param array<string, mixed> $context
+     */
+    public function denormalize(string $propertyName, ?string $class = null, ?string $format = null, array $context = []): string
+    {
+        try {
+            return $this->nameConverter->denormalize($propertyName, $class, $format, $context); // @phpstan-ignore-line
+        } catch (UnexpectedPropertyException $e) {
+            return $this->nameConverter->normalize($propertyName, $class, $format, $context); // @phpstan-ignore-line
+        }
+    }
+}