Throw InvalidArgumentException if query params are invalid

Author: clue

src/Io/Query.php

@@ -44,9 +44,16 @@ class Query
     /**
      * @param string $sql
      * @param list<string|int|float|bool|null> $params
+     * @throws \InvalidArgumentException if given $params are invalid
      */
     public function __construct($sql, array $params = [])
     {
+        foreach ($params as $param) {
+            if (!\is_scalar($param) && $param !== null) {
+                throw new \InvalidArgumentException('Query param must be of type string|int|float|bool|null, ' . (\is_object($param) ? \get_class($param) : \gettype($param)) . ' given');
+            }
+        }
+
         $this->sql = $sql;
         $this->builtSql = $params ? null : $sql;
         $this->params = $params;
@@ -77,9 +84,6 @@ protected function resolveValueForSql($value)
             case 'NULL':
                 $value = 'NULL';
                 break;
-            default:
-                throw new \InvalidArgumentException(sprintf('Not supported value type of %s.', $type));
-                break;
         }
 
         return $value;

src/MysqlClient.php

@@ -157,15 +157,16 @@ public function __construct(
      * @param list<string|int|float|bool|null> $params Parameters which should be bound to query
      * @return PromiseInterface<MysqlResult>
      *     Resolves with a `MysqlResult` on success or rejects with an `Exception` on error.
+     * @throws \InvalidArgumentException if given $params are invalid
      */
     public function query($sql, array $params = [])
     {
+        $query = new Query($sql, $params);
+
         if ($this->closed || $this->quitting) {
             return \React\Promise\reject(new Exception('Connection closed'));
         }
 
-        $query = new Query($sql, $params);
-
         return $this->getConnection()->then(function (Connection $connection) use ($query) {
             return $connection->query($query)->then(function (MysqlResult $result) use ($connection) {
                 $this->handleConnectionReady($connection);
@@ -235,15 +236,17 @@ public function query($sql, array $params = [])
      * @param string $sql SQL statement
      * @param list<string|int|float|bool|null> $params Parameters which should be bound to query
      * @return ReadableStreamInterface
+     * @throws \InvalidArgumentException if given $params are invalid
+     * @throws Exception if connection is already closed/closing
      */
     public function queryStream($sql, array $params = [])
     {
+        $query = new Query($sql, $params);
+
         if ($this->closed || $this->quitting) {
             throw new Exception('Connection closed');
         }
 
-        $query = new Query($sql, $params);
-
         return \React\Promise\Stream\unwrapReadable(
             $this->getConnection()->then(function (Connection $connection) use ($query) {
                 $stream = $connection->queryStream($query);

tests/Io/QueryTest.php

@@ -2,11 +2,17 @@
 
 namespace React\Tests\Mysql\Io;
 
-use PHPUnit\Framework\TestCase;
 use React\Mysql\Io\Query;
+use React\Tests\Mysql\BaseTestCase;
 
-class QueryTest extends TestCase
+class QueryTest extends BaseTestCase
 {
+    public function testCtorThrowsForInvalidParams()
+    {
+        $this->setExpectedException('InvalidArgumentException', 'Query param must be of type string|int|float|bool|null, resource given');
+        new Query('SELECT ?', [tmpfile()]);
+    }
+
     public function testBindParams()
     {
         $query = new Query('select * from test where id = ? and name = ?', [100, 'test']);

tests/MysqlClientTest.php

@@ -1921,6 +1921,40 @@ public function testQueryReturnsRejectedPromiseAfterConnectionIsClosed()
         $ret->then($this->expectCallableNever(), $this->expectCallableOnce());
     }
 
+    public function testQueryThrowsForInvalidQueryParamsWithoutCreatingNewConnection()
+    {
+        $factory = $this->getMockBuilder('React\Mysql\Io\Factory')->disableOriginalConstructor()->getMock();
+        $factory->expects($this->never())->method('createConnection');
+        $loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
+
+        $connection = new MysqlClient('', null, $loop);
+
+        $ref = new \ReflectionProperty($connection, 'factory');
+        $ref->setAccessible(true);
+        $ref->setValue($connection, $factory);
+
+        $this->setExpectedException('InvalidArgumentException', 'Query param must be of type string|int|float|bool|null, array given');
+        $connection->query('SELECT ?', [[]]);
+    }
+
+    public function testQueryThrowsForInvalidQueryParamsWhenConnectionIsAlreadyClosed()
+    {
+        $factory = $this->getMockBuilder('React\Mysql\Io\Factory')->disableOriginalConstructor()->getMock();
+        $factory->expects($this->never())->method('createConnection');
+        $loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
+
+        $connection = new MysqlClient('', null, $loop);
+
+        $ref = new \ReflectionProperty($connection, 'factory');
+        $ref->setAccessible(true);
+        $ref->setValue($connection, $factory);
+
+        $connection->close();
+
+        $this->setExpectedException('InvalidArgumentException', 'Query param must be of type string|int|float|bool|null, array given');
+        $connection->query('SELECT ?', [[]]);
+    }
+
     public function testQueryStreamThrowsAfterConnectionIsClosed()
     {
         $factory = $this->getMockBuilder('React\Mysql\Io\Factory')->disableOriginalConstructor()->getMock();
@@ -1939,6 +1973,40 @@ public function testQueryStreamThrowsAfterConnectionIsClosed()
         $connection->queryStream('SELECT 1');
     }
 
+    public function testQueryStreamThrowsForInvalidQueryParamsWithoutCreatingNewConnection()
+    {
+        $factory = $this->getMockBuilder('React\Mysql\Io\Factory')->disableOriginalConstructor()->getMock();
+        $factory->expects($this->never())->method('createConnection');
+        $loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
+
+        $connection = new MysqlClient('', null, $loop);
+
+        $ref = new \ReflectionProperty($connection, 'factory');
+        $ref->setAccessible(true);
+        $ref->setValue($connection, $factory);
+
+        $this->setExpectedException('InvalidArgumentException', 'Query param must be of type string|int|float|bool|null, stdClass given');
+        $connection->queryStream('SELECT ?', [new \stdClass()]);
+    }
+
+    public function testQueryStreamThrowsForInvalidQueryParamsWhenConnectionIsAlreadyClosed()
+    {
+        $factory = $this->getMockBuilder('React\Mysql\Io\Factory')->disableOriginalConstructor()->getMock();
+        $factory->expects($this->never())->method('createConnection');
+        $loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
+
+        $connection = new MysqlClient('', null, $loop);
+
+        $ref = new \ReflectionProperty($connection, 'factory');
+        $ref->setAccessible(true);
+        $ref->setValue($connection, $factory);
+
+        $connection->close();
+
+        $this->setExpectedException('InvalidArgumentException', 'Query param must be of type string|int|float|bool|null, stdClass given');
+        $connection->queryStream('SELECT ?', [new \stdClass()]);
+    }
+
     public function testPingReturnsRejectedPromiseAfterConnectionIsClosed()
     {
         $factory = $this->getMockBuilder('React\Mysql\Io\Factory')->disableOriginalConstructor()->getMock();