Fix coding standards/tests

doctrine · Oct 2, 2020 · 15f3890 · 15f3890
1 parent 8d186e7
commit 15f3890
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/lib/Doctrine/DBAL/Query/QueryBuilder.php b/lib/Doctrine/DBAL/Query/QueryBuilder.php
@@ -411,10 +411,8 @@ public function getMaxResults()
 
     /**
      * Gets the current lock mode  for this query
-     *
-     * @return int|null
      */
-    public function getLockMode()
+    public function getLockMode(): ?int
     {
         return $this->lockMode;
     }
@@ -423,10 +421,8 @@ public function getLockMode()
      * Set lock mode use one of the constants from LockMode::class locks are only added to SELECT queries
      *
      * Optimistic locking *is not* supported by DBAL.
-     *
-     * @param int $lockMode
      */
-    public function setLockMode(int $lockMode)
+    public function setLockMode(int $lockMode): self
     {
         $this->lockMode = $lockMode;
 
@@ -1198,7 +1194,6 @@ private function getSQLForSelect()
             . ($this->sqlParts['having'] !== null ? ' HAVING ' . ((string) $this->sqlParts['having']) : '')
             . ($this->sqlParts['orderBy'] ? ' ORDER BY ' . implode(', ', $this->sqlParts['orderBy']) : '');
 
-
         if ($this->isLimitQuery()) {
             return $databasePlatform->modifyLimitQuery(
                 $query,

diff --git a/tests/Doctrine/Tests/DBAL/Query/QueryBuilderTest.php b/tests/Doctrine/Tests/DBAL/Query/QueryBuilderTest.php
@@ -4,6 +4,7 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\ParameterType;
+use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 use Doctrine\DBAL\Query\QueryBuilder;
 use Doctrine\DBAL\Query\QueryException;
@@ -23,6 +24,12 @@ protected function setUp(): void
         $this->conn->expects($this->any())
                    ->method('getExpressionBuilder')
                    ->will($this->returnValue($expressionBuilder));
+
+        $platform = new SqlitePlatform();
+
+        $this->conn->expects($this->any())
+                   ->method('getPlatform')
+                   ->will($this->returnValue($platform));
     }
 
     public function testSimpleSelectWithoutFrom(): void