Missing type hints in $query, $params, $types sets

doctrine · Apr 26, 2018 · 175455f · 175455f
1 parent 1c91686
commit 175455f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/lib/Doctrine/DBAL/Cache/QueryCacheProfile.php b/lib/Doctrine/DBAL/Cache/QueryCacheProfile.php
@@ -80,7 +80,7 @@ public function getCacheKey()
      *
      * @return array
      */
-    public function generateCacheKeys($query, $params, $types, array $connectionParams = [])
+    public function generateCacheKeys(string $query, array $params = [], array $types = [], array $connectionParams = []) : array
     {
         $realCacheKey = 'query=' . $query .
             '&params=' . serialize($params) .

diff --git a/lib/Doctrine/DBAL/Connection.php b/lib/Doctrine/DBAL/Connection.php
@@ -887,7 +887,7 @@ public function prepare(string $sql) : DriverStatement
      *
      * @throws DBALException
      */
-    public function executeQuery(string $query, array $params = [], $types = [], ?QueryCacheProfile $qcp = null) : ResultStatement
+    public function executeQuery(string $query, array $params = [], array $types = [], ?QueryCacheProfile $qcp = null) : ResultStatement
     {
         if ($qcp !== null) {
             return $this->executeCacheQuery($query, $params, $types, $qcp);
@@ -933,7 +933,7 @@ public function executeQuery(string $query, array $params = [], $types = [], ?Qu
      *
      * @throws DBALException
      */
-    public function executeCacheQuery($query, $params, $types, QueryCacheProfile $qcp) : ResultStatement
+    public function executeCacheQuery(string $query, array $params, array $types, QueryCacheProfile $qcp) : ResultStatement
     {
         $resultCache = $qcp->getResultCacheDriver() ?: $this->_config->getResultCacheImpl();
         if ( ! $resultCache) {

diff --git a/lib/Doctrine/DBAL/SQLParserUtils.php b/lib/Doctrine/DBAL/SQLParserUtils.php
@@ -83,7 +83,7 @@ public static function getPlaceholderPositions($statement, $isPositional = true)
      *
      * @throws SQLParserUtilsException
      */
-    public static function expandListParameters($query, $params, $types)
+    public static function expandListParameters(string $query, array $params = [], array $types = []) : array
     {
         $isPositional   = is_int(key($params));
         $arrayPositions = [];

diff --git a/tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php b/tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php
@@ -449,8 +449,10 @@ public function dataQueryWithMissingParameters()
 
     /**
      * @dataProvider dataQueryWithMissingParameters
+     * @param mixed[] $params
+     * @param mixed[] $types
      */
-    public function testExceptionIsThrownForMissingParam($query, $params, $types = array())
+    public function testExceptionIsThrownForMissingParam(string $query, array $params = [], array $types = []) : void
     {
         $this->expectException(
             'Doctrine\DBAL\SQLParserUtilsException',