Relax parameter types to allow filters like "array:empty"

Author: W0rma

src/Codeception/Util/JsonType.php

@@ -170,7 +170,7 @@ protected function typeComparison(array $data, array $jsonType): string|bool
                         return $regexes[1][$pos];
                     }, $filter);
 
-                    $matched = $matched && $this->matchFilter($filter, (string)$data[$key]);
+                    $matched = $matched && $this->matchFilter($filter, $data[$key]);
                 }
 
                 if ($matched) {
@@ -186,7 +186,7 @@ protected function typeComparison(array $data, array $jsonType): string|bool
         return true;
     }
 
-    protected function matchFilter(string $filter, string $value)
+    protected function matchFilter(string $filter, mixed $value)
     {
         $filter = trim($filter);
         if (str_starts_with($filter, '!')) {
@@ -206,7 +206,7 @@ protected function matchFilter(string $filter, string $value)
         }
 
         if (str_starts_with($filter, '=')) {
-            return $value === substr($filter, 1);
+            return (string) $value === substr($filter, 1);
         }
 
         if ($filter === 'url') {
@@ -232,7 +232,7 @@ protected function matchFilter(string $filter, string $value)
         }
 
         if (preg_match('#^regex\((.*?)\)$#', $filter, $matches)) {
-            return preg_match($matches[1], $value);
+            return preg_match($matches[1], (string) $value);
         }
 
         if (preg_match('#^>=(-?[\d\.]+)$#', $filter, $matches)) {

tests/unit/Codeception/Util/JsonTypeTest.php

@@ -15,15 +15,17 @@ final class JsonTypeTest extends Unit
         'name' => 'string|null', // http://codeception.com/docs/modules/REST#seeResponseMatchesJsonType
         'user' => [
             'url' => 'String:url'
-        ]
+        ],
+        'empty_array' => 'array',
     ];
 
     protected array $data = [
         'id' => 11,
         'retweeted' => false,
         'in_reply_to_screen_name' => null,
         'name' => null,
-        'user' => ['url' => 'http://davert.com']
+        'user' => ['url' => 'http://davert.com'],
+        'empty_array' => [],
     ];
 
     protected function _after()
@@ -167,6 +169,7 @@ public function testArray()
         $this->types['user'] = 'array';
         $jsonType = new JsonType($this->data);
         $this->assertTrue($jsonType->matches($this->types));
+        $this->assertTrue($jsonType->matches(['empty_array' => 'array:empty']));
     }
 
     public function testNull()