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

doctrine · Feb 28, 2018 · e36244c · e36244c
1 parent 67b8f76
commit e36244c
Show file tree

Hide file tree

Showing 4 changed files with 6 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
@@ -2,6 +2,7 @@
 
 namespace Doctrine\DBAL;
 
+use Doctrine\DBAL\Driver\ResultStatement;
 use Doctrine\DBAL\Driver\ServerInfoAwareConnection;
 use Doctrine\DBAL\Exception\InvalidArgumentException;
 use Closure;
@@ -883,7 +884,7 @@ public function prepare($statement)
      *
      * @throws \Doctrine\DBAL\DBALException
      */
-    public function executeQuery($query, array $params = [], $types = [], QueryCacheProfile $qcp = null)
+    public function executeQuery(string $query, array $params = [], array $types = [], QueryCacheProfile $qcp = null)
     {
         if ($qcp !== null) {
             return $this->executeCacheQuery($query, $params, $types, $qcp);
@@ -935,7 +936,7 @@ public function executeQuery($query, array $params = [], $types = [], QueryCache
      *
      * @throws \Doctrine\DBAL\Cache\CacheException
      */
-    public function executeCacheQuery($query, $params, $types, QueryCacheProfile $qcp)
+    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
@@ -67,7 +67,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
@@ -450,7 +450,7 @@ public function dataQueryWithMissingParameters()
     /**
      * @dataProvider dataQueryWithMissingParameters
      */
-    public function testExceptionIsThrownForMissingParam($query, $params, $types = array())
+    public function testExceptionIsThrownForMissingParam(string $query, array $params, array $types = []) : array
     {
         $this->expectException(
             'Doctrine\DBAL\SQLParserUtilsException',