Merge pull request #475 from utopia-php/fix-query-type-error

Fix query type error
utopia-php · Nov 6, 2024 · 6661edf · 6661edf
2 parents 2ed56d0 + b7110d5
commit 6661edf
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/Database/Query.php b/src/Database/Query.php
@@ -254,6 +254,10 @@ public static function parseQuery(array $query): self
         $attribute = $query['attribute'] ?? '';
         $values = $query['values'] ?? [];
 
+        if (!\is_string($method)) {
+            throw new QueryException('Invalid query method. Must be a string, got ' . \gettype($method));
+        }
+
         if (!self::isMethod($method)) {
             throw new QueryException('Invalid query method: ' . $method);
         }
@@ -262,6 +266,10 @@ public static function parseQuery(array $query): self
             throw new QueryException('Invalid query attribute. Must be a string, got ' . \gettype($attribute));
         }
 
+        if (!\is_array($values)) {
+            throw new QueryException('Invalid query values. Must be an array, got ' . \gettype($values));
+        }
+
         if (\in_array($method, self::LOGICAL_TYPES)) {
             foreach ($values as $index => $value) {
                 $values[$index] = self::parseQuery($value);

diff --git a/tests/unit/QueryTest.php b/tests/unit/QueryTest.php
@@ -213,13 +213,27 @@ public function testParse(): void
         $this->assertEquals('actors', $queries[0]->getAttribute());
         $this->assertEquals($json, '{"method":"or","values":[{"method":"equal","attribute":"actors","values":["Brad Pitt"]},{"method":"equal","attribute":"actors","values":["Johnny Depp"]}]}');
 
+        try {
+            Query::parse('{"method":["equal"],"attribute":["title"],"values":["test"]}');
+            $this->fail('Failed to throw exception');
+        } catch (QueryException $e) {
+            $this->assertEquals('Invalid query method. Must be a string, got array', $e->getMessage());
+        }
+
         try {
             Query::parse('{"method":"equal","attribute":["title"],"values":["test"]}');
             $this->fail('Failed to throw exception');
         } catch (QueryException $e) {
             $this->assertEquals('Invalid query attribute. Must be a string, got array', $e->getMessage());
         }
 
+        try {
+            Query::parse('{"method":"equal","attribute":"title","values":"test"}');
+            $this->fail('Failed to throw exception');
+        } catch (QueryException $e) {
+            $this->assertEquals('Invalid query values. Must be an array, got string', $e->getMessage());
+        }
+
         try {
             Query::parse('false');
             $this->fail('Failed to throw exception');