Merge pull request #3432 from morozov/phpstan-0.11

Updated PHPStan to v0.11

composer.json

@@ -29,7 +29,7 @@
     "require-dev": {
         "doctrine/coding-standard": "^5.0",
         "jetbrains/phpstorm-stubs": "^2018.1.2",
-        "phpstan/phpstan": "^0.10.1",
+        "phpstan/phpstan": "^0.11.1",
         "phpunit/phpunit": "^7.4",
         "symfony/console": "^2.0.5|^3.0|^4.0",
         "symfony/phpunit-bridge": "^3.4.5|^4.0.5"

lib/Doctrine/DBAL/Connection.php

@@ -1227,9 +1227,7 @@ class Connection implements DriverConnection
     }
 
     /**
-     * Starts a transaction by suspending auto-commit mode.
-     *
-     * @return void
+     * {@inheritDoc}
      */
     public function beginTransaction()
     {
@@ -1256,12 +1254,12 @@ class Connection implements DriverConnection
                 $logger->stopQuery();
             }
         }
+
+        return true;
     }
 
     /**
-     * Commits the current transaction.
-     *
-     * @return void
+     * {@inheritDoc}
      *
      * @throws ConnectionException If the commit failed due to no active transaction or
      *                                            because the transaction was marked for rollback only.
@@ -1300,10 +1298,12 @@ class Connection implements DriverConnection
         --$this->transactionNestingLevel;
 
         if ($this->autoCommit !== false || $this->transactionNestingLevel !== 0) {
-            return;
+            return true;
         }
 
         $this->beginTransaction();
+
+        return true;
     }
 
     /**

lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php

@@ -232,7 +232,7 @@ class MasterSlaveConnection extends Connection
     {
         $this->connect('master');
 
-        parent::beginTransaction();
+        return parent::beginTransaction();
     }
 
     /**
@@ -242,7 +242,7 @@ class MasterSlaveConnection extends Connection
     {
         $this->connect('master');
 
-        parent::commit();
+        return parent::commit();
     }
 
     /**

lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php

@@ -167,7 +167,7 @@ class DB2Statement implements IteratorAggregate, Statement
     public function columnCount()
     {
         if (! $this->stmt) {
-            return false;
+            return 0;
         }
 
         return db2_num_fields($this->stmt);

lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php

@@ -11,13 +11,14 @@ use IteratorAggregate;
 use mysqli;
 use mysqli_stmt;
 use PDO;
-use stdClass;
 use function array_combine;
 use function array_fill;
+use function assert;
 use function count;
 use function feof;
 use function fread;
 use function get_resource_type;
+use function is_array;
 use function is_resource;
 use function sprintf;
 use function str_repeat;
@@ -327,28 +328,23 @@ class MysqliStatement implements IteratorAggregate, Statement
             throw new MysqliException($this->_stmt->error, $this->_stmt->sqlstate, $this->_stmt->errno);
         }
 
-        switch ($fetchMode) {
-            case FetchMode::NUMERIC:
-                return $values;
+        if ($fetchMode === FetchMode::NUMERIC) {
+            return $values;
+        }
 
+        assert(is_array($this->_columnNames));
+        $assoc = array_combine($this->_columnNames, $values);
+        assert(is_array($assoc));
+
+        switch ($fetchMode) {
             case FetchMode::ASSOCIATIVE:
-                return array_combine($this->_columnNames, $values);
+                return $assoc;
 
             case FetchMode::MIXED:
-                $ret  = array_combine($this->_columnNames, $values);
-                $ret += $values;
-
-                return $ret;
+                return $assoc + $values;
 
             case FetchMode::STANDARD_OBJECT:
-                $assoc = array_combine($this->_columnNames, $values);
-                $ret   = new stdClass();
-
-                foreach ($assoc as $column => $value) {
-                    $ret->$column = $value;
-                }
-
-                return $ret;
+                return (object) $assoc;
 
             default:
                 throw new MysqliException(sprintf("Unknown fetch type '%s'", $fetchMode));

lib/Doctrine/DBAL/Platforms/SqlitePlatform.php

@@ -356,8 +356,8 @@ class SqlitePlatform extends AbstractPlatform
     /**
      * Generate a PRIMARY KEY definition if no autoincrement value is used
      *
-     * @param string[] $columns
-     * @param mixed[]  $options
+     * @param mixed[][] $columns
+     * @param mixed[]   $options
      */
     private function getNonAutoincrementPrimaryKeyDefinition(array $columns, array $options) : string
     {
@@ -368,7 +368,7 @@ class SqlitePlatform extends AbstractPlatform
         $keyColumns = array_unique(array_values($options['primary']));
 
         foreach ($keyColumns as $keyColumn) {
-            if (isset($columns[$keyColumn]['autoincrement']) && ! empty($columns[$keyColumn]['autoincrement'])) {
+            if (! empty($columns[$keyColumn]['autoincrement'])) {
                 return '';
             }
         }