Merge pull request #3489 from amaabdou/feature/upgrade_doctrine_cs_6_0

Update doctrine coding standard from 5.0 to 6.0
doctrine · Mar 17, 2019 · 546cd67 · 546cd67
2 parents 5b5c2c9 + bf06844
commit 546cd67
Show file tree

Hide file tree

Showing 45 changed files with 129 additions and 82 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         "doctrine/event-manager": "^1.0"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^5.0",
+        "doctrine/coding-standard": "^6.0",
         "jetbrains/phpstorm-stubs": "^2018.1.2",
         "phpstan/phpstan": "^0.11.3",
         "phpunit/phpunit": "^8.0",

diff --git a/composer.lock b/composer.lock
diff --git a/lib/Doctrine/DBAL/Configuration.php b/lib/Doctrine/DBAL/Configuration.php
@@ -107,6 +107,7 @@ private function buildSchemaAssetsFilterFromExpression($filterExpression) : call
             if ($assetName instanceof AbstractAsset) {
                 $assetName = $assetName->getName();
             }
+
             return preg_match($filterExpression, $assetName);
         };
     }
@@ -116,7 +117,8 @@ private function buildSchemaAssetsFilterFromExpression($filterExpression) : call
      */
     public function setSchemaAssetsFilter(?callable $callable = null) : ?callable
     {
-        $this->_attributes['filterSchemaAssetsExpression']                = null;
+        $this->_attributes['filterSchemaAssetsExpression'] = null;
+
         return $this->_attributes['filterSchemaAssetsExpressionCallable'] = $callable;
     }
 

diff --git a/lib/Doctrine/DBAL/Connection.php b/lib/Doctrine/DBAL/Connection.php
@@ -1161,6 +1161,7 @@ public function transactional(Closure $func)
         try {
             $res = $func($this);
             $this->commit();
+
             return $res;
         } catch (Exception $e) {
             $this->rollBack();

diff --git a/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php b/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php
@@ -225,9 +225,9 @@ private function bindTypedParameters()
                     $streams[$parameter] = $value;
                     $values[$parameter]  = null;
                     continue;
-                } else {
-                    $types[$parameter - 1] = static::$_paramTypeMap[ParameterType::STRING];
                 }
+
+                $types[$parameter - 1] = static::$_paramTypeMap[ParameterType::STRING];
             }
 
             $values[$parameter] = $value;

