Update as per feedback.

FriendsOfCake · Feb 26, 2024 · a54e3b9 · a54e3b9
1 parent 6525428
commit a54e3b9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 39 deletions.
diff --git a/src/Model/Filter/Finder.php b/src/Model/Filter/Finder.php
@@ -41,6 +41,9 @@ public function process(): bool
         $casts = $this->getConfig('cast');
         foreach ($casts as $field => $toType) {
             $value = $args[$field] ?? null;
+            if ($value === null) {
+                continue;
+            }
 
             if (is_callable($toType)) {
                 $value = $toType($value);

diff --git a/tests/TestCase/Model/Filter/FinderTest.php b/tests/TestCase/Model/Filter/FinderTest.php
@@ -93,33 +93,6 @@ public function testProcessCast()
         );
     }
 
-    /**
-     * Tests that a custom finder that requires certain values to be cast, from null
-     * to int, float or bool.
-     *
-     * @return void
-     */
-    public function testProcessCastNull()
-    {
-        $articles = $this->getTableLocator()->get('FinderArticles', [
-            'className' => '\Search\Test\TestApp\Model\Table\FinderArticlesTable',
-        ]);
-        $manager = new Manager($articles);
-        $filter = new Finder('user', $manager, ['cast' => ['uid' => 'int']]);
-        $filter->setArgs(['uid' => null]);
-        $filter->setQuery($articles->find());
-        $filter->process();
-
-        $this->assertMatchesRegularExpression(
-            '/WHERE user_id = :c0$/',
-            $filter->getQuery()->sql()
-        );
-        $this->assertSame(
-            [0],
-            Hash::extract($filter->getQuery()->getValueBinder()->bindings(), '{s}.value')
-        );
-    }
-
     /**
      * Tests that a custom finder that requires certain values to be cast, using
      * a custom callable.
@@ -158,8 +131,7 @@ public function testProcessCastCallback()
     }
 
     /**
-     * Tests that a custom finder that requires certain values to be cast, using
-     * a custom callable and null input.
+     * Tests that a null input does not use casting.
      *
      * @return void
      */
@@ -176,17 +148,13 @@ public function testProcessCastCallbackNull()
                 },
             ],
         ];
-        $filter = new Finder('slugged', $manager, $options);
+        $filter = new Finder('sluggedNullable', $manager, $options);
         $filter->setArgs(['slug' => null]);
         $filter->setQuery($articles->find());
         $filter->process();
 
-        $this->assertMatchesRegularExpression(
-            '/WHERE title = :c0$/',
-            $filter->getQuery()->sql()
-        );
         $this->assertSame(
-            [''],
+            [],
             Hash::extract($filter->getQuery()->getValueBinder()->bindings(), '{s}.value')
         );
     }
@@ -207,7 +175,7 @@ public function testProcessCastCallbackNullableString()
         $options = [
             'cast' => [
                 'slug' => function ($value) {
-                    if ($value === null || $value === '') {
+                    if ($value === '') {
                         return null;
                     }
 
@@ -216,7 +184,7 @@ public function testProcessCastCallbackNullableString()
             ],
         ];
         $filter = new Finder('sluggedNullable', $manager, $options);
-        $filter->setArgs(['slug' => null]);
+        $filter->setArgs(['slug' => '']);
         $filter->setQuery($articles->find());
         $filter->process();
 
@@ -246,7 +214,7 @@ public function testProcessCastCallbackNullableInt()
         $options = [
             'cast' => [
                 'uid' => function ($value) {
-                    if ($value === null || $value === '') {
+                    if ($value === '') {
                         return null;
                     }
 
@@ -255,7 +223,7 @@ public function testProcessCastCallbackNullableInt()
             ],
         ];
         $filter = new Finder('userNullable', $manager, $options);
-        $filter->setArgs(['uid' => null]);
+        $filter->setArgs(['uid' => '']);
         $filter->setQuery($articles->find());
         $filter->process();
         $this->assertMatchesRegularExpression(