Merge pull request #7201 from greg0ire/adapt_to_signature_bc_break

Adapt to new signatures
doctrine · Apr 17, 2018 · 46b695d · 46b695d
2 parents 77e3e5c + b881f14
commit 46b695d
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 48 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "doctrine/cache": "~1.6",
         "doctrine/collections": "^1.4",
         "doctrine/common": "^2.7.1",
-        "doctrine/dbal": "dev-develop as 3.x-dev",
+        "doctrine/dbal": "dev-snapshot/develop/2018-04-17 as 3.x-dev",
         "doctrine/instantiator": "~1.1",
         "ocramius/package-versions": "^1.1.2",
         "ocramius/proxy-manager": "^2.1.1",

diff --git a/composer.lock b/composer.lock
diff --git a/tests/Doctrine/Tests/Mocks/ConnectionMock.php b/tests/Doctrine/Tests/Mocks/ConnectionMock.php
@@ -8,6 +8,7 @@
 use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver;
+use Doctrine\DBAL\Driver\ResultStatement;
 use Doctrine\DBAL\Driver\Statement;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use function is_string;
@@ -73,9 +74,11 @@ public function insert($tableName, array $data, array $types = [])
     /**
      * {@inheritdoc}
      */
-    public function executeUpdate($query, array $params = [], array $types = [])
+    public function executeUpdate(string $query, array $params = [], array $types = []) : int
     {
         $this->executeUpdates[] = ['query' => $query, 'params' => $params, 'types' => $types];
+
+        return 42;
     }
 
     /**
@@ -101,7 +104,7 @@ public function fetchColumn($statement, array $params = [], $colnum = 0, array $
     /**
      * {@inheritdoc}
      */
-    public function query() : Statement
+    public function query(string $sql) : ResultStatement
     {
         return $this->queryResult;
     }

diff --git a/tests/Doctrine/Tests/Mocks/DriverConnectionMock.php b/tests/Doctrine/Tests/Mocks/DriverConnectionMock.php
@@ -5,6 +5,8 @@
 namespace Doctrine\Tests\Mocks;
 
 use Doctrine\DBAL\Driver\Connection;
+use Doctrine\DBAL\Driver\ResultStatement;
+use Doctrine\DBAL\Driver\Statement;
 use Doctrine\DBAL\ParameterType;
 
 /**
@@ -34,15 +36,15 @@ public function setStatementMock($statementMock)
     /**
      * {@inheritdoc}
      */
-    public function prepare($prepareString)
+    public function prepare(string $prepareString) : Statement
     {
         return $this->statementMock ?: new StatementMock();
     }
 
     /**
      * {@inheritdoc}
      */
-    public function query()
+    public function query(string $sql) : ResultStatement
     {
         return $this->statementMock ?: new StatementMock();
     }
@@ -57,7 +59,7 @@ public function quote($input, $type = ParameterType::STRING)
     /**
      * {@inheritdoc}
      */
-    public function exec($statement)
+    public function exec(string $statement) : int
     {
     }
 

diff --git a/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php b/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php
@@ -113,7 +113,7 @@ public function execute($params = null)
     /**
      * {@inheritdoc}
      */
-    public function rowCount()
+    public function rowCount() : int
     {
     }
 

diff --git a/tests/Doctrine/Tests/Mocks/StatementArrayMock.php b/tests/Doctrine/Tests/Mocks/StatementArrayMock.php
@@ -62,7 +62,7 @@ public function fetchColumn($columnIndex = 0)
         return false;
     }
 
-    public function rowCount()
+    public function rowCount() : int
     {
         return count($this->result);
     }

diff --git a/tests/Doctrine/Tests/Mocks/StatementMock.php b/tests/Doctrine/Tests/Mocks/StatementMock.php
@@ -49,7 +49,7 @@ public function execute($params = null)
     /**
      * {@inheritdoc}
      */
-    public function rowCount()
+    public function rowCount() : int
     {
     }
 

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3634Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3634Test.php
@@ -6,6 +6,8 @@
 
 use Doctrine\DBAL\Cache\QueryCacheProfile;
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Driver\ResultStatement;
+use Doctrine\DBAL\Driver\Statement;
 use Doctrine\ORM\Annotation as ORM;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Tools\ToolsException;
@@ -273,17 +275,17 @@ public function fetchAll($sql, array $params = [], $types = [])
         return $this->forwardCall();
     }
 
-    public function prepare($statement)
+    public function prepare(string $statement) : Statement
     {
         return $this->forwardCall();
     }
 
-    public function executeQuery($query, array $params = [], $types = [], ?QueryCacheProfile $qcp = null)
+    public function executeQuery(string $query, array $params = [], $types = [], ?QueryCacheProfile $qcp = null) : ResultStatement
     {
         return $this->forwardCall();
     }
 
-    public function executeCacheQuery($query, $params, $types, QueryCacheProfile $qcp)
+    public function executeCacheQuery($query, $params, $types, QueryCacheProfile $qcp) : ResultStatement
     {
         return $this->forwardCall();
     }
@@ -293,17 +295,17 @@ public function project($query, array $params, \Closure $function)
         return $this->forwardCall();
     }
 
-    public function query()
+    public function query(string $sql) : ResultStatement
     {
         return $this->forwardCall();
     }
 
-    public function executeUpdate($query, array $params = [], array $types = [])
+    public function executeUpdate(string $query, array $params = [], array $types = []) : int
     {
         return $this->forwardCall();
     }
 
-    public function exec($statement)
+    public function exec(string $statement) : int
     {
         return $this->forwardCall();
     }