diff --git a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php b/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php
@@ -254,6 +254,7 @@ private static function findToken($statement, &$offset, $regex)
     {
         if (preg_match($regex, $statement, $matches, PREG_OFFSET_CAPTURE, $offset)) {
             $offset = $matches[0][1];
+
             return $matches[0][0];
         }
 

diff --git a/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php b/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php
@@ -100,7 +100,9 @@ public function quote($value, $type = ParameterType::STRING)
     {
         if (is_int($value)) {
             return $value;
-        } elseif (is_float($value)) {
+        }
+
+        if (is_float($value)) {
             return sprintf('%F', $value);
         }
 

diff --git a/lib/Doctrine/DBAL/DriverManager.php b/lib/Doctrine/DBAL/DriverManager.php
@@ -174,7 +174,9 @@ public static function getConnection(
         // check for existing pdo object
         if (isset($params['pdo']) && ! $params['pdo'] instanceof PDO) {
             throw DBALException::invalidPdoInstance();
-        } elseif (isset($params['pdo'])) {
+        }
+
+        if (isset($params['pdo'])) {
             $params['pdo']->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
             $params['driver'] = 'pdo_' . $params['pdo']->getAttribute(PDO::ATTR_DRIVER_NAME);
         } else {

diff --git a/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php b/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
@@ -2968,7 +2968,6 @@ public function getDateTimeTzTypeDeclarationSQL(array $fieldDeclaration)
         return $this->getDateTimeTypeDeclarationSQL($fieldDeclaration);
     }
 
-
     /**
      * Obtains DBMS specific SQL to be used to create date fields in statements
      * like CREATE TABLE.

diff --git a/lib/Doctrine/DBAL/Platforms/DB2Platform.php b/lib/Doctrine/DBAL/Platforms/DB2Platform.php
@@ -501,6 +501,7 @@ protected function _getCreateTableSQL($tableName, array $columns, array $options
         foreach ($indexes as $definition) {
             $sqls[] = $this->getCreateIndexSQL($definition, $tableName);
         }
+
         return $sqls;
     }
 

diff --git a/lib/Doctrine/DBAL/Platforms/OraclePlatform.php b/lib/Doctrine/DBAL/Platforms/OraclePlatform.php
@@ -201,9 +201,13 @@ private function getSequenceCacheSQL(Sequence $sequence)
     {
         if ($sequence->getCache() === 0) {
             return ' NOCACHE';
-        } elseif ($sequence->getCache() === 1) {
+        }
+
+        if ($sequence->getCache() === 1) {
             return ' NOCACHE';
-        } elseif ($sequence->getCache() > 1) {
+        }
+
+        if ($sequence->getCache() > 1) {
             return ' CACHE ' . $sequence->getCache();
         }
 

diff --git a/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php b/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
@@ -821,7 +821,7 @@ private function convertSingleBooleanValue($value, $callback)
         }
 
         if (is_bool($value) || is_numeric($value)) {
-            return $callback($value ? true : false);
+            return $callback((bool) $value);
         }
 
         if (! is_string($value)) {

diff --git a/lib/Doctrine/DBAL/Platforms/SQLAnywherePlatform.php b/lib/Doctrine/DBAL/Platforms/SQLAnywherePlatform.php
@@ -627,12 +627,15 @@ public function getForeignKeyMatchClauseSQL($type)
         switch ((int) $type) {
             case self::FOREIGN_KEY_MATCH_SIMPLE:
                 return 'SIMPLE';
+
                 break;
             case self::FOREIGN_KEY_MATCH_FULL:
                 return 'FULL';
+
                 break;
             case self::FOREIGN_KEY_MATCH_SIMPLE_UNIQUE:
                 return 'UNIQUE SIMPLE';
+
                 break;
             case self::FOREIGN_KEY_MATCH_FULL_UNIQUE:
                 return 'UNIQUE FULL';

diff --git a/lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php b/lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php
@@ -1349,6 +1349,7 @@ private function scrubInnerOrderBy($query)
             $query  = substr($query, 0, $orderByPos) . substr($query, $currentPosition - 1);
             $offset = $orderByPos;
         }
+
         return $query;
     }
 

diff --git a/lib/Doctrine/DBAL/Platforms/SqlitePlatform.php b/lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
@@ -1070,12 +1070,14 @@ private function getIndexesInAlteredTable(TableDiff $diff)
                 if (! isset($columnNames[$normalizedColumnName])) {
                     unset($indexes[$key]);
                     continue 2;
-                } else {
-                    $indexColumns[] = $columnNames[$normalizedColumnName];
-                    if ($columnName !== $columnNames[$normalizedColumnName]) {
-                        $changed = true;
-                    }
                 }
+
+                $indexColumns[] = $columnNames[$normalizedColumnName];
+                if ($columnName === $columnNames[$normalizedColumnName]) {
+                    continue;
+                }
+
+                $changed = true;
             }
 
             if (! $changed) {
@@ -1122,12 +1124,14 @@ private function getForeignKeysInAlteredTable(TableDiff $diff)
                 if (! isset($columnNames[$normalizedColumnName])) {
                     unset($foreignKeys[$key]);
                     continue 2;
-                } else {
-                    $localColumns[] = $columnNames[$normalizedColumnName];
-                    if ($columnName !== $columnNames[$normalizedColumnName]) {
-                        $changed = true;
-                    }
                 }
+
+                $localColumns[] = $columnNames[$normalizedColumnName];
+                if ($columnName === $columnNames[$normalizedColumnName]) {
+                    continue;
+                }
+
+                $changed = true;
             }
 
             if (! $changed) {

diff --git a/lib/Doctrine/DBAL/Query/QueryBuilder.php b/lib/Doctrine/DBAL/Query/QueryBuilder.php
@@ -866,7 +866,6 @@ public function groupBy($groupBy)
         return $this->add('groupBy', $groupBy, false);
     }
 
-
     /**
      * Adds a grouping expression to the query.
      *
@@ -1188,6 +1187,7 @@ private function getSQLForInsert()
     private function getSQLForUpdate()
     {
         $table = $this->sqlParts['from']['table'] . ($this->sqlParts['from']['alias'] ? ' ' . $this->sqlParts['from']['alias'] : '');
+
         return 'UPDATE ' . $table
             . ' SET ' . implode(', ', $this->sqlParts['set'])
             . ($this->sqlParts['where'] !== null ? ' WHERE ' . ((string) $this->sqlParts['where']) : '');
@@ -1201,6 +1201,7 @@ private function getSQLForUpdate()
     private function getSQLForDelete()
     {
         $table = $this->sqlParts['from']['table'] . ($this->sqlParts['from']['alias'] ? ' ' . $this->sqlParts['from']['alias'] : '');
+
         return 'DELETE FROM ' . $table . ($this->sqlParts['where'] !== null ? ' WHERE ' . ((string) $this->sqlParts['where']) : '');
     }