refactor: some more style changes to adhere more to original code style

Fixes #7478

Author: Coffee2CodeNL

src/Doctrine/Orm/Filter/PartialSearchFilter.php

@@ -29,13 +29,8 @@ final class PartialSearchFilter implements FilterInterface, OpenApiParameterFilt
     use BackwardCompatibleFilterDescriptionTrait;
     use OpenApiFilterTrait;
 
-    public function apply(
-        QueryBuilder $queryBuilder,
-        QueryNameGeneratorInterface $queryNameGenerator,
-        string $resourceClass,
-        ?Operation $operation = null,
-        array $context = [],
-    ): void {
+    public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, ?Operation $operation = null, array $context = []): void
+    {
         $parameter = $context['parameter'];
         $alias = $queryBuilder->getRootAliases()[0];
         $properties = $parameter->getProperties() ?? [$parameter->getProperty()];
@@ -44,34 +39,26 @@ public function apply(
             $parameterName = $queryNameGenerator->generateParameterName($property);
             $values = $parameter->getValue();
 
-            if (!\is_iterable($values)) {
-                $queryBuilder->setParameter($parameterName, '%'.\strtolower($values).'%');
+            if (!is_iterable($values)) {
+                $queryBuilder->setParameter($parameterName, '%'.strtolower($values).'%');
 
-                $queryBuilder->{$context['whereClause'] ?? 'andWhere'}(
-                    $queryBuilder
-                        ->expr()
-                        ->like(
-                            'LOWER('.$field.')',
-                            ':'.$parameterName,
-                        ),
-                );
+                $queryBuilder->{$context['whereClause'] ?? 'andWhere'}($queryBuilder->expr()->like(
+                    'LOWER('.$field.')',
+                    ':'.$parameterName,
+                ));
             } else {
                 $likeExpressions = [];
                 foreach ($values as $val) {
                     $parameterName = $queryNameGenerator->generateParameterName($property);
-                    $likeExpressions[] = $queryBuilder
-                        ->expr()
-                        ->like(
-                            'LOWER('.$field.')',
-                            ':'.$parameterName,
-                        );
-                    $queryBuilder->setParameter($parameterName, '%'.\strtolower($val).'%');
+                    $likeExpressions[] = $queryBuilder->expr()->like(
+                        'LOWER('.$field.')',
+                        ':'.$parameterName,
+                    );
+                    $queryBuilder->setParameter($parameterName, '%'.strtolower($val).'%');
                 }
 
                 $queryBuilder->{$context['whereClause'] ?? 'andWhere'}(
-                    $queryBuilder
-                        ->expr()
-                        ->orX(...$likeExpressions),
+                    $queryBuilder->expr()->orX(...$likeExpressions),
                 );
             }
         }

src/Doctrine/Orm/composer.json

@@ -25,7 +25,7 @@
     "require": {
         "php": ">=8.2",
         "api-platform/doctrine-common": "^4.2.0-alpha.3@alpha",
-        "api-platform/metadata": "^4.2",
+        "api-platform/metadata": "^4.2 || dev-fix/partial-exact-filter",
         "api-platform/state": "^4.2.4",
         "doctrine/orm": "^2.17 || ^3.0"
     },

src/Symfony/composer.json

@@ -34,7 +34,7 @@
         "api-platform/json-schema": "^4.2.3",
         "api-platform/jsonld": "^4.2.3",
         "api-platform/hydra": "^4.2.3",
-        "api-platform/metadata": "^4.2.3",
+        "api-platform/metadata": "^4.2.3 || dev-fix/partial-exact-filter",
         "api-platform/serializer": "^4.2.4",
         "api-platform/state": "^4.2.4",
         "api-platform/validator": "^4.2.3",
@@ -50,7 +50,7 @@
     "require-dev": {
         "api-platform/doctrine-common": "^4.2.3",
         "api-platform/doctrine-odm": "^4.2.3",
-        "api-platform/doctrine-orm": "^4.2.3",
+        "api-platform/doctrine-orm": "^4.2.3 || dev-fix/partial-exact-filter",
         "api-platform/elasticsearch": "^4.2.3",
         "api-platform/graphql": "^4.2.3",
         "phpspec/prophecy-phpunit": "^2.2",

tests/Fixtures/TestBundle/Entity/SearchFilterParameter.php

@@ -37,7 +37,7 @@
         'searchOnTextAndDate[:property]' => new QueryParameter(filter: 'app_filter_date_and_search'),
         'searchParameter[:property]' => new QueryParameter(
             filter    : new PartialSearchFilter(),
-            properties: ['foo']
+            properties: ['foo'],
         ),
         'q' => new QueryParameter(property: 'hydra:freetextQuery'),
     ]

tests/Functional/Parameters/DoctrineTest.php

@@ -124,11 +124,9 @@ public function testPartialSearchFilter(): void
         $resource = $this->isMongoDB() ? SearchFilterParameterDocument::class : SearchFilterParameter::class;
         $this->recreateSchema([$resource]);
         $this->loadFixtures($resource);
-        $route    = 'search_filter_parameter';
-        $response = self::createClient()
-                        ->request('GET', $route . '?searchParameter[foo]=baz')
-        ;
-        $a        = $response->toArray();
+        $route = 'search_filter_parameter';
+        $response = self::createClient()->request('GET', $route.'?searchParameter[foo]=baz');
+        $a = $response->toArray();
         $this->assertEquals($a['hydra:member'][0]['foo'], 'baz');
     }