doctrine#6167 - code cleanup for 2.5.x version

tests/Doctrine/Tests/Mocks/ConnectionMock.php

@@ -108,7 +108,7 @@ public function fetchColumn($statement, array $params = [], $colnum = 0, array $
     /**
      * {@inheritdoc}
      */
-    public function query() : Statement
+    public function query()
     {
         return $this->_queryResult;
     }

tests/Doctrine/Tests/Mocks/StatementArrayMock.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Doctrine\Tests\Mocks;
+
+
+/**
+ * Simple statement mock that returns result based on array.
+ * Doesn't support fetch modes
+ */
+class StatementArrayMock extends StatementMock
+{
+    /**
+     * @var array
+     */
+    private $_result;
+
+    public function __construct($result)
+    {
+        $this->_result = $result;
+    }
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->_result);
+    }
+
+    public function columnCount()
+    {
+        $row = reset($this->_result);
+        if ($row) {
+            return count($row);
+        } else {
+            return 0;
+        }
+    }
+
+    public function fetchAll($fetchMode = null, $fetchArgument = null, $ctorArgs = null)
+    {
+        return $this->_result;
+    }
+
+    public function fetch($fetchMode = null, $cursorOrientation = \PDO::FETCH_ORI_NEXT, $cursorOffset = 0)
+    {
+        $current = current($this->_result);
+        next($this->_result);
+
+        return $current;
+    }
+
+    public function fetchColumn($columnIndex = 0)
+    {
+        $current = current($this->_result);
+        if ($current) {
+            next($this->_result);
+            return reset($current);
+        } else {
+            return false;
+        }
+    }
+
+    public function rowCount()
+    {
+        return count($this->_result);
+    }
+}

tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php

@@ -25,18 +25,18 @@ class SequenceGeneratorTest extends OrmTestCase
      */
     private $connection;
 
-    protected function setUp() : void
+    protected function setUp()
     {
         parent::setUp();
 
         $this->entityManager     = $this->_getTestEntityManager();
         $this->sequenceGenerator = new SequenceGenerator('seq', 10);
         $this->connection        = $this->entityManager->getConnection();
 
-        self::assertInstanceOf(ConnectionMock::class, $this->connection);
+        self::assertInstanceOf('Doctrine\Tests\Mocks\ConnectionMock', $this->connection);
     }
 
-    public function testGeneration() : void
+    public function testGeneration()
     {
         $this->connection->setFetchOneException(new \BadMethodCallException(
             'Fetch* method used. Query method should be used instead, '