laravel fixes

Author: soyuka

src/GraphQl/Type/FieldsBuilder.php

@@ -731,7 +731,7 @@ private function getFilterInstance(object|string|null $filter): ?FilterInterface
         }
 
         if (\is_object($filter)) {
-            return $filter;
+            return $filter instanceof FilterInterface ? $filter : null;
         }
 
         if (!$this->filterLocator->has($filter)) {

src/JsonApi/Filter/SparseFieldsetParameterProvider.php

@@ -45,7 +45,7 @@ public function provide(Parameter $parameter, array $parameters = [], array $con
             }
 
             foreach (explode(',', $fields) as $f) {
-                if (\array_key_exists($f, $allowedProperties)) {
+                if (\in_array($f, $allowedProperties, true)) {
                     $p[] = $f;
                 }
             }

src/Laravel/Eloquent/Extension/FilterQueryExtension.php

@@ -60,7 +60,7 @@ public function apply(Builder $builder, array $uriVariables, Operation $operatio
 
             $filter = $filterId instanceof FilterInterface ? $filterId : ($this->filterLocator->has($filterId) ? $this->filterLocator->get($filterId) : null);
             if ($filter instanceof FilterInterface) {
-                $builder = $filter->apply($builder, $values, $parameter->withKey($parameter->getExtraProperties()['_query_property'] ?? $parameter->getKey()), $context + ($parameter->getFilterContext() ?? []));
+                $builder = $filter->apply($builder, $values, $parameter, $context + ($parameter->getFilterContext() ?? []));
             }
         }
 

src/Laravel/Eloquent/Filter/JsonApi/SortFilterParameterProvider.php

@@ -26,7 +26,7 @@ public function provide(Parameter $parameter, array $parameters = [], array $con
         }
 
         $parameters = $operation->getParameters();
-        $properties = $parameter->getExtraProperties()['_properties'] ?? [];
+        $properties = $parameter->getProperties() ?? [];
         $value = $parameter->getValue();
 
         // most eloquent filters work with only a single value
@@ -47,14 +47,12 @@ public function provide(Parameter $parameter, array $parameters = [], array $con
                 $v = substr($v, 1);
             }
 
-            if (\array_key_exists($v, $properties)) {
-                $orderBy[$properties[$v]] = $dir;
+            if (\in_array($v, $properties, true)) {
+                $orderBy[$v] = $dir;
             }
         }
 
-        $parameters->add($parameter->getKey(), $parameter->withExtraProperties(
-            ['_api_values' => $orderBy] + $parameter->getExtraProperties()
-        ));
+        $parameters->add($parameter->getKey(), $parameter->setValue($orderBy));
 
         return $operation->withParameters($parameters);
     }

src/Laravel/State/ParameterValidatorProvider.php

@@ -17,21 +17,19 @@
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ParameterNotFound;
 use ApiPlatform\State\ProviderInterface;
-use ApiPlatform\State\Util\ParameterParserTrait;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Validates parameters using the Symfony validator.
+ * Validates parameters using the Laravel validator.
  *
  * @implements ProviderInterface<object>
  *
  * @experimental
  */
 final class ParameterValidatorProvider implements ProviderInterface
 {
-    use ParameterParserTrait;
     use ValidationErrorTrait;
 
     /**
@@ -54,6 +52,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         }
 
         $allConstraints = [];
+
         foreach ($operation->getParameters() ?? [] as $parameter) {
             if (!$constraints = $parameter->getConstraints()) {
                 continue;
@@ -69,17 +68,15 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
                 $value = null;
             }
 
-            // Basically renames our key from order[:property] to order.* to assign the rule properly (see https://laravel.com/docs/11.x/validation#rule-in)
-            if (str_contains($key, '[:property]')) {
-                $k = str_replace('[:property]', '', $key);
-                $allConstraints[$k.'.*'] = $constraints;
-                continue;
-            }
+            // Laravel Validator requires dot notation for nested rules (e.g., "sort.isActive"),
+            // not nested arrays. We convert HTTP bracket syntax "sort[isActive]" to "sort.isActive".
+            $ruleKey = str_replace(['[', ']'], ['.', ''], $key);
 
-            $allConstraints[$key] = $constraints;
+            $allConstraints[$ruleKey] = $constraints;
         }
 
         $validator = Validator::make($request->query->all(), $allConstraints);
+
         if ($validator->fails()) {
             throw $this->getValidationError($validator, new ValidationException($validator));
         }

src/Laravel/Tests/Eloquent/Filter/OrderFilterTest.php

@@ -34,10 +34,10 @@ public function testQueryParameterWithCamelCaseProperty(): void
         DB::enableQueryLog();
         $response = $this->get('/api/active_books?sort[isActive]=asc', ['Accept' => ['application/ld+json']]);
         $response->assertStatus(200);
-        $this->assertEquals(\DB::getQueryLog()[1]['query'], 'select * from "active_books" order by "isActive" asc limit 30 offset 0');
+        $this->assertEquals(\DB::getQueryLog()[1]['query'], 'select * from "active_books" order by "is_active" asc limit 30 offset 0');
         DB::flushQueryLog();
         $response = $this->get('/api/active_books?sort[isActive]=desc', ['Accept' => ['application/ld+json']]);
         $response->assertStatus(200);
-        $this->assertEquals(DB::getQueryLog()[1]['query'], 'select * from "active_books" order by "isActive" desc limit 30 offset 0');
+        $this->assertEquals(DB::getQueryLog()[1]['query'], 'select * from "active_books" order by "is_active" desc limit 30 offset 0');
     }
 }

src/Metadata/Resource/Factory/ParameterResourceMetadataCollectionFactory.php

@@ -23,6 +23,7 @@
 use ApiPlatform\Metadata\Parameter;
 use ApiPlatform\Metadata\ParameterProviderFilterInterface;
 use ApiPlatform\Metadata\Parameters;
+use ApiPlatform\Metadata\PropertiesAwareInterface;
 use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
 use ApiPlatform\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
 use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
@@ -173,6 +174,10 @@ private function getDefaultParameters(Operation $operation, string $resourceClas
 
             ['propertyNames' => $propertyNames, 'properties' => $properties] = $this->getProperties($resourceClass, $parameter);
 
+            if ($filter instanceof PropertiesAwareInterface) {
+                $parameter = $parameter->withProperties($propertyNames);
+            }
+
             $parameter = $this->setDefaults($key, $parameter, $filter, $properties, $operation);
             // We don't do any type cast yet, a query parameter or an header is always a string or a list of strings
             if (null === $parameter->getNativeType()) {
@@ -250,17 +255,17 @@ private function setDefaults(string $key, Parameter $parameter, ?object $filter,
             $parameter = $parameter->withProperty($key);
         }
 
-        if (null === $parameter->getProperty() && $this->nameConverter && ($nameConvertedKey = $this->nameConverter->normalize($key)) && isset($properties[$nameConvertedKey])) {
-            $parameter = $parameter->withProperty($key)->withExtraProperties(['_query_property' => $nameConvertedKey] + $parameter->getExtraProperties());
-            $currentKey = $nameConvertedKey;
-        }
+        // if (null === $parameter->getProperty() && $this->nameConverter && ($nameConvertedKey = $this->nameConverter->normalize($key)) && isset($properties[$nameConvertedKey])) {
+        //     $parameter = $parameter->withProperty($key)->withExtraProperties(['_query_property' => $nameConvertedKey] + $parameter->getExtraProperties());
+        //     $currentKey = $nameConvertedKey;
+        // }
 
         if ($this->nameConverter && $property = $parameter->getProperty()) {
             $parameter = $parameter->withProperty($this->nameConverter->normalize($property));
         }
 
         if (isset($properties[$currentKey]) && ($eloquentRelation = ($properties[$currentKey]->getExtraProperties()['eloquent_relation'] ?? null)) && isset($eloquentRelation['foreign_key'])) {
-            $parameter = $parameter->withExtraProperties(['_query_property' => $eloquentRelation['foreign_key']] + $parameter->getExtraProperties());
+            $parameter = $parameter->withProperty($eloquentRelation['foreign_key']);
         }
 
         $parameter = $this->addFilterMetadata($parameter);