evolution-cms / evolution

core/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php

Unused Use Statements +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
 
 namespace Doctrine\DBAL\Driver\PDOPgSql;
 
+use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Driver\AbstractPostgreSQLDriver;
 use Doctrine\DBAL\Driver\PDOConnection;
-use Doctrine\DBAL\DBALException;
-use PDOException;
 use PDO;
+use PDOException;
 use function defined;
 
 /**

Spacing +13 added lines, -13 removed lines

@@ -47,7 +47,7 @@ 
             );
 
             if (defined('PDO::PGSQL_ATTR_DISABLE_PREPARES')
-                && (! isset($driverOptions[PDO::PGSQL_ATTR_DISABLE_PREPARES])
+                && (!isset($driverOptions[PDO::PGSQL_ATTR_DISABLE_PREPARES])
                     || true === $driverOptions[PDO::PGSQL_ATTR_DISABLE_PREPARES]
                 )
             ) {
@@ -59,7 +59,7 @@ 
              * - passing client_encoding via the 'options' param breaks pgbouncer support
              */
             if (isset($params['charset'])) {
-                $pdo->exec('SET NAMES \'' . $params['charset'] . '\'');
+                $pdo->exec('SET NAMES \''.$params['charset'].'\'');
             }
 
             return $pdo;
@@ -80,46 +80,46 @@ 
         $dsn = 'pgsql:';
 
         if (isset($params['host']) && $params['host'] != '') {
-            $dsn .= 'host=' . $params['host'] . ';';
+            $dsn .= 'host='.$params['host'].';';
         }
 
         if (isset($params['port']) && $params['port'] != '') {
-            $dsn .= 'port=' . $params['port'] . ';';
+            $dsn .= 'port='.$params['port'].';';
         }
 
         if (isset($params['dbname'])) {
-            $dsn .= 'dbname=' . $params['dbname'] . ';';
+            $dsn .= 'dbname='.$params['dbname'].';';
         } elseif (isset($params['default_dbname'])) {
-            $dsn .= 'dbname=' . $params['default_dbname'] . ';';
+            $dsn .= 'dbname='.$params['default_dbname'].';';
         } else {
             // Used for temporary connections to allow operations like dropping the database currently connected to.
             // Connecting without an explicit database does not work, therefore "postgres" database is used
             // as it is mostly present in every server setup.
-            $dsn .= 'dbname=postgres' . ';';
+            $dsn .= 'dbname=postgres'.';';
         }
 
         if (isset($params['sslmode'])) {
-            $dsn .= 'sslmode=' . $params['sslmode'] . ';';
+            $dsn .= 'sslmode='.$params['sslmode'].';';
         }
 
         if (isset($params['sslrootcert'])) {
-            $dsn .= 'sslrootcert=' . $params['sslrootcert'] . ';';
+            $dsn .= 'sslrootcert='.$params['sslrootcert'].';';
         }
 
         if (isset($params['sslcert'])) {
-            $dsn .= 'sslcert=' . $params['sslcert'] . ';';
+            $dsn .= 'sslcert='.$params['sslcert'].';';
         }
 
         if (isset($params['sslkey'])) {
-            $dsn .= 'sslkey=' . $params['sslkey'] . ';';
+            $dsn .= 'sslkey='.$params['sslkey'].';';
         }
 
         if (isset($params['sslcrl'])) {
-            $dsn .= 'sslcrl=' . $params['sslcrl'] . ';';
+            $dsn .= 'sslcrl='.$params['sslcrl'].';';
         }
 
         if (isset($params['application_name'])) {
-            $dsn .= 'application_name=' . $params['application_name'] . ';';
+            $dsn .= 'application_name='.$params['application_name'].';';
         }
 
         return $dsn;

core/vendor/doctrine/dbal/lib/Doctrine/DBAL/Event/Listeners/MysqlSessionInit.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -19,9 +19,9 @@
 
 namespace Doctrine\DBAL\Event\Listeners;
 
+use Doctrine\Common\EventSubscriber;
 use Doctrine\DBAL\Event\ConnectionEventArgs;
 use Doctrine\DBAL\Events;
-use Doctrine\Common\EventSubscriber;
 
 /**
  * MySQL Session Init Event Subscriber which allows to set the Client Encoding of the Connection.

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
     public function postConnect(ConnectionEventArgs $args)
     {
         $collation = ($this->_collation) ? " COLLATE ".$this->_collation : "";
-        $args->getConnection()->executeUpdate("SET NAMES ".$this->_charset . $collation);
+        $args->getConnection()->executeUpdate("SET NAMES ".$this->_charset.$collation);
     }
 
     /**

core/vendor/doctrine/dbal/lib/Doctrine/DBAL/Event/Listeners/OracleSessionInit.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -19,9 +19,9 @@
 
 namespace Doctrine\DBAL\Event\Listeners;
 
+use Doctrine\Common\EventSubscriber;
 use Doctrine\DBAL\Event\ConnectionEventArgs;
 use Doctrine\DBAL\Events;
-use Doctrine\Common\EventSubscriber;
 use function array_change_key_case;
 use function array_merge;
 use function count;

Spacing +2 added lines, -2 removed lines

@@ -74,9 +74,9 @@
             $vars = [];
             foreach ($this->_defaultSessionVars as $option => $value) {
                 if ($option === 'CURRENT_SCHEMA') {
-                    $vars[] = $option . " = " . $value;
+                    $vars[] = $option." = ".$value;
                 } else {
-                    $vars[] = $option . " = '" . $value . "'";
+                    $vars[] = $option." = '".$value."'";
                 }
             }
             $sql = "ALTER SESSION SET ".implode(" ", $vars);

core/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php

Doc Comments +5 added lines, -5 removed lines

@@ -537,7 +537,7 @@ 
     /**
      * Marks this type as to be commented in ALTER TABLE and CREATE TABLE statements.
      *
-     * @param string|\Doctrine\DBAL\Types\Type $doctrineType
+     * @param Type $doctrineType
      *
      * @return void
      */
@@ -661,7 +661,7 @@ 
     /**
      * Gets all SQL wildcard characters of the platform.
      *
-     * @return array
+     * @return string[]
      */
     public function getWildcards()
     {
@@ -1699,7 +1699,7 @@ 
      * @param array  $columns
      * @param array  $options
      *
-     * @return array
+     * @return string[]
      */
     protected function _getCreateTableSQL($tableName, array $columns, array $options = [])
     {
@@ -1882,7 +1882,7 @@ 
      * Returns the SQL to create an unnamed primary key constraint.
      *
      * @param \Doctrine\DBAL\Schema\Index        $index
-     * @param \Doctrine\DBAL\Schema\Table|string $table
+     * @param string $table
      *
      * @return string
      */
@@ -2180,7 +2180,7 @@ 
      * @param \Doctrine\DBAL\Schema\Index $index        The definition of the index to rename to.
      * @param string                      $tableName    The table to rename the given index on.
      *
-     * @return array The sequence of SQL statements for renaming the given index.
+     * @return string[] The sequence of SQL statements for renaming the given index.
      */
     protected function getRenameIndexSQL($oldIndexName, Index $index, $tableName)
     {

Spacing +118 added lines, -118 removed lines

@@ -295,7 +295,7 @@ 
      */
     public function getVarcharTypeDeclarationSQL(array $field)
     {
-        if ( !isset($field['length'])) {
+        if (!isset($field['length'])) {
             $field['length'] = $this->getVarcharDefaultLength();
         }
 
@@ -321,7 +321,7 @@ 
      */
     public function getBinaryTypeDeclarationSQL(array $field)
     {
-        if ( ! isset($field['length'])) {
+        if (!isset($field['length'])) {
             $field['length'] = $this->getBinaryDefaultLength();
         }
 
@@ -476,7 +476,7 @@ 
         $dbType = strtolower($dbType);
 
         if (!isset($this->doctrineTypeMapping[$dbType])) {
-            throw new \Doctrine\DBAL\DBALException("Unknown database type ".$dbType." requested, " . get_class($this) . " may not support it.");
+            throw new \Doctrine\DBAL\DBALException("Unknown database type ".$dbType." requested, ".get_class($this)." may not support it.");
         }
 
         return $this->doctrineTypeMapping[$dbType];
@@ -559,7 +559,7 @@ 
      */
     public function getDoctrineTypeComment(Type $doctrineType)
     {
-        return '(DC2Type:' . $doctrineType->getName() . ')';
+        return '(DC2Type:'.$doctrineType->getName().')';
     }
 
     /**
@@ -703,7 +703,7 @@ 
      */
     public function getAvgExpression($column)
     {
-        return 'AVG(' . $column . ')';
+        return 'AVG('.$column.')';
     }
 
     /**
@@ -717,7 +717,7 @@ 
      */
     public function getCountExpression($column)
     {
-        return 'COUNT(' . $column . ')';
+        return 'COUNT('.$column.')';
     }
 
     /**
@@ -729,7 +729,7 @@ 
      */
     public function getMaxExpression($column)
     {
-        return 'MAX(' . $column . ')';
+        return 'MAX('.$column.')';
     }
 
     /**
@@ -741,7 +741,7 @@ 
      */
     public function getMinExpression($column)
     {
-        return 'MIN(' . $column . ')';
+        return 'MIN('.$column.')';
     }
 
     /**
@@ -753,7 +753,7 @@ 
      */
     public function getSumExpression($column)
     {
-        return 'SUM(' . $column . ')';
+        return 'SUM('.$column.')';
     }
 
     // scalar functions
@@ -769,7 +769,7 @@ 
      */
     public function getMd5Expression($column)
     {
-        return 'MD5(' . $column . ')';
+        return 'MD5('.$column.')';
     }
 
     /**
@@ -781,7 +781,7 @@ 
      */
     public function getLengthExpression($column)
     {
-        return 'LENGTH(' . $column . ')';
+        return 'LENGTH('.$column.')';
     }
 
     /**
@@ -793,7 +793,7 @@ 
      */
     public function getSqrtExpression($column)
     {
-        return 'SQRT(' . $column . ')';
+        return 'SQRT('.$column.')';
     }
 
     /**
@@ -806,7 +806,7 @@ 
      */
     public function getRoundExpression($column, $decimals = 0)
     {
-        return 'ROUND(' . $column . ', ' . $decimals . ')';
+        return 'ROUND('.$column.', '.$decimals.')';
     }
 
     /**
@@ -819,7 +819,7 @@ 
      */
     public function getModExpression($expression1, $expression2)
     {
-        return 'MOD(' . $expression1 . ', ' . $expression2 . ')';
+        return 'MOD('.$expression1.', '.$expression2.')';
     }
 
     /**
@@ -850,14 +850,14 @@ 
         }
 
         if ($char !== false) {
-            $expression .= $char . ' ';
+            $expression .= $char.' ';
         }
 
         if ($mode || $char !== false) {
             $expression .= 'FROM ';
         }
 
-        return 'TRIM(' . $expression . $str . ')';
+        return 'TRIM('.$expression.$str.')';
     }
 
     /**
@@ -869,7 +869,7 @@ 
      */
     public function getRtrimExpression($str)
     {
-        return 'RTRIM(' . $str . ')';
+        return 'RTRIM('.$str.')';
     }
 
     /**
@@ -881,7 +881,7 @@ 
      */
     public function getLtrimExpression($str)
     {
-        return 'LTRIM(' . $str . ')';
+        return 'LTRIM('.$str.')';
     }
 
     /**
@@ -894,7 +894,7 @@ 
      */
     public function getUpperExpression($str)
     {
-        return 'UPPER(' . $str . ')';
+        return 'UPPER('.$str.')';
     }
 
     /**
@@ -907,7 +907,7 @@ 
      */
     public function getLowerExpression($str)
     {
-        return 'LOWER(' . $str . ')';
+        return 'LOWER('.$str.')';
     }
 
     /**
@@ -952,10 +952,10 @@ 
     public function getSubstringExpression($value, $from, $length = null)
     {
         if ($length === null) {
-            return 'SUBSTRING(' . $value . ' FROM ' . $from . ')';
+            return 'SUBSTRING('.$value.' FROM '.$from.')';
         }
 
-        return 'SUBSTRING(' . $value . ' FROM ' . $from . ' FOR ' . $length . ')';
+        return 'SUBSTRING('.$value.' FROM '.$from.' FOR '.$length.')';
     }
 
     /**
@@ -987,7 +987,7 @@ 
      */
     public function getNotExpression($expression)
     {
-        return 'NOT(' . $expression . ')';
+        return 'NOT('.$expression.')';
     }
 
     /**
@@ -999,7 +999,7 @@ 
      */
     public function getIsNullExpression($expression)
     {
-        return $expression . ' IS NULL';
+        return $expression.' IS NULL';
     }
 
     /**
@@ -1011,7 +1011,7 @@ 
      */
     public function getIsNotNullExpression($expression)
     {
-        return $expression . ' IS NOT NULL';
+        return $expression.' IS NOT NULL';
     }
 
     /**
@@ -1031,7 +1031,7 @@ 
      */
     public function getBetweenExpression($expression, $value1, $value2)
     {
-        return $expression . ' BETWEEN ' .$value1 . ' AND ' . $value2;
+        return $expression.' BETWEEN '.$value1.' AND '.$value2;
     }
 
     /**
@@ -1043,7 +1043,7 @@ 
      */
     public function getAcosExpression($value)
     {
-        return 'ACOS(' . $value . ')';
+        return 'ACOS('.$value.')';
     }
 
     /**
@@ -1055,7 +1055,7 @@ 
      */
     public function getSinExpression($value)
     {
-        return 'SIN(' . $value . ')';
+        return 'SIN('.$value.')';
     }
 
     /**
@@ -1077,7 +1077,7 @@ 
      */
     public function getCosExpression($value)
     {
-        return 'COS(' . $value . ')';
+        return 'COS('.$value.')';
     }
 
     /**
@@ -1365,7 +1365,7 @@ 
      */
     public function getBitAndComparisonExpression($value1, $value2)
     {
-        return '(' . $value1 . ' & ' . $value2 . ')';
+        return '('.$value1.' & '.$value2.')';
     }
 
     /**
@@ -1378,7 +1378,7 @@ 
      */
     public function getBitOrComparisonExpression($value1, $value2)
     {
-        return '(' . $value1 . ' | ' . $value2 . ')';
+        return '('.$value1.' | '.$value2.')';
     }
 
     /**
@@ -1439,7 +1439,7 @@ 
      */
     public function getDropDatabaseSQL($database)
     {
-        return 'DROP DATABASE ' . $database;
+        return 'DROP DATABASE '.$database;
     }
 
     /**
@@ -1470,7 +1470,7 @@ 
             }
         }
 
-        return 'DROP TABLE ' . $table;
+        return 'DROP TABLE '.$table;
     }
 
     /**
@@ -1503,7 +1503,7 @@ 
             throw new \InvalidArgumentException('AbstractPlatform::getDropIndexSQL() expects $index parameter to be string or \Doctrine\DBAL\Schema\Index.');
         }
 
-        return 'DROP INDEX ' . $index;
+        return 'DROP INDEX '.$index;
     }
 
     /**
@@ -1516,18 +1516,18 @@ 
      */
     public function getDropConstraintSQL($constraint, $table)
     {
-        if (! $constraint instanceof Constraint) {
+        if (!$constraint instanceof Constraint) {
             $constraint = new Identifier($constraint);
         }
 
-        if (! $table instanceof Table) {
+        if (!$table instanceof Table) {
             $table = new Identifier($table);
         }
 
         $constraint = $constraint->getQuotedName($this);
         $table = $table->getQuotedName($this);
 
-        return 'ALTER TABLE ' . $table . ' DROP CONSTRAINT ' . $constraint;
+        return 'ALTER TABLE '.$table.' DROP CONSTRAINT '.$constraint;
     }
 
     /**
@@ -1540,18 +1540,18 @@ 
      */
     public function getDropForeignKeySQL($foreignKey, $table)
     {
-        if (! $foreignKey instanceof ForeignKeyConstraint) {
+        if (!$foreignKey instanceof ForeignKeyConstraint) {
             $foreignKey = new Identifier($foreignKey);
         }
 
-        if (! $table instanceof Table) {
+        if (!$table instanceof Table) {
             $table = new Identifier($table);
         }
 
         $foreignKey = $foreignKey->getQuotedName($this);
         $table = $table->getQuotedName($this);
 
-        return 'ALTER TABLE ' . $table . ' DROP FOREIGN KEY ' . $foreignKey;
+        return 'ALTER TABLE '.$table.' DROP FOREIGN KEY '.$foreignKey;
     }
 
     /**
@@ -1568,7 +1568,7 @@ 
      */
     public function getCreateTableSQL(Table $table, $createFlags = self::CREATE_INDEXES)
     {
-        if ( ! is_int($createFlags)) {
+        if (!is_int($createFlags)) {
             throw new \InvalidArgumentException("Second argument of AbstractPlatform::getCreateTableSQL() has to be integer.");
         }
 
@@ -1582,7 +1582,7 @@ 
         $options['indexes'] = [];
         $options['primary'] = [];
 
-        if (($createFlags&self::CREATE_INDEXES) > 0) {
+        if (($createFlags & self::CREATE_INDEXES) > 0) {
             foreach ($table->getIndexes() as $index) {
                 /* @var $index Index */
                 if ($index->isPrimary()) {
@@ -1627,7 +1627,7 @@ 
             $columns[$columnData['name']] = $columnData;
         }
 
-        if (($createFlags&self::CREATE_FOREIGNKEYS) > 0) {
+        if (($createFlags & self::CREATE_FOREIGNKEYS) > 0) {
             $options['foreignKeys'] = [];
             foreach ($table->getForeignKeys() as $fkConstraint) {
                 $options['foreignKeys'][] = $fkConstraint;
@@ -1670,8 +1670,8 @@ 
         $columnName = new Identifier($columnName);
         $comment = $this->quoteStringLiteral($comment);
 
-        return "COMMENT ON COLUMN " . $tableName->getQuotedName($this) . "." . $columnName->getQuotedName($this) .
-            " IS " . $comment;
+        return "COMMENT ON COLUMN ".$tableName->getQuotedName($this).".".$columnName->getQuotedName($this).
+            " IS ".$comment;
     }
 
     /**
@@ -1685,11 +1685,11 @@ 
      */
     public function getInlineColumnCommentSQL($comment)
     {
-        if (! $this->supportsInlineColumnComments()) {
+        if (!$this->supportsInlineColumnComments()) {
             throw DBALException::notSupported(__METHOD__);
         }
 
-        return "COMMENT " . $this->quoteStringLiteral($comment);
+        return "COMMENT ".$this->quoteStringLiteral($comment);
     }
 
     /**
@@ -1705,27 +1705,27 @@ 
     {
         $columnListSql = $this->getColumnDeclarationListSQL($columns);
 
-        if (isset($options['uniqueConstraints']) && ! empty($options['uniqueConstraints'])) {
+        if (isset($options['uniqueConstraints']) && !empty($options['uniqueConstraints'])) {
             foreach ($options['uniqueConstraints'] as $name => $definition) {
-                $columnListSql .= ', ' . $this->getUniqueConstraintDeclarationSQL($name, $definition);
+                $columnListSql .= ', '.$this->getUniqueConstraintDeclarationSQL($name, $definition);
             }
         }
 
-        if (isset($options['primary']) && ! empty($options['primary'])) {
-            $columnListSql .= ', PRIMARY KEY(' . implode(', ', array_unique(array_values($options['primary']))) . ')';
+        if (isset($options['primary']) && !empty($options['primary'])) {
+            $columnListSql .= ', PRIMARY KEY('.implode(', ', array_unique(array_values($options['primary']))).')';
         }
 
-        if (isset($options['indexes']) && ! empty($options['indexes'])) {
+        if (isset($options['indexes']) && !empty($options['indexes'])) {
             foreach ($options['indexes'] as $index => $definition) {
-                $columnListSql .= ', ' . $this->getIndexDeclarationSQL($index, $definition);
+                $columnListSql .= ', '.$this->getIndexDeclarationSQL($index, $definition);
             }
         }
 
-        $query = 'CREATE TABLE ' . $tableName . ' (' . $columnListSql;
+        $query = 'CREATE TABLE '.$tableName.' ('.$columnListSql;
 
         $check = $this->getCheckDeclarationSQL($columns);
-        if ( ! empty($check)) {
-            $query .= ', ' . $check;
+        if (!empty($check)) {
+            $query .= ', '.$check;
         }
         $query .= ')';
 
@@ -1792,9 +1792,9 @@ 
             $table = $table->getQuotedName($this);
         }
 
-        $query = 'ALTER TABLE ' . $table . ' ADD CONSTRAINT ' . $constraint->getQuotedName($this);
+        $query = 'ALTER TABLE '.$table.' ADD CONSTRAINT '.$constraint->getQuotedName($this);
 
-        $columnList = '('. implode(', ', $constraint->getQuotedColumns($this)) . ')';
+        $columnList = '('.implode(', ', $constraint->getQuotedColumns($this)).')';
 
         $referencesClause = '';
         if ($constraint instanceof Index) {
@@ -1810,8 +1810,8 @@ 
         } elseif ($constraint instanceof ForeignKeyConstraint) {
             $query .= ' FOREIGN KEY';
 
-            $referencesClause = ' REFERENCES ' . $constraint->getQuotedForeignTableName($this) .
-                ' (' . implode(', ', $constraint->getQuotedForeignColumns($this)) . ')';
+            $referencesClause = ' REFERENCES '.$constraint->getQuotedForeignTableName($this).
+                ' ('.implode(', ', $constraint->getQuotedForeignColumns($this)).')';
         }
         $query .= ' '.$columnList.$referencesClause;
 
@@ -1844,8 +1844,8 @@ 
             return $this->getCreatePrimaryKeySQL($index, $table);
         }
 
-        $query = 'CREATE ' . $this->getCreateIndexSQLFlags($index) . 'INDEX ' . $name . ' ON ' . $table;
-        $query .= ' (' . $this->getIndexFieldDeclarationListSQL($columns) . ')' . $this->getPartialIndexSQL($index);
+        $query = 'CREATE '.$this->getCreateIndexSQLFlags($index).'INDEX '.$name.' ON '.$table;
+        $query .= ' ('.$this->getIndexFieldDeclarationListSQL($columns).')'.$this->getPartialIndexSQL($index);
 
         return $query;
     }
@@ -1860,7 +1860,7 @@ 
     protected function getPartialIndexSQL(Index $index)
     {
         if ($this->supportsPartialIndexes() && $index->hasOption('where')) {
-            return  ' WHERE ' . $index->getOption('where');
+            return  ' WHERE '.$index->getOption('where');
         }
 
         return '';
@@ -1888,7 +1888,7 @@ 
      */
     public function getCreatePrimaryKeySQL(Index $index, $table)
     {
-        return 'ALTER TABLE ' . $table . ' ADD PRIMARY KEY (' . $this->getIndexFieldDeclarationListSQL($index->getQuotedColumns($this)) . ')';
+        return 'ALTER TABLE '.$table.' ADD PRIMARY KEY ('.$this->getIndexFieldDeclarationListSQL($index->getQuotedColumns($this)).')';
     }
 
     /**
@@ -1939,7 +1939,7 @@ 
     {
         $c = $this->getIdentifierQuoteCharacter();
 
-        return $c . str_replace($c, $c.$c, $str) . $c;
+        return $c.str_replace($c, $c.$c, $str).$c;
     }
 
     /**
@@ -1956,7 +1956,7 @@ 
             $table = $table->getQuotedName($this);
         }
 
-        $query = 'ALTER TABLE ' . $table . ' ADD ' . $this->getForeignKeyDeclarationSQL($foreignKey);
+        $query = 'ALTER TABLE '.$table.' ADD '.$this->getForeignKeyDeclarationSQL($foreignKey);
 
         return $query;
     }
@@ -1990,7 +1990,7 @@ 
             return false;
         }
 
-        if ( ! $this->_eventManager->hasListeners(Events::onSchemaAlterTableAddColumn)) {
+        if (!$this->_eventManager->hasListeners(Events::onSchemaAlterTableAddColumn)) {
             return false;
         }
 
@@ -2015,7 +2015,7 @@ 
             return false;
         }
 
-        if ( ! $this->_eventManager->hasListeners(Events::onSchemaAlterTableRemoveColumn)) {
+        if (!$this->_eventManager->hasListeners(Events::onSchemaAlterTableRemoveColumn)) {
             return false;
         }
 
@@ -2040,7 +2040,7 @@ 
             return false;
         }
 
-        if ( ! $this->_eventManager->hasListeners(Events::onSchemaAlterTableChangeColumn)) {
+        if (!$this->_eventManager->hasListeners(Events::onSchemaAlterTableChangeColumn)) {
             return false;
         }
 
@@ -2066,7 +2066,7 @@ 
             return false;
         }
 
-        if ( ! $this->_eventManager->hasListeners(Events::onSchemaAlterTableRenameColumn)) {
+        if (!$this->_eventManager->hasListeners(Events::onSchemaAlterTableRenameColumn)) {
             return false;
         }
 
@@ -2090,7 +2090,7 @@ 
             return false;
         }
 
-        if ( ! $this->_eventManager->hasListeners(Events::onSchemaAlterTable)) {
+        if (!$this->_eventManager->hasListeners(Events::onSchemaAlterTable)) {
             return false;
         }
 
@@ -2283,28 +2283,28 @@ 
             $default = $this->getDefaultValueDeclarationSQL($field);
 
             $charset = (isset($field['charset']) && $field['charset']) ?
-                ' ' . $this->getColumnCharsetDeclarationSQL($field['charset']) : '';
+                ' '.$this->getColumnCharsetDeclarationSQL($field['charset']) : '';
 
             $collation = (isset($field['collation']) && $field['collation']) ?
-                ' ' . $this->getColumnCollationDeclarationSQL($field['collation']) : '';
+                ' '.$this->getColumnCollationDeclarationSQL($field['collation']) : '';
 
             $notnull = (isset($field['notnull']) && $field['notnull']) ? ' NOT NULL' : '';
 
             $unique = (isset($field['unique']) && $field['unique']) ?
-                ' ' . $this->getUniqueFieldDeclarationSQL() : '';
+                ' '.$this->getUniqueFieldDeclarationSQL() : '';
 
             $check = (isset($field['check']) && $field['check']) ?
-                ' ' . $field['check'] : '';
+                ' '.$field['check'] : '';
 
             $typeDecl = $field['type']->getSQLDeclaration($field, $this);
-            $columnDef = $typeDecl . $charset . $default . $notnull . $unique . $check . $collation;
+            $columnDef = $typeDecl.$charset.$default.$notnull.$unique.$check.$collation;
 
             if ($this->supportsInlineColumnComments() && isset($field['comment']) && $field['comment'] !== '') {
-                $columnDef .= ' ' . $this->getInlineColumnCommentSQL($field['comment']);
+                $columnDef .= ' '.$this->getInlineColumnCommentSQL($field['comment']);
             }
         }
 
-        return $name . ' ' . $columnDef;
+        return $name.' '.$columnDef;
     }
 
     /**
@@ -2316,12 +2316,12 @@ 
      */
     public function getDecimalTypeDeclarationSQL(array $columnDef)
     {
-        $columnDef['precision'] = ( ! isset($columnDef['precision']) || empty($columnDef['precision']))
+        $columnDef['precision'] = (!isset($columnDef['precision']) || empty($columnDef['precision']))
             ? 10 : $columnDef['precision'];
-        $columnDef['scale'] = ( ! isset($columnDef['scale']) || empty($columnDef['scale']))
+        $columnDef['scale'] = (!isset($columnDef['scale']) || empty($columnDef['scale']))
             ? 0 : $columnDef['scale'];
 
-        return 'NUMERIC(' . $columnDef['precision'] . ', ' . $columnDef['scale'] . ')';
+        return 'NUMERIC('.$columnDef['precision'].', '.$columnDef['scale'].')';
     }
 
     /**
@@ -2334,39 +2334,39 @@ 
      */
     public function getDefaultValueDeclarationSQL($field)
     {
-        if ( ! isset($field['default'])) {
+        if (!isset($field['default'])) {
             return empty($field['notnull']) ? ' DEFAULT NULL' : '';
         }
 
         $default = $field['default'];
 
-        if ( ! isset($field['type'])) {
-            return " DEFAULT '" . $default . "'";
+        if (!isset($field['type'])) {
+            return " DEFAULT '".$default."'";
         }
 
         $type = $field['type'];
 
         if ($type instanceof Types\PhpIntegerMappingType) {
-            return ' DEFAULT ' . $default;
+            return ' DEFAULT '.$default;
         }
 
         if ($type instanceof Types\PhpDateTimeMappingType && $default === $this->getCurrentTimestampSQL()) {
-            return ' DEFAULT ' . $this->getCurrentTimestampSQL();
+            return ' DEFAULT '.$this->getCurrentTimestampSQL();
         }
 
         if ($type instanceof Types\TimeType && $default === $this->getCurrentTimeSQL()) {
-            return ' DEFAULT ' . $this->getCurrentTimeSQL();
+            return ' DEFAULT '.$this->getCurrentTimeSQL();
         }
 
         if ($type instanceof Types\DateType && $default === $this->getCurrentDateSQL()) {
-            return ' DEFAULT ' . $this->getCurrentDateSQL();
+            return ' DEFAULT '.$this->getCurrentDateSQL();
         }
 
         if ($type instanceof Types\BooleanType) {
-            return " DEFAULT '" . $this->convertBooleans($default) . "'";
+            return " DEFAULT '".$this->convertBooleans($default)."'";
         }
 
-        return " DEFAULT '" . $default . "'";
+        return " DEFAULT '".$default."'";
     }
 
     /**
@@ -2382,14 +2382,14 @@ 
         $constraints = [];
         foreach ($definition as $field => $def) {
             if (is_string($def)) {
-                $constraints[] = 'CHECK (' . $def . ')';
+                $constraints[] = 'CHECK ('.$def.')';
             } else {
                 if (isset($def['min'])) {
-                    $constraints[] = 'CHECK (' . $field . ' >= ' . $def['min'] . ')';
+                    $constraints[] = 'CHECK ('.$field.' >= '.$def['min'].')';
                 }
 
                 if (isset($def['max'])) {
-                    $constraints[] = 'CHECK (' . $field . ' <= ' . $def['max'] . ')';
+                    $constraints[] = 'CHECK ('.$field.' <= '.$def['max'].')';
                 }
             }
         }
@@ -2417,9 +2417,9 @@ 
             throw new \InvalidArgumentException("Incomplete definition. 'columns' required.");
         }
 
-        return 'CONSTRAINT ' . $name->getQuotedName($this) . ' UNIQUE ('
+        return 'CONSTRAINT '.$name->getQuotedName($this).' UNIQUE ('
             . $this->getIndexFieldDeclarationListSQL($columns)
-            . ')' . $this->getPartialIndexSQL($index);
+            . ')'.$this->getPartialIndexSQL($index);
     }
 
     /**
@@ -2442,9 +2442,9 @@ 
             throw new \InvalidArgumentException("Incomplete definition. 'columns' required.");
         }
 
-        return $this->getCreateIndexSQLFlags($index) . 'INDEX ' . $name->getQuotedName($this) . ' ('
+        return $this->getCreateIndexSQLFlags($index).'INDEX '.$name->getQuotedName($this).' ('
             . $this->getIndexFieldDeclarationListSQL($columns)
-            . ')' . $this->getPartialIndexSQL($index);
+            . ')'.$this->getPartialIndexSQL($index);
     }
 
     /**
@@ -2544,10 +2544,10 @@ 
     {
         $query = '';
         if ($this->supportsForeignKeyOnUpdate() && $foreignKey->hasOption('onUpdate')) {
-            $query .= ' ON UPDATE ' . $this->getForeignKeyReferentialActionSQL($foreignKey->getOption('onUpdate'));
+            $query .= ' ON UPDATE '.$this->getForeignKeyReferentialActionSQL($foreignKey->getOption('onUpdate'));
         }
         if ($foreignKey->hasOption('onDelete')) {
-            $query .= ' ON DELETE ' . $this->getForeignKeyReferentialActionSQL($foreignKey->getOption('onDelete'));
+            $query .= ' ON DELETE '.$this->getForeignKeyReferentialActionSQL($foreignKey->getOption('onDelete'));
         }
 
         return $query;
@@ -2573,7 +2573,7 @@ 
             case 'SET DEFAULT':
                 return $upper;
             default:
-                throw new \InvalidArgumentException('Invalid foreign key action: ' . $upper);
+                throw new \InvalidArgumentException('Invalid foreign key action: '.$upper);
         }
     }
 
@@ -2591,7 +2591,7 @@ 
     {
         $sql = '';
         if (strlen($foreignKey->getName())) {
-            $sql .= 'CONSTRAINT ' . $foreignKey->getQuotedName($this) . ' ';
+            $sql .= 'CONSTRAINT '.$foreignKey->getQuotedName($this).' ';
         }
         $sql .= 'FOREIGN KEY (';
 
@@ -2607,8 +2607,8 @@ 
 
         $sql .= implode(', ', $foreignKey->getQuotedLocalColumns($this))
             . ') REFERENCES '
-            . $foreignKey->getQuotedForeignTableName($this) . ' ('
-            . implode(', ', $foreignKey->getQuotedForeignColumns($this)) . ')';
+            . $foreignKey->getQuotedForeignTableName($this).' ('
+            . implode(', ', $foreignKey->getQuotedForeignColumns($this)).')';
 
         return $sql;
     }
@@ -2650,7 +2650,7 @@ 
      */
     public function getColumnCollationDeclarationSQL($collation)
     {
-        return $this->supportsColumnCollation() ? 'COLLATE ' . $collation : '';
+        return $this->supportsColumnCollation() ? 'COLLATE '.$collation : '';
     }
 
     /**
@@ -2715,7 +2715,7 @@ 
      */
     public function convertFromBoolean($item)
     {
-        return null === $item ? null: (bool) $item ;
+        return null === $item ? null: (bool) $item;
     }
 
     /**
@@ -2784,7 +2784,7 @@ 
             case TransactionIsolationLevel::SERIALIZABLE:
                 return 'SERIALIZABLE';
             default:
-                throw new \InvalidArgumentException('Invalid isolation level:' . $level);
+                throw new \InvalidArgumentException('Invalid isolation level:'.$level);
         }
     }
 
@@ -3417,7 +3417,7 @@ 
             ));
         }
 
-        if ($offset > 0 && ! $this->supportsLimitOffset()) {
+        if ($offset > 0 && !$this->supportsLimitOffset()) {
             throw new DBALException(sprintf(
                 'Platform %s does not support offset values in limit queries.',
                 $this->getName()
@@ -3439,11 +3439,11 @@ 
     protected function doModifyLimitQuery($query, $limit, $offset)
     {
         if ($limit !== null) {
-            $query .= ' LIMIT ' . $limit;
+            $query .= ' LIMIT '.$limit;
         }
 
         if ($offset > 0) {
-            $query .= ' OFFSET ' . $offset;
+            $query .= ' OFFSET '.$offset;
         }
 
         return $query;
@@ -3504,7 +3504,7 @@ 
      */
     public function getEmptyIdentityInsertSQL($tableName, $identifierColumnName)
     {
-        return 'INSERT INTO ' . $tableName . ' (' . $identifierColumnName . ') VALUES (null)';
+        return 'INSERT INTO '.$tableName.' ('.$identifierColumnName.') VALUES (null)';
     }
 
     /**
@@ -3522,7 +3522,7 @@ 
     {
         $tableIdentifier = new Identifier($tableName);
 
-        return 'TRUNCATE ' . $tableIdentifier->getQuotedName($this);
+        return 'TRUNCATE '.$tableIdentifier->getQuotedName($this);
     }
 
     /**
@@ -3546,7 +3546,7 @@ 
      */
     public function createSavePoint($savepoint)
     {
-        return 'SAVEPOINT ' . $savepoint;
+        return 'SAVEPOINT '.$savepoint;
     }
 
     /**
@@ -3558,7 +3558,7 @@ 
      */
     public function releaseSavePoint($savepoint)
     {
-        return 'RELEASE SAVEPOINT ' . $savepoint;
+        return 'RELEASE SAVEPOINT '.$savepoint;
     }
 
     /**
@@ -3570,7 +3570,7 @@ 
      */
     public function rollbackSavePoint($savepoint)
     {
-        return 'ROLLBACK TO SAVEPOINT ' . $savepoint;
+        return 'ROLLBACK TO SAVEPOINT '.$savepoint;
     }
 
     /**
@@ -3589,7 +3589,7 @@ 
 
         $class = $this->getReservedKeywordsClass();
         $keywords = new $class;
-        if ( ! $keywords instanceof \Doctrine\DBAL\Platforms\Keywords\KeywordList) {
+        if (!$keywords instanceof \Doctrine\DBAL\Platforms\Keywords\KeywordList) {
             throw DBALException::notSupported(__METHOD__);
         }
 
@@ -3625,7 +3625,7 @@ 
     {
         $c = $this->getStringLiteralQuoteCharacter();
 
-        return $c . str_replace($c, $c . $c, $str) . $c;
+        return $c.str_replace($c, $c.$c, $str).$c;
     }
 
     /**
@@ -3649,8 +3649,8 @@ 
     final public function escapeStringForLike(string $inputString, string $escapeChar) : string
     {
         return preg_replace(
-            '~([' . preg_quote($this->getLikeWildcardCharacters() . $escapeChar, '~') . '])~u',
-            addcslashes($escapeChar, '\\') . '$1',
+            '~(['.preg_quote($this->getLikeWildcardCharacters().$escapeChar, '~').'])~u',
+            addcslashes($escapeChar, '\\').'$1',
             $inputString
         );
     }

core/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/DrizzlePlatform.php

Doc Comments +1 added lines

@@ -457,6 +457,7 @@
 
     /**
      * {@inheritDoc}
+     * @param string $table
      */
     protected function getDropPrimaryKeySQL($table)
     {

Indentation +8 added lines, -8 removed lines

@@ -350,9 +350,9 @@ 
         }
 
         return "SELECT COLUMN_NAME, DATA_TYPE, COLUMN_COMMENT, IS_NULLABLE, IS_AUTO_INCREMENT, CHARACTER_MAXIMUM_LENGTH, COLUMN_DEFAULT," .
-               " NUMERIC_PRECISION, NUMERIC_SCALE, COLLATION_NAME" .
-               " FROM DATA_DICTIONARY.COLUMNS" .
-               " WHERE TABLE_SCHEMA=" . $database . " AND TABLE_NAME = '" . $table . "'";
+                " NUMERIC_PRECISION, NUMERIC_SCALE, COLLATION_NAME" .
+                " FROM DATA_DICTIONARY.COLUMNS" .
+                " WHERE TABLE_SCHEMA=" . $database . " AND TABLE_NAME = '" . $table . "'";
     }
 
     /**
@@ -367,8 +367,8 @@ 
         }
 
         return "SELECT CONSTRAINT_NAME, CONSTRAINT_COLUMNS, REFERENCED_TABLE_NAME, REFERENCED_TABLE_COLUMNS, UPDATE_RULE, DELETE_RULE" .
-               " FROM DATA_DICTIONARY.FOREIGN_KEYS" .
-               " WHERE CONSTRAINT_SCHEMA=" . $database . " AND CONSTRAINT_TABLE='" . $table . "'";
+                " FROM DATA_DICTIONARY.FOREIGN_KEYS" .
+                " WHERE CONSTRAINT_SCHEMA=" . $database . " AND CONSTRAINT_TABLE='" . $table . "'";
     }
 
     /**
@@ -383,8 +383,8 @@ 
         }
 
         return "SELECT INDEX_NAME AS 'key_name', COLUMN_NAME AS 'column_name', IS_USED_IN_PRIMARY AS 'primary', IS_UNIQUE=0 AS 'non_unique'" .
-               " FROM DATA_DICTIONARY.INDEX_PARTS" .
-               " WHERE TABLE_SCHEMA=" . $database . " AND TABLE_NAME='" . $table . "'";
+                " FROM DATA_DICTIONARY.INDEX_PARTS" .
+                " WHERE TABLE_SCHEMA=" . $database . " AND TABLE_NAME='" . $table . "'";
     }
 
     /**
@@ -601,7 +601,7 @@ 
                 }
             }
         } elseif (is_bool($item) || is_numeric($item)) {
-           $item = ($item) ? 'true' : 'false';
+            $item = ($item) ? 'true' : 'false';
         }
 
         return $item;

Spacing +47 added lines, -47 removed lines

@@ -68,7 +68,7 @@ 
     {
         $args = func_get_args();
 
-        return 'CONCAT(' . join(', ', (array) $args) . ')';
+        return 'CONCAT('.join(', ', (array) $args).')';
     }
 
     /**
@@ -78,7 +78,7 @@ 
     {
         $function = '+' === $operator ? 'DATE_ADD' : 'DATE_SUB';
 
-        return $function . '(' . $date . ', INTERVAL ' . $interval . ' ' . $unit . ')';
+        return $function.'('.$date.', INTERVAL '.$interval.' '.$unit.')';
     }
 
     /**
@@ -86,7 +86,7 @@ 
      */
     public function getDateDiffExpression($date1, $date2)
     {
-        return 'DATEDIFF(' . $date1 . ', ' . $date2 . ')';
+        return 'DATEDIFF('.$date1.', '.$date2.')';
     }
 
     /**
@@ -102,7 +102,7 @@ 
      */
     public function getIntegerTypeDeclarationSQL(array $field)
     {
-        return 'INT' . $this->_getCommonIntegerTypeDeclarationSQL($field);
+        return 'INT'.$this->_getCommonIntegerTypeDeclarationSQL($field);
     }
 
     /**
@@ -111,7 +111,7 @@ 
     protected function _getCommonIntegerTypeDeclarationSQL(array $columnDef)
     {
         $autoinc = '';
-        if ( ! empty($columnDef['autoincrement'])) {
+        if (!empty($columnDef['autoincrement'])) {
             $autoinc = ' AUTO_INCREMENT';
         }
 
@@ -123,7 +123,7 @@ 
      */
     public function getBigIntTypeDeclarationSQL(array $field)
     {
-        return 'BIGINT' . $this->_getCommonIntegerTypeDeclarationSQL($field);
+        return 'BIGINT'.$this->_getCommonIntegerTypeDeclarationSQL($field);
     }
 
     /**
@@ -131,7 +131,7 @@ 
      */
     public function getSmallIntTypeDeclarationSQL(array $field)
     {
-        return 'INT' . $this->_getCommonIntegerTypeDeclarationSQL($field);
+        return 'INT'.$this->_getCommonIntegerTypeDeclarationSQL($field);
     }
 
     /**
@@ -139,7 +139,7 @@ 
      */
     protected function getVarcharTypeDeclarationSQLSnippet($length, $fixed)
     {
-        return $length ? 'VARCHAR(' . $length . ')' : 'VARCHAR(255)';
+        return $length ? 'VARCHAR('.$length.')' : 'VARCHAR(255)';
     }
 
     /**
@@ -147,7 +147,7 @@ 
      */
     protected function getBinaryTypeDeclarationSQLSnippet($length, $fixed)
     {
-        return 'VARBINARY(' . ($length ?: 255) . ')';
+        return 'VARBINARY('.($length ?: 255).')';
     }
 
     /**
@@ -193,7 +193,7 @@ 
      */
     public function getCreateDatabaseSQL($name)
     {
-        return 'CREATE DATABASE ' . $name;
+        return 'CREATE DATABASE '.$name;
     }
 
     /**
@@ -201,7 +201,7 @@ 
      */
     public function getDropDatabaseSQL($name)
     {
-        return 'DROP DATABASE ' . $name;
+        return 'DROP DATABASE '.$name;
     }
 
     /**
@@ -211,23 +211,23 @@ 
     {
         $queryFields = $this->getColumnDeclarationListSQL($columns);
 
-        if (isset($options['uniqueConstraints']) && ! empty($options['uniqueConstraints'])) {
+        if (isset($options['uniqueConstraints']) && !empty($options['uniqueConstraints'])) {
             foreach ($options['uniqueConstraints'] as $index => $definition) {
-                $queryFields .= ', ' . $this->getUniqueConstraintDeclarationSQL($index, $definition);
+                $queryFields .= ', '.$this->getUniqueConstraintDeclarationSQL($index, $definition);
             }
         }
 
         // add all indexes
-        if (isset($options['indexes']) && ! empty($options['indexes'])) {
+        if (isset($options['indexes']) && !empty($options['indexes'])) {
             foreach ($options['indexes'] as $index => $definition) {
-                $queryFields .= ', ' . $this->getIndexDeclarationSQL($index, $definition);
+                $queryFields .= ', '.$this->getIndexDeclarationSQL($index, $definition);
             }
         }
 
         // attach all primary keys
-        if (isset($options['primary']) && ! empty($options['primary'])) {
+        if (isset($options['primary']) && !empty($options['primary'])) {
             $keyColumns = array_unique(array_values($options['primary']));
-            $queryFields .= ', PRIMARY KEY(' . implode(', ', $keyColumns) . ')';
+            $queryFields .= ', PRIMARY KEY('.implode(', ', $keyColumns).')';
         }
 
         $query = 'CREATE ';
@@ -236,7 +236,7 @@ 
             $query .= 'TEMPORARY ';
         }
 
-        $query .= 'TABLE ' . $tableName . ' (' . $queryFields . ') ';
+        $query .= 'TABLE '.$tableName.' ('.$queryFields.') ';
         $query .= $this->buildTableOptions($options);
         $query .= $this->buildPartitionOptions($options);
 
@@ -267,14 +267,14 @@ 
         $tableOptions = [];
 
         // Collate
-        if ( ! isset($options['collate'])) {
+        if (!isset($options['collate'])) {
             $options['collate'] = 'utf8_unicode_ci';
         }
 
         $tableOptions[] = sprintf('COLLATE %s', $options['collate']);
 
         // Engine
-        if ( ! isset($options['engine'])) {
+        if (!isset($options['engine'])) {
             $options['engine'] = 'InnoDB';
         }
 
@@ -310,7 +310,7 @@ 
     private function buildPartitionOptions(array $options)
     {
         return (isset($options['partition_options']))
-            ? ' ' . $options['partition_options']
+            ? ' '.$options['partition_options']
             : '';
     }
 
@@ -344,15 +344,15 @@ 
     public function getListTableColumnsSQL($table, $database = null)
     {
         if ($database) {
-            $database = "'" . $database . "'";
+            $database = "'".$database."'";
         } else {
             $database = 'DATABASE()';
         }
 
-        return "SELECT COLUMN_NAME, DATA_TYPE, COLUMN_COMMENT, IS_NULLABLE, IS_AUTO_INCREMENT, CHARACTER_MAXIMUM_LENGTH, COLUMN_DEFAULT," .
-               " NUMERIC_PRECISION, NUMERIC_SCALE, COLLATION_NAME" .
-               " FROM DATA_DICTIONARY.COLUMNS" .
-               " WHERE TABLE_SCHEMA=" . $database . " AND TABLE_NAME = '" . $table . "'";
+        return "SELECT COLUMN_NAME, DATA_TYPE, COLUMN_COMMENT, IS_NULLABLE, IS_AUTO_INCREMENT, CHARACTER_MAXIMUM_LENGTH, COLUMN_DEFAULT,".
+               " NUMERIC_PRECISION, NUMERIC_SCALE, COLLATION_NAME".
+               " FROM DATA_DICTIONARY.COLUMNS".
+               " WHERE TABLE_SCHEMA=".$database." AND TABLE_NAME = '".$table."'";
     }
 
     /**
@@ -361,14 +361,14 @@ 
     public function getListTableForeignKeysSQL($table, $database = null)
     {
         if ($database) {
-            $database = "'" . $database . "'";
+            $database = "'".$database."'";
         } else {
             $database = 'DATABASE()';
         }
 
-        return "SELECT CONSTRAINT_NAME, CONSTRAINT_COLUMNS, REFERENCED_TABLE_NAME, REFERENCED_TABLE_COLUMNS, UPDATE_RULE, DELETE_RULE" .
-               " FROM DATA_DICTIONARY.FOREIGN_KEYS" .
-               " WHERE CONSTRAINT_SCHEMA=" . $database . " AND CONSTRAINT_TABLE='" . $table . "'";
+        return "SELECT CONSTRAINT_NAME, CONSTRAINT_COLUMNS, REFERENCED_TABLE_NAME, REFERENCED_TABLE_COLUMNS, UPDATE_RULE, DELETE_RULE".
+               " FROM DATA_DICTIONARY.FOREIGN_KEYS".
+               " WHERE CONSTRAINT_SCHEMA=".$database." AND CONSTRAINT_TABLE='".$table."'";
     }
 
     /**
@@ -377,14 +377,14 @@ 
     public function getListTableIndexesSQL($table, $database = null)
     {
         if ($database) {
-            $database = "'" . $database . "'";
+            $database = "'".$database."'";
         } else {
             $database = 'DATABASE()';
         }
 
-        return "SELECT INDEX_NAME AS 'key_name', COLUMN_NAME AS 'column_name', IS_USED_IN_PRIMARY AS 'primary', IS_UNIQUE=0 AS 'non_unique'" .
-               " FROM DATA_DICTIONARY.INDEX_PARTS" .
-               " WHERE TABLE_SCHEMA=" . $database . " AND TABLE_NAME='" . $table . "'";
+        return "SELECT INDEX_NAME AS 'key_name', COLUMN_NAME AS 'column_name', IS_USED_IN_PRIMARY AS 'primary', IS_UNIQUE=0 AS 'non_unique'".
+               " FROM DATA_DICTIONARY.INDEX_PARTS".
+               " WHERE TABLE_SCHEMA=".$database." AND TABLE_NAME='".$table."'";
     }
 
     /**
@@ -430,7 +430,7 @@ 
     /**
      * {@inheritDoc}
      */
-    public function getDropIndexSQL($index, $table=null)
+    public function getDropIndexSQL($index, $table = null)
     {
         if ($index instanceof Index) {
             $indexName = $index->getQuotedName($this);
@@ -452,7 +452,7 @@ 
             return $this->getDropPrimaryKeySQL($table);
         }
 
-        return 'DROP INDEX ' . $indexName . ' ON ' . $table;
+        return 'DROP INDEX '.$indexName.' ON '.$table;
     }
 
     /**
@@ -460,7 +460,7 @@ 
      */
     protected function getDropPrimaryKeySQL($table)
     {
-        return 'ALTER TABLE ' . $table . ' DROP PRIMARY KEY';
+        return 'ALTER TABLE '.$table.' DROP PRIMARY KEY';
     }
 
     /**
@@ -500,7 +500,7 @@ 
         $queryParts = [];
 
         if ($diff->newName !== false) {
-            $queryParts[] =  'RENAME TO ' . $diff->getNewName()->getQuotedName($this);
+            $queryParts[] = 'RENAME TO '.$diff->getNewName()->getQuotedName($this);
         }
 
         foreach ($diff->addedColumns as $column) {
@@ -510,7 +510,7 @@ 
 
             $columnArray = $column->toArray();
             $columnArray['comment'] = $this->getColumnComment($column);
-            $queryParts[] = 'ADD ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray);
+            $queryParts[] = 'ADD '.$this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray);
         }
 
         foreach ($diff->removedColumns as $column) {
@@ -518,7 +518,7 @@ 
                 continue;
             }
 
-            $queryParts[] =  'DROP ' . $column->getQuotedName($this);
+            $queryParts[] = 'DROP '.$column->getQuotedName($this);
         }
 
         foreach ($diff->changedColumns as $columnDiff) {
@@ -541,7 +541,7 @@ 
             }
 
             $columnArray['comment'] = $this->getColumnComment($column);
-            $queryParts[] =  'CHANGE ' . ($columnDiff->getOldColumnName()->getQuotedName($this)) . ' '
+            $queryParts[] = 'CHANGE '.($columnDiff->getOldColumnName()->getQuotedName($this)).' '
                     . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray);
         }
 
@@ -554,16 +554,16 @@ 
 
             $columnArray = $column->toArray();
             $columnArray['comment'] = $this->getColumnComment($column);
-            $queryParts[] =  'CHANGE ' . $oldColumnName->getQuotedName($this) . ' '
+            $queryParts[] = 'CHANGE '.$oldColumnName->getQuotedName($this).' '
                     . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray);
         }
 
         $sql = [];
         $tableSql = [];
 
-        if ( ! $this->onSchemaAlterTable($diff, $tableSql)) {
+        if (!$this->onSchemaAlterTable($diff, $tableSql)) {
             if (count($queryParts) > 0) {
-                $sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' ' . implode(", ", $queryParts);
+                $sql[] = 'ALTER TABLE '.$diff->getName($this)->getQuotedName($this).' '.implode(", ", $queryParts);
             }
             $sql = array_merge(
                 $this->getPreAlterTableIndexForeignKeySQL($diff),
@@ -586,7 +586,7 @@ 
             throw new \InvalidArgumentException('getDropTableSQL() expects $table parameter to be string or \Doctrine\DBAL\Schema\Table.');
         }
 
-        return 'DROP TEMPORARY TABLE ' . $table;
+        return 'DROP TEMPORARY TABLE '.$table;
     }
 
     /**
@@ -613,10 +613,10 @@ 
     public function getLocateExpression($str, $substr, $startPos = false)
     {
         if ($startPos == false) {
-            return 'LOCATE(' . $substr . ', ' . $str . ')';
+            return 'LOCATE('.$substr.', '.$str.')';
         }
 
-        return 'LOCATE(' . $substr . ', ' . $str . ', '.$startPos.')';
+        return 'LOCATE('.$substr.', '.$str.', '.$startPos.')';
     }
 
     /**

core/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/ReservedKeywordsValidator.php

Unused Use Statements +3 added lines, -3 removed lines

@@ -19,13 +19,13 @@
 
 namespace Doctrine\DBAL\Platforms\Keywords;
 
-use Doctrine\DBAL\Schema\Visitor\Visitor;
-use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\ForeignKeyConstraint;
+use Doctrine\DBAL\Schema\Index;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Sequence;
-use Doctrine\DBAL\Schema\Index;
+use Doctrine\DBAL\Schema\Table;
+use Doctrine\DBAL\Schema\Visitor\Visitor;
 use function implode;
 use function str_replace;
 

Spacing +4 added lines, -4 removed lines

@@ -86,11 +86,11 @@ 
      */
     private function addViolation($asset, $violatedPlatforms)
     {
-        if ( ! $violatedPlatforms) {
+        if (!$violatedPlatforms) {
             return;
         }
 
-        $this->violations[] = $asset . ' keyword violations: ' . implode(', ', $violatedPlatforms);
+        $this->violations[] = $asset.' keyword violations: '.implode(', ', $violatedPlatforms);
     }
 
     /**
@@ -99,7 +99,7 @@ 
     public function acceptColumn(Table $table, Column $column)
     {
         $this->addViolation(
-            'Table ' . $table->getName() . ' column ' . $column->getName(),
+            'Table '.$table->getName().' column '.$column->getName(),
             $this->isReservedWord($column->getName())
         );
     }
@@ -138,7 +138,7 @@ 
     public function acceptTable(Table $table)
     {
         $this->addViolation(
-            'Table ' . $table->getName(),
+            'Table '.$table->getName(),
             $this->isReservedWord($table->getName())
         );
     }

core/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/OraclePlatform.php

Doc Comments +7 added lines, -2 removed lines

@@ -499,7 +499,7 @@ 
      * @param string $table
      * @param int    $start
      *
-     * @return array
+     * @return string[]
      */
     public function getCreateAutoincrementSql($name, $table, $start = 1)
     {
@@ -563,7 +563,7 @@ 
      *
      * @param string $table The table name to drop the autoincrement for.
      *
-     * @return array
+     * @return string[]
      */
     public function getDropAutoincrementSql($table)
     {
@@ -696,6 +696,7 @@ 
 
     /**
      * {@inheritDoc}
+     * @param string $sequence
      */
     public function getDropSequenceSQL($sequence)
     {
@@ -893,6 +894,7 @@ 
 
     /**
      * {@inheritdoc}
+     * @param string $name
      */
     public function getColumnDeclarationSQL($name, array $field)
     {
@@ -951,6 +953,8 @@ 
 
     /**
      * {@inheritdoc}
+     * @param string $tableName
+     * @param string $columnName
      */
     public function getIdentitySequenceName($tableName, $columnName)
     {
@@ -1183,6 +1187,7 @@ 
 
     /**
      * {@inheritdoc}
+     * @param string $str
      */
     public function quoteStringLiteral($str)
     {

Indentation +7 added lines, -7 removed lines

@@ -198,10 +198,10 @@ 
     public function getCreateSequenceSQL(Sequence $sequence)
     {
         return 'CREATE SEQUENCE ' . $sequence->getQuotedName($this) .
-               ' START WITH ' . $sequence->getInitialValue() .
-               ' MINVALUE ' . $sequence->getInitialValue() .
-               ' INCREMENT BY ' . $sequence->getAllocationSize() .
-               $this->getSequenceCacheSQL($sequence);
+                ' START WITH ' . $sequence->getInitialValue() .
+                ' MINVALUE ' . $sequence->getInitialValue() .
+                ' INCREMENT BY ' . $sequence->getAllocationSize() .
+                $this->getSequenceCacheSQL($sequence);
     }
 
     /**
@@ -210,8 +210,8 @@ 
     public function getAlterSequenceSQL(Sequence $sequence)
     {
         return 'ALTER SEQUENCE ' . $sequence->getQuotedName($this) .
-               ' INCREMENT BY ' . $sequence->getAllocationSize()
-               . $this->getSequenceCacheSQL($sequence);
+                ' INCREMENT BY ' . $sequence->getAllocationSize()
+                . $this->getSequenceCacheSQL($sequence);
     }
 
     /**
@@ -390,7 +390,7 @@ 
         $database = $this->quoteStringLiteral($database->getName());
 
         return "SELECT sequence_name, min_value, increment_by FROM sys.all_sequences ".
-               "WHERE SEQUENCE_OWNER = " . $database;
+                "WHERE SEQUENCE_OWNER = " . $database;
     }
 
     /**

Spacing +65 added lines, -65 removed lines

@@ -63,7 +63,7 @@ 
      */
     public static function assertValidIdentifier($identifier)
     {
-        if ( ! preg_match('(^(([a-zA-Z]{1}[a-zA-Z0-9_$#]{0,})|("[^"]+"))$)', $identifier)) {
+        if (!preg_match('(^(([a-zA-Z]{1}[a-zA-Z0-9_$#]{0,})|("[^"]+"))$)', $identifier)) {
             throw new DBALException("Invalid Oracle identifier");
         }
     }
@@ -135,7 +135,7 @@ 
                         break;
                 }
 
-                return 'ADD_MONTHS(' . $date . ', ' . $operator . $interval . ')';
+                return 'ADD_MONTHS('.$date.', '.$operator.$interval.')';
 
             default:
                 $calculationClause = '';
@@ -158,7 +158,7 @@ 
                         break;
                 }
 
-                return '(' . $date . $operator . $interval . $calculationClause . ')';
+                return '('.$date.$operator.$interval.$calculationClause.')';
         }
     }
 
@@ -175,7 +175,7 @@ 
      */
     public function getBitAndComparisonExpression($value1, $value2)
     {
-        return 'BITAND('.$value1 . ', ' . $value2 . ')';
+        return 'BITAND('.$value1.', '.$value2.')';
     }
 
     /**
@@ -183,9 +183,9 @@ 
      */
     public function getBitOrComparisonExpression($value1, $value2)
     {
-        return '(' . $value1 . '-' .
+        return '('.$value1.'-'.
                 $this->getBitAndComparisonExpression($value1, $value2)
-                . '+' . $value2 . ')';
+                . '+'.$value2.')';
     }
 
     /**
@@ -197,10 +197,10 @@ 
      */
     public function getCreateSequenceSQL(Sequence $sequence)
     {
-        return 'CREATE SEQUENCE ' . $sequence->getQuotedName($this) .
-               ' START WITH ' . $sequence->getInitialValue() .
-               ' MINVALUE ' . $sequence->getInitialValue() .
-               ' INCREMENT BY ' . $sequence->getAllocationSize() .
+        return 'CREATE SEQUENCE '.$sequence->getQuotedName($this).
+               ' START WITH '.$sequence->getInitialValue().
+               ' MINVALUE '.$sequence->getInitialValue().
+               ' INCREMENT BY '.$sequence->getAllocationSize().
                $this->getSequenceCacheSQL($sequence);
     }
 
@@ -209,8 +209,8 @@ 
      */
     public function getAlterSequenceSQL(Sequence $sequence)
     {
-        return 'ALTER SEQUENCE ' . $sequence->getQuotedName($this) .
-               ' INCREMENT BY ' . $sequence->getAllocationSize()
+        return 'ALTER SEQUENCE '.$sequence->getQuotedName($this).
+               ' INCREMENT BY '.$sequence->getAllocationSize()
                . $this->getSequenceCacheSQL($sequence);
     }
 
@@ -228,7 +228,7 @@ 
         } else if ($sequence->getCache() === 1) {
             return ' NOCACHE';
         } else if ($sequence->getCache() > 1) {
-            return ' CACHE ' . $sequence->getCache();
+            return ' CACHE '.$sequence->getCache();
         }
 
         return '';
@@ -239,7 +239,7 @@ 
      */
     public function getSequenceNextValSQL($sequenceName)
     {
-        return 'SELECT ' . $sequenceName . '.nextval FROM DUAL';
+        return 'SELECT '.$sequenceName.'.nextval FROM DUAL';
     }
 
     /**
@@ -247,7 +247,7 @@ 
      */
     public function getSetTransactionIsolationSQL($level)
     {
-        return 'SET TRANSACTION ISOLATION LEVEL ' . $this->_getTransactionIsolationLevelSQL($level);
+        return 'SET TRANSACTION ISOLATION LEVEL '.$this->_getTransactionIsolationLevelSQL($level);
     }
 
     /**
@@ -345,8 +345,8 @@ 
      */
     protected function getVarcharTypeDeclarationSQLSnippet($length, $fixed)
     {
-        return $fixed ? ($length ? 'CHAR(' . $length . ')' : 'CHAR(2000)')
-                : ($length ? 'VARCHAR2(' . $length . ')' : 'VARCHAR2(4000)');
+        return $fixed ? ($length ? 'CHAR('.$length.')' : 'CHAR(2000)')
+                : ($length ? 'VARCHAR2('.$length.')' : 'VARCHAR2(4000)');
     }
 
     /**
@@ -354,7 +354,7 @@ 
      */
     protected function getBinaryTypeDeclarationSQLSnippet($length, $fixed)
     {
-        return 'RAW(' . ($length ?: $this->getBinaryMaxLength()) . ')';
+        return 'RAW('.($length ?: $this->getBinaryMaxLength()).')';
     }
 
     /**
@@ -390,7 +390,7 @@ 
         $database = $this->quoteStringLiteral($database->getName());
 
         return "SELECT sequence_name, min_value, increment_by FROM sys.all_sequences ".
-               "WHERE SEQUENCE_OWNER = " . $database;
+               "WHERE SEQUENCE_OWNER = ".$database;
     }
 
     /**
@@ -413,7 +413,7 @@ 
             }
         }
 
-        if (isset($indexes) && ! empty($indexes)) {
+        if (isset($indexes) && !empty($indexes)) {
             foreach ($indexes as $index) {
                 $sql[] = $this->getCreateIndexSQL($index, $table);
             }
@@ -458,7 +458,7 @@ 
                            WHERE  ucon.index_name = uind_col.index_name
                        ) AS is_primary
              FROM      user_ind_columns uind_col
-             WHERE     uind_col.table_name = " . $table . "
+             WHERE     uind_col.table_name = " . $table."
              ORDER BY  uind_col.column_position ASC";
     }
 
@@ -483,7 +483,7 @@ 
      */
     public function getCreateViewSQL($name, $sql)
     {
-        return 'CREATE VIEW ' . $name . ' AS ' . $sql;
+        return 'CREATE VIEW '.$name.' AS '.$sql;
     }
 
     /**
@@ -491,7 +491,7 @@ 
      */
     public function getDropViewSQL($name)
     {
-        return 'DROP VIEW '. $name;
+        return 'DROP VIEW '.$name;
     }
 
     /**
@@ -520,7 +520,7 @@ 
         $sql[] = 'DECLARE
   constraints_Count NUMBER;
 BEGIN
-  SELECT COUNT(CONSTRAINT_NAME) INTO constraints_Count FROM USER_CONSTRAINTS WHERE TABLE_NAME = \'' . $unquotedTableName . '\' AND CONSTRAINT_TYPE = \'P\';
+  SELECT COUNT(CONSTRAINT_NAME) INTO constraints_Count FROM USER_CONSTRAINTS WHERE TABLE_NAME = \'' . $unquotedTableName.'\' AND CONSTRAINT_TYPE = \'P\';
   IF constraints_Count = 0 OR constraints_Count = \'\' THEN
     EXECUTE IMMEDIATE \''.$this->getCreateConstraintSQL($idx, $quotedTableName).'\';
   END IF;
@@ -533,24 +533,24 @@ 
         $sequence = new Sequence($sequenceName, $start);
         $sql[] = $this->getCreateSequenceSQL($sequence);
 
-        $sql[] = 'CREATE TRIGGER ' . $autoincrementIdentifierName . '
+        $sql[] = 'CREATE TRIGGER '.$autoincrementIdentifierName.'
    BEFORE INSERT
-   ON ' . $quotedTableName . '
+   ON ' . $quotedTableName.'
    FOR EACH ROW
 DECLARE
    last_Sequence NUMBER;
    last_InsertID NUMBER;
 BEGIN
-   SELECT ' . $sequenceName . '.NEXTVAL INTO :NEW.' . $quotedName . ' FROM DUAL;
-   IF (:NEW.' . $quotedName . ' IS NULL OR :NEW.'.$quotedName.' = 0) THEN
-      SELECT ' . $sequenceName . '.NEXTVAL INTO :NEW.' . $quotedName . ' FROM DUAL;
+   SELECT ' . $sequenceName.'.NEXTVAL INTO :NEW.'.$quotedName.' FROM DUAL;
+   IF (:NEW.' . $quotedName.' IS NULL OR :NEW.'.$quotedName.' = 0) THEN
+      SELECT ' . $sequenceName.'.NEXTVAL INTO :NEW.'.$quotedName.' FROM DUAL;
    ELSE
       SELECT NVL(Last_Number, 0) INTO last_Sequence
         FROM User_Sequences
-       WHERE Sequence_Name = \'' . $sequence->getName() . '\';
-      SELECT :NEW.' . $quotedName . ' INTO last_InsertID FROM DUAL;
+       WHERE Sequence_Name = \'' . $sequence->getName().'\';
+      SELECT :NEW.' . $quotedName.' INTO last_InsertID FROM DUAL;
       WHILE (last_InsertID > last_Sequence) LOOP
-         SELECT ' . $sequenceName . '.NEXTVAL INTO last_Sequence FROM DUAL;
+         SELECT ' . $sequenceName.'.NEXTVAL INTO last_Sequence FROM DUAL;
       END LOOP;
    END IF;
 END;';
@@ -575,7 +575,7 @@ 
         );
 
         return [
-            'DROP TRIGGER ' . $autoincrementIdentifierName,
+            'DROP TRIGGER '.$autoincrementIdentifierName,
             $this->getDropSequenceSQL($identitySequenceName),
             $this->getDropConstraintSQL($autoincrementIdentifierName, $table->getQuotedName($this)),
         ];
@@ -610,7 +610,7 @@ 
      */
     private function getAutoincrementIdentifierName(Identifier $table)
     {
-        $identifierName = $table->getName() . '_AI_PK';
+        $identifierName = $table->getName().'_AI_PK';
 
         return $table->isQuoted()
             ? $this->quoteSingleIdentifier($identifierName)
@@ -645,7 +645,7 @@ 
      JOIN user_constraints alc
        ON alc.constraint_name = cols.constraint_name
       AND alc.constraint_type = 'R'
-      AND alc.table_name = " . $table . "
+      AND alc.table_name = " . $table."
     ORDER BY cols.constraint_name ASC, cols.position ASC";
     }
 
@@ -657,7 +657,7 @@ 
         $table = $this->normalizeIdentifier($table);
         $table = $this->quoteStringLiteral($table->getName());
 
-        return "SELECT * FROM user_constraints WHERE table_name = " . $table;
+        return "SELECT * FROM user_constraints WHERE table_name = ".$table;
     }
 
     /**
@@ -678,7 +678,7 @@ 
             $database = $this->quoteStringLiteral($database->getName());
             $tabColumnsTableName = "all_tab_columns";
             $colCommentsTableName = "all_col_comments";
-            $tabColumnsOwnerCondition = "AND c.owner = " . $database;
+            $tabColumnsOwnerCondition = "AND c.owner = ".$database;
             $colCommentsOwnerCondition = "AND d.OWNER = c.OWNER";
         }
 
@@ -686,11 +686,11 @@ 
                          (
                              SELECT d.comments
                              FROM   $colCommentsTableName d
-                             WHERE  d.TABLE_NAME = c.TABLE_NAME " . $colCommentsOwnerCondition . "
+                             WHERE  d.TABLE_NAME = c.TABLE_NAME ".$colCommentsOwnerCondition."
                              AND    d.COLUMN_NAME = c.COLUMN_NAME
                          ) AS comments
                 FROM     $tabColumnsTableName c
-                WHERE    c.table_name = " . $table . " $tabColumnsOwnerCondition
+                WHERE    c.table_name = ".$table." $tabColumnsOwnerCondition
                 ORDER BY c.column_id";
     }
 
@@ -703,7 +703,7 @@ 
             $sequence = $sequence->getQuotedName($this);
         }
 
-        return 'DROP SEQUENCE ' . $sequence;
+        return 'DROP SEQUENCE '.$sequence;
     }
 
     /**
@@ -711,18 +711,18 @@ 
      */
     public function getDropForeignKeySQL($foreignKey, $table)
     {
-        if (! $foreignKey instanceof ForeignKeyConstraint) {
+        if (!$foreignKey instanceof ForeignKeyConstraint) {
             $foreignKey = new Identifier($foreignKey);
         }
 
-        if (! $table instanceof Table) {
+        if (!$table instanceof Table) {
             $table = new Identifier($table);
         }
 
         $foreignKey = $foreignKey->getQuotedName($this);
         $table = $table->getQuotedName($this);
 
-        return 'ALTER TABLE ' . $table . ' DROP CONSTRAINT ' . $foreignKey;
+        return 'ALTER TABLE '.$table.' DROP CONSTRAINT '.$foreignKey;
     }
 
     /**
@@ -736,7 +736,7 @@ 
             $referentialAction = $this->getForeignKeyReferentialActionSQL($foreignKey->getOption('onDelete'));
         }
 
-        return $referentialAction ? ' ON DELETE ' . $referentialAction : '';
+        return $referentialAction ? ' ON DELETE '.$referentialAction : '';
     }
 
     /**
@@ -759,7 +759,7 @@ 
 
             default:
                 // SET DEFAULT is not supported, throw exception instead.
-                throw new \InvalidArgumentException('Invalid foreign key action: ' . $action);
+                throw new \InvalidArgumentException('Invalid foreign key action: '.$action);
         }
     }
 
@@ -768,7 +768,7 @@ 
      */
     public function getDropDatabaseSQL($database)
     {
-        return 'DROP USER ' . $database . ' CASCADE';
+        return 'DROP USER '.$database.' CASCADE';
     }
 
     /**
@@ -798,7 +798,7 @@ 
         }
 
         if (count($fields)) {
-            $sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' ADD (' . implode(', ', $fields) . ')';
+            $sql[] = 'ALTER TABLE '.$diff->getName($this)->getQuotedName($this).' ADD ('.implode(', ', $fields).')';
         }
 
         $fields = [];
@@ -825,14 +825,14 @@ 
             /**
              * Do not add query part if only comment has changed
              */
-            if ( ! ($columnHasChangedComment && count($columnDiff->changedProperties) === 1)) {
+            if (!($columnHasChangedComment && count($columnDiff->changedProperties) === 1)) {
                 $columnInfo = $column->toArray();
 
-                if ( ! $columnDiff->hasChanged('notnull')) {
+                if (!$columnDiff->hasChanged('notnull')) {
                     unset($columnInfo['notnull']);
                 }
 
-                $fields[] = $column->getQuotedName($this) . $this->getColumnDeclarationSQL('', $columnInfo);
+                $fields[] = $column->getQuotedName($this).$this->getColumnDeclarationSQL('', $columnInfo);
             }
 
             if ($columnHasChangedComment) {
@@ -845,7 +845,7 @@ 
         }
 
         if (count($fields)) {
-            $sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' MODIFY (' . implode(', ', $fields) . ')';
+            $sql[] = 'ALTER TABLE '.$diff->getName($this)->getQuotedName($this).' MODIFY ('.implode(', ', $fields).')';
         }
 
         foreach ($diff->renamedColumns as $oldColumnName => $column) {
@@ -855,8 +855,8 @@ 
 
             $oldColumnName = new Identifier($oldColumnName);
 
-            $sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) .
-                ' RENAME COLUMN ' . $oldColumnName->getQuotedName($this) .' TO ' . $column->getQuotedName($this);
+            $sql[] = 'ALTER TABLE '.$diff->getName($this)->getQuotedName($this).
+                ' RENAME COLUMN '.$oldColumnName->getQuotedName($this).' TO '.$column->getQuotedName($this);
         }
 
         $fields = [];
@@ -869,16 +869,16 @@ 
         }
 
         if (count($fields)) {
-            $sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' DROP (' . implode(', ', $fields).')';
+            $sql[] = 'ALTER TABLE '.$diff->getName($this)->getQuotedName($this).' DROP ('.implode(', ', $fields).')';
         }
 
         $tableSql = [];
 
-        if ( ! $this->onSchemaAlterTable($diff, $tableSql)) {
+        if (!$this->onSchemaAlterTable($diff, $tableSql)) {
             $sql = array_merge($sql, $commentsSQL);
 
             if ($diff->newName !== false) {
-                $sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' RENAME TO ' . $diff->getNewName()->getQuotedName($this);
+                $sql[] = 'ALTER TABLE '.$diff->getName($this)->getQuotedName($this).' RENAME TO '.$diff->getNewName()->getQuotedName($this);
             }
 
             $sql = array_merge(
@@ -908,16 +908,16 @@ 
             }
 
             $unique = (isset($field['unique']) && $field['unique']) ?
-                ' ' . $this->getUniqueFieldDeclarationSQL() : '';
+                ' '.$this->getUniqueFieldDeclarationSQL() : '';
 
             $check = (isset($field['check']) && $field['check']) ?
-                ' ' . $field['check'] : '';
+                ' '.$field['check'] : '';
 
             $typeDecl = $field['type']->getSQLDeclaration($field, $this);
-            $columnDef = $typeDecl . $default . $notnull . $unique . $check;
+            $columnDef = $typeDecl.$default.$notnull.$unique.$check;
         }
 
-        return $name . ' ' . $columnDef;
+        return $name.' '.$columnDef;
     }
 
     /**
@@ -927,10 +927,10 @@ 
     {
         if (strpos($tableName, '.') !== false) {
             list($schema) = explode('.', $tableName);
-            $oldIndexName = $schema . '.' . $oldIndexName;
+            $oldIndexName = $schema.'.'.$oldIndexName;
         }
 
-        return ['ALTER INDEX ' . $oldIndexName . ' RENAME TO ' . $index->getQuotedName($this)];
+        return ['ALTER INDEX '.$oldIndexName.' RENAME TO '.$index->getQuotedName($this)];
     }
 
     /**
@@ -957,10 +957,10 @@ 
         $table = new Identifier($tableName);
 
         // No usage of column name to preserve BC compatibility with <2.5
-        $identitySequenceName = $table->getName() . '_SEQ';
+        $identitySequenceName = $table->getName().'_SEQ';
 
         if ($table->isQuoted()) {
-            $identitySequenceName = '"' . $identitySequenceName . '"';
+            $identitySequenceName = '"'.$identitySequenceName.'"';
         }
 
         $identitySequenceIdentifier = $this->normalizeIdentifier($identitySequenceName);
@@ -1112,7 +1112,7 @@ 
     {
         $tableIdentifier = new Identifier($tableName);
 
-        return 'TRUNCATE TABLE ' . $tableIdentifier->getQuotedName($this);
+        return 'TRUNCATE TABLE '.$tableIdentifier->getQuotedName($this);
     }
 
     /**

core/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php

Doc Comments +6 added lines

@@ -100,6 +100,7 @@ 
 
     /**
      * {@inheritDoc}
+     * @param boolean $from
      */
     public function getSubstringExpression($value, $from, $length = null)
     {
@@ -211,6 +212,8 @@ 
 
     /**
      * {@inheritdoc}
+     * @param string $tableName
+     * @param string $columnName
      */
     public function getIdentitySequenceName($tableName, $columnName)
     {
@@ -691,6 +694,9 @@ 
 
     /**
      * {@inheritdoc}
+     * @param string $tableName
+     * @param string $columnName
+     * @param string|null $comment
      */
     public function getCommentOnColumnSQL($tableName, $columnName, $comment)
     {

Unused Use Statements +1 added lines, -1 removed lines

@@ -25,8 +25,8 @@
 use Doctrine\DBAL\Schema\Index;
 use Doctrine\DBAL\Schema\Sequence;
 use Doctrine\DBAL\Schema\TableDiff;
-use Doctrine\DBAL\Types\BinaryType;
 use Doctrine\DBAL\Types\BigIntType;
+use Doctrine\DBAL\Types\BinaryType;
 use Doctrine\DBAL\Types\BlobType;
 use Doctrine\DBAL\Types\IntegerType;
 use Doctrine\DBAL\Types\Type;

Spacing +67 added lines, -67 removed lines

@@ -104,10 +104,10 @@ 
     public function getSubstringExpression($value, $from, $length = null)
     {
         if ($length === null) {
-            return 'SUBSTRING(' . $value . ' FROM ' . $from . ')';
+            return 'SUBSTRING('.$value.' FROM '.$from.')';
         }
 
-        return 'SUBSTRING(' . $value . ' FROM ' . $from . ' FOR ' . $length . ')';
+        return 'SUBSTRING('.$value.' FROM '.$from.' FOR '.$length.')';
     }
 
     /**
@@ -134,7 +134,7 @@ 
         if ($startPos !== false) {
             $str = $this->getSubstringExpression($str, $startPos);
 
-            return 'CASE WHEN (POSITION('.$substr.' IN '.$str.') = 0) THEN 0 ELSE (POSITION('.$substr.' IN '.$str.') + '.($startPos-1).') END';
+            return 'CASE WHEN (POSITION('.$substr.' IN '.$str.') = 0) THEN 0 ELSE (POSITION('.$substr.' IN '.$str.') + '.($startPos - 1).') END';
         }
 
         return 'POSITION('.$substr.' IN '.$str.')';
@@ -150,7 +150,7 @@ 
             $unit      = DateIntervalUnit::MONTH;
         }
 
-        return "(" . $date ." " . $operator . " (" . $interval . " || ' " . $unit . "')::interval)";
+        return "(".$date." ".$operator." (".$interval." || ' ".$unit."')::interval)";
     }
 
     /**
@@ -158,7 +158,7 @@ 
      */
     public function getDateDiffExpression($date1, $date2)
     {
-        return '(DATE(' . $date1 . ')-DATE(' . $date2 . '))';
+        return '(DATE('.$date1.')-DATE('.$date2.'))';
     }
 
     /**
@@ -214,7 +214,7 @@ 
      */
     public function getIdentitySequenceName($tableName, $columnName)
     {
-        return $tableName . '_' . $columnName . '_seq';
+        return $tableName.'_'.$columnName.'_seq';
     }
 
     /**
@@ -310,7 +310,7 @@ 
                   (
                       SELECT c.oid
                       FROM pg_catalog.pg_class c, pg_catalog.pg_namespace n
-                      WHERE " .$this->getTableWhereClause($table) ." AND n.oid = c.relnamespace
+                      WHERE " .$this->getTableWhereClause($table)." AND n.oid = c.relnamespace
                   )
                   AND r.contype = 'f'";
     }
@@ -320,7 +320,7 @@ 
      */
     public function getCreateViewSQL($name, $sql)
     {
-        return 'CREATE VIEW ' . $name . ' AS ' . $sql;
+        return 'CREATE VIEW '.$name.' AS '.$sql;
     }
 
     /**
@@ -328,7 +328,7 @@ 
      */
     public function getDropViewSQL($name)
     {
-        return 'DROP VIEW '. $name;
+        return 'DROP VIEW '.$name;
     }
 
     /**
@@ -390,7 +390,7 @@ 
 
         $table = new Identifier($table);
         $table = $this->quoteStringLiteral($table->getName());
-        $whereClause .= "$classAlias.relname = " . $table . " AND $namespaceAlias.nspname = $schema";
+        $whereClause .= "$classAlias.relname = ".$table." AND $namespaceAlias.nspname = $schema";
 
         return $whereClause;
     }
@@ -424,7 +424,7 @@ 
                         FROM pg_description WHERE pg_description.objoid = c.oid AND a.attnum = pg_description.objsubid
                     ) AS comment
                     FROM pg_attribute a, pg_class c, pg_type t, pg_namespace n
-                    WHERE ".$this->getTableWhereClause($table, 'c', 'n') ."
+                    WHERE ".$this->getTableWhereClause($table, 'c', 'n')."
                         AND a.attnum > 0
                         AND a.attrelid = c.oid
                         AND a.atttypid = t.oid
@@ -437,7 +437,7 @@ 
      */
     public function getCreateDatabaseSQL($name)
     {
-        return 'CREATE DATABASE ' . $name;
+        return 'CREATE DATABASE '.$name;
     }
 
     /**
@@ -478,7 +478,7 @@ 
         $query = '';
 
         if ($foreignKey->hasOption('match')) {
-            $query .= ' MATCH ' . $foreignKey->getOption('match');
+            $query .= ' MATCH '.$foreignKey->getOption('match');
         }
 
         $query .= parent::getAdvancedForeignKeyOptionsSQL($foreignKey);
@@ -514,8 +514,8 @@ 
                 continue;
             }
 
-            $query = 'ADD ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $column->toArray());
-            $sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' ' . $query;
+            $query = 'ADD '.$this->getColumnDeclarationSQL($column->getQuotedName($this), $column->toArray());
+            $sql[] = 'ALTER TABLE '.$diff->getName($this)->getQuotedName($this).' '.$query;
 
             $comment = $this->getColumnComment($column);
 
@@ -533,8 +533,8 @@ 
                 continue;
             }
 
-            $query = 'DROP ' . $column->getQuotedName($this);
-            $sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' ' . $query;
+            $query = 'DROP '.$column->getQuotedName($this);
+            $sql[] = 'ALTER TABLE '.$diff->getName($this)->getQuotedName($this).' '.$query;
         }
 
         foreach ($diff->changedColumns as $columnDiff) {
@@ -558,21 +558,21 @@ 
                 $columnDefinition['autoincrement'] = false;
 
                 // here was a server version check before, but DBAL API does not support this anymore.
-                $query = 'ALTER ' . $oldColumnName . ' TYPE ' . $type->getSQLDeclaration($columnDefinition, $this);
-                $sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' ' . $query;
+                $query = 'ALTER '.$oldColumnName.' TYPE '.$type->getSQLDeclaration($columnDefinition, $this);
+                $sql[] = 'ALTER TABLE '.$diff->getName($this)->getQuotedName($this).' '.$query;
             }
 
             if ($columnDiff->hasChanged('default') || $this->typeChangeBreaksDefaultValue($columnDiff)) {
                 $defaultClause = null === $column->getDefault()
                     ? ' DROP DEFAULT'
-                    : ' SET' . $this->getDefaultValueDeclarationSQL($column->toArray());
-                $query = 'ALTER ' . $oldColumnName . $defaultClause;
-                $sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' ' . $query;
+                    : ' SET'.$this->getDefaultValueDeclarationSQL($column->toArray());
+                $query = 'ALTER '.$oldColumnName.$defaultClause;
+                $sql[] = 'ALTER TABLE '.$diff->getName($this)->getQuotedName($this).' '.$query;
             }
 
             if ($columnDiff->hasChanged('notnull')) {
-                $query = 'ALTER ' . $oldColumnName . ' ' . ($column->getNotnull() ? 'SET' : 'DROP') . ' NOT NULL';
-                $sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' ' . $query;
+                $query = 'ALTER '.$oldColumnName.' '.($column->getNotnull() ? 'SET' : 'DROP').' NOT NULL';
+                $sql[] = 'ALTER TABLE '.$diff->getName($this)->getQuotedName($this).' '.$query;
             }
 
             if ($columnDiff->hasChanged('autoincrement')) {
@@ -580,14 +580,14 @@ 
                     // add autoincrement
                     $seqName = $this->getIdentitySequenceName($diff->name, $oldColumnName);
 
-                    $sql[] = "CREATE SEQUENCE " . $seqName;
-                    $sql[] = "SELECT setval('" . $seqName . "', (SELECT MAX(" . $oldColumnName . ") FROM " . $diff->getName($this)->getQuotedName($this) . "))";
-                    $query = "ALTER " . $oldColumnName . " SET DEFAULT nextval('" . $seqName . "')";
-                    $sql[] = "ALTER TABLE " . $diff->getName($this)->getQuotedName($this) . " " . $query;
+                    $sql[] = "CREATE SEQUENCE ".$seqName;
+                    $sql[] = "SELECT setval('".$seqName."', (SELECT MAX(".$oldColumnName.") FROM ".$diff->getName($this)->getQuotedName($this)."))";
+                    $query = "ALTER ".$oldColumnName." SET DEFAULT nextval('".$seqName."')";
+                    $sql[] = "ALTER TABLE ".$diff->getName($this)->getQuotedName($this)." ".$query;
                 } else {
                     // Drop autoincrement, but do NOT drop the sequence. It might be re-used by other tables or have
-                    $query = "ALTER " . $oldColumnName . " " . "DROP DEFAULT";
-                    $sql[] = "ALTER TABLE " . $diff->getName($this)->getQuotedName($this) . " " . $query;
+                    $query = "ALTER ".$oldColumnName." "."DROP DEFAULT";
+                    $sql[] = "ALTER TABLE ".$diff->getName($this)->getQuotedName($this)." ".$query;
                 }
             }
 
@@ -600,8 +600,8 @@ 
             }
 
             if ($columnDiff->hasChanged('length')) {
-                $query = 'ALTER ' . $oldColumnName . ' TYPE ' . $column->getType()->getSQLDeclaration($column->toArray(), $this);
-                $sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' ' . $query;
+                $query = 'ALTER '.$oldColumnName.' TYPE '.$column->getType()->getSQLDeclaration($column->toArray(), $this);
+                $sql[] = 'ALTER TABLE '.$diff->getName($this)->getQuotedName($this).' '.$query;
             }
         }
 
@@ -612,17 +612,17 @@ 
 
             $oldColumnName = new Identifier($oldColumnName);
 
-            $sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) .
-                ' RENAME COLUMN ' . $oldColumnName->getQuotedName($this) . ' TO ' . $column->getQuotedName($this);
+            $sql[] = 'ALTER TABLE '.$diff->getName($this)->getQuotedName($this).
+                ' RENAME COLUMN '.$oldColumnName->getQuotedName($this).' TO '.$column->getQuotedName($this);
         }
 
         $tableSql = [];
 
-        if ( ! $this->onSchemaAlterTable($diff, $tableSql)) {
+        if (!$this->onSchemaAlterTable($diff, $tableSql)) {
             $sql = array_merge($sql, $commentsSQL);
 
             if ($diff->newName !== false) {
-                $sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' RENAME TO ' . $diff->getNewName()->getQuotedName($this);
+                $sql[] = 'ALTER TABLE '.$diff->getName($this)->getQuotedName($this).' RENAME TO '.$diff->getNewName()->getQuotedName($this);
             }
 
             $sql = array_merge(
@@ -653,7 +653,7 @@ 
     {
         $columnType = $columnDiff->column->getType();
 
-        if ( ! $columnType instanceof BinaryType && ! $columnType instanceof BlobType) {
+        if (!$columnType instanceof BinaryType && !$columnType instanceof BlobType) {
             return false;
         }
 
@@ -662,7 +662,7 @@ 
         if ($fromColumn) {
             $fromColumnType = $fromColumn->getType();
 
-            if ( ! $fromColumnType instanceof BinaryType && ! $fromColumnType instanceof BlobType) {
+            if (!$fromColumnType instanceof BinaryType && !$fromColumnType instanceof BlobType) {
                 return false;
             }
 
@@ -683,10 +683,10 @@ 
     {
         if (strpos($tableName, '.') !== false) {
             list($schema) = explode('.', $tableName);
-            $oldIndexName = $schema . '.' . $oldIndexName;
+            $oldIndexName = $schema.'.'.$oldIndexName;
         }
 
-        return ['ALTER INDEX ' . $oldIndexName . ' RENAME TO ' . $index->getQuotedName($this)];
+        return ['ALTER INDEX '.$oldIndexName.' RENAME TO '.$index->getQuotedName($this)];
     }
 
     /**
@@ -698,7 +698,7 @@ 
         $columnName = new Identifier($columnName);
         $comment = $comment === null ? 'NULL' : $this->quoteStringLiteral($comment);
 
-        return "COMMENT ON COLUMN " . $tableName->getQuotedName($this) . "." . $columnName->getQuotedName($this) .
+        return "COMMENT ON COLUMN ".$tableName->getQuotedName($this).".".$columnName->getQuotedName($this).
             " IS $comment";
     }
 
@@ -707,10 +707,10 @@ 
      */
     public function getCreateSequenceSQL(Sequence $sequence)
     {
-        return 'CREATE SEQUENCE ' . $sequence->getQuotedName($this) .
-            ' INCREMENT BY ' . $sequence->getAllocationSize() .
-            ' MINVALUE ' . $sequence->getInitialValue() .
-            ' START ' . $sequence->getInitialValue() .
+        return 'CREATE SEQUENCE '.$sequence->getQuotedName($this).
+            ' INCREMENT BY '.$sequence->getAllocationSize().
+            ' MINVALUE '.$sequence->getInitialValue().
+            ' START '.$sequence->getInitialValue().
             $this->getSequenceCacheSQL($sequence);
     }
 
@@ -719,8 +719,8 @@ 
      */
     public function getAlterSequenceSQL(Sequence $sequence)
     {
-        return 'ALTER SEQUENCE ' . $sequence->getQuotedName($this) .
-            ' INCREMENT BY ' . $sequence->getAllocationSize() .
+        return 'ALTER SEQUENCE '.$sequence->getQuotedName($this).
+            ' INCREMENT BY '.$sequence->getAllocationSize().
             $this->getSequenceCacheSQL($sequence);
     }
 
@@ -734,7 +734,7 @@ 
     private function getSequenceCacheSQL(Sequence $sequence)
     {
         if ($sequence->getCache() > 1) {
-            return ' CACHE ' . $sequence->getCache();
+            return ' CACHE '.$sequence->getCache();
         }
 
         return '';
@@ -749,7 +749,7 @@ 
             $sequence = $sequence->getQuotedName($this);
         }
 
-        return 'DROP SEQUENCE ' . $sequence . ' CASCADE';
+        return 'DROP SEQUENCE '.$sequence.' CASCADE';
     }
 
     /**
@@ -757,7 +757,7 @@ 
      */
     public function getCreateSchemaSQL($schemaName)
     {
-        return 'CREATE SCHEMA ' . $schemaName;
+        return 'CREATE SCHEMA '.$schemaName;
     }
 
     /**
@@ -775,16 +775,16 @@ 
     {
         $queryFields = $this->getColumnDeclarationListSQL($columns);
 
-        if (isset($options['primary']) && ! empty($options['primary'])) {
+        if (isset($options['primary']) && !empty($options['primary'])) {
             $keyColumns = array_unique(array_values($options['primary']));
-            $queryFields .= ', PRIMARY KEY(' . implode(', ', $keyColumns) . ')';
+            $queryFields .= ', PRIMARY KEY('.implode(', ', $keyColumns).')';
         }
 
-        $query = 'CREATE TABLE ' . $tableName . ' (' . $queryFields . ')';
+        $query = 'CREATE TABLE '.$tableName.' ('.$queryFields.')';
 
         $sql = [$query];
 
-        if (isset($options['indexes']) && ! empty($options['indexes'])) {
+        if (isset($options['indexes']) && !empty($options['indexes'])) {
             foreach ($options['indexes'] as $index) {
                 $sql[] = $this->getCreateIndexSQL($index, $tableName);
             }
@@ -872,13 +872,13 @@ 
      */
     public function convertBooleans($item)
     {
-        if ( ! $this->useBooleanTrueFalseStrings) {
+        if (!$this->useBooleanTrueFalseStrings) {
             return parent::convertBooleans($item);
         }
 
         return $this->doConvertBooleans(
             $item,
-            function ($boolean) {
+            function($boolean){
                 if (null === $boolean) {
                     return 'NULL';
                 }
@@ -893,13 +893,13 @@ 
      */
     public function convertBooleansToDatabaseValue($item)
     {
-        if ( ! $this->useBooleanTrueFalseStrings) {
+        if (!$this->useBooleanTrueFalseStrings) {
             return parent::convertBooleansToDatabaseValue($item);
         }
 
         return $this->doConvertBooleans(
             $item,
-            function ($boolean) {
+            function($boolean){
                 return null === $boolean ? null : (int) $boolean;
             }
         );
@@ -922,7 +922,7 @@ 
      */
     public function getSequenceNextValSQL($sequenceName)
     {
-        return "SELECT NEXTVAL('" . $sequenceName . "')";
+        return "SELECT NEXTVAL('".$sequenceName."')";
     }
 
     /**
@@ -947,7 +947,7 @@ 
      */
     public function getIntegerTypeDeclarationSQL(array $field)
     {
-        if ( ! empty($field['autoincrement'])) {
+        if (!empty($field['autoincrement'])) {
             return 'SERIAL';
         }
 
@@ -959,7 +959,7 @@ 
      */
     public function getBigIntTypeDeclarationSQL(array $field)
     {
-        if ( ! empty($field['autoincrement'])) {
+        if (!empty($field['autoincrement'])) {
             return 'BIGSERIAL';
         }
 
@@ -1037,8 +1037,8 @@ 
      */
     protected function getVarcharTypeDeclarationSQLSnippet($length, $fixed)
     {
-        return $fixed ? ($length ? 'CHAR(' . $length . ')' : 'CHAR(255)')
-            : ($length ? 'VARCHAR(' . $length . ')' : 'VARCHAR(255)');
+        return $fixed ? ($length ? 'CHAR('.$length.')' : 'CHAR(255)')
+            : ($length ? 'VARCHAR('.$length.')' : 'VARCHAR(255)');
     }
 
     /**
@@ -1088,7 +1088,7 @@ 
      */
     public function getEmptyIdentityInsertSQL($quotedTableName, $quotedIdentifierColumnName)
     {
-        return 'INSERT INTO ' . $quotedTableName . ' (' . $quotedIdentifierColumnName . ') VALUES (DEFAULT)';
+        return 'INSERT INTO '.$quotedTableName.' ('.$quotedIdentifierColumnName.') VALUES (DEFAULT)';
     }
 
     /**
@@ -1097,7 +1097,7 @@ 
     public function getTruncateTableSQL($tableName, $cascade = false)
     {
         $tableIdentifier = new Identifier($tableName);
-        $sql = 'TRUNCATE ' . $tableIdentifier->getQuotedName($this);
+        $sql = 'TRUNCATE '.$tableIdentifier->getQuotedName($this);
 
         if ($cascade) {
             $sql .= ' CASCADE';
@@ -1238,7 +1238,7 @@ 
      */
     private function typeChangeBreaksDefaultValue(ColumnDiff $columnDiff) : bool
     {
-        if (! $columnDiff->fromColumn) {
+        if (!$columnDiff->fromColumn) {
             return $columnDiff->hasChanged('type');
         }
 
@@ -1247,7 +1247,7 @@ 
 
         // default should not be changed when switching between numeric types and the default comes from a sequence
         return $columnDiff->hasChanged('type')
-            && ! ($oldTypeIsNumeric && $newTypeIsNumeric && $columnDiff->column->getAutoincrement());
+            && !($oldTypeIsNumeric && $newTypeIsNumeric && $columnDiff->column->getAutoincrement());
     }
 
     private function isNumericType(Type $type) : bool

Braces +2 added lines, -2 removed lines

@@ -878,7 +878,7 @@ 
 
         return $this->doConvertBooleans(
             $item,
-            function ($boolean) {
+            function ($boolean){
                 if (null === $boolean) {
                     return 'NULL';
                 }
@@ -899,7 +899,7 @@ 
 
         return $this->doConvertBooleans(
             $item,
-            function ($boolean) {
+            function ($boolean){
                 return null === $boolean ? null : (int) $boolean;
             }
         );

core/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/SQLAnywherePlatform.php

Doc Comments +3 added lines

@@ -380,6 +380,9 @@
 
     /**
      * {@inheritdoc}
+     * @param string $tableName
+     * @param string $columnName
+     * @param string|null $comment
      */
     public function getCommentOnColumnSQL($tableName, $columnName, $comment)
     {

Indentation +1 added lines, -1 removed lines

@@ -413,7 +413,7 @@
         }
 
         return 'ALTER TABLE ' . $table .
-               ' ADD ' . $this->getTableConstraintDeclarationSQL($constraint, $constraint->getQuotedName($this));
+                ' ADD ' . $this->getTableConstraintDeclarationSQL($constraint, $constraint->getQuotedName($this));
     }
 
     /**

Spacing +94 added lines, -94 removed lines

@@ -79,13 +79,13 @@ 
     {
         switch (true) {
             case $lockMode === LockMode::NONE:
-                return $fromClause . ' WITH (NOLOCK)';
+                return $fromClause.' WITH (NOLOCK)';
 
             case $lockMode === LockMode::PESSIMISTIC_READ:
-                return $fromClause . ' WITH (UPDLOCK)';
+                return $fromClause.' WITH (UPDLOCK)';
 
             case $lockMode === LockMode::PESSIMISTIC_WRITE:
-                return $fromClause . ' WITH (XLOCK)';
+                return $fromClause.' WITH (XLOCK)';
 
             default:
                 return $fromClause;
@@ -116,7 +116,7 @@ 
         $query = '';
 
         if ($foreignKey->hasOption('match')) {
-            $query = ' MATCH ' . $this->getForeignKeyMatchClauseSQL($foreignKey->getOption('match'));
+            $query = ' MATCH '.$this->getForeignKeyMatchClauseSQL($foreignKey->getOption('match'));
         }
 
         $query .= parent::getAdvancedForeignKeyOptionsSQL($foreignKey);
@@ -203,19 +203,19 @@ 
                 continue;
             }
 
-            $sql[] = $this->getAlterTableClause($diff->getName($this)) . ' ' .
+            $sql[] = $this->getAlterTableClause($diff->getName($this)).' '.
                 $this->getAlterTableRenameColumnClause($oldColumnName, $column);
         }
 
-        if ( ! $this->onSchemaAlterTable($diff, $tableSql)) {
-            if ( ! empty($alterClauses)) {
-                $sql[] = $this->getAlterTableClause($diff->getName($this)) . ' ' . implode(", ", $alterClauses);
+        if (!$this->onSchemaAlterTable($diff, $tableSql)) {
+            if (!empty($alterClauses)) {
+                $sql[] = $this->getAlterTableClause($diff->getName($this)).' '.implode(", ", $alterClauses);
             }
 
             $sql = array_merge($sql, $commentsSQL);
 
             if ($diff->newName !== false) {
-                $sql[] = $this->getAlterTableClause($diff->getName($this)) . ' ' .
+                $sql[] = $this->getAlterTableClause($diff->getName($this)).' '.
                     $this->getAlterTableRenameTableClause($diff->getNewName());
             }
 
@@ -238,7 +238,7 @@ 
      */
     protected function getAlterTableAddColumnClause(Column $column)
     {
-        return 'ADD ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $column->toArray());
+        return 'ADD '.$this->getColumnDeclarationSQL($column->getQuotedName($this), $column->toArray());
     }
 
     /**
@@ -250,7 +250,7 @@ 
      */
     protected function getAlterTableClause(Identifier $tableName)
     {
-        return 'ALTER TABLE ' . $tableName->getQuotedName($this);
+        return 'ALTER TABLE '.$tableName->getQuotedName($this);
     }
 
     /**
@@ -262,7 +262,7 @@ 
      */
     protected function getAlterTableRemoveColumnClause(Column $column)
     {
-        return 'DROP ' . $column->getQuotedName($this);
+        return 'DROP '.$column->getQuotedName($this);
     }
 
     /**
@@ -277,7 +277,7 @@ 
     {
         $oldColumnName = new Identifier($oldColumnName);
 
-        return 'RENAME ' . $oldColumnName->getQuotedName($this) .' TO ' . $column->getQuotedName($this);
+        return 'RENAME '.$oldColumnName->getQuotedName($this).' TO '.$column->getQuotedName($this);
     }
 
     /**
@@ -289,7 +289,7 @@ 
      */
     protected function getAlterTableRenameTableClause(Identifier $newTableName)
     {
-        return 'RENAME ' . $newTableName->getQuotedName($this);
+        return 'RENAME '.$newTableName->getQuotedName($this);
     }
 
     /**
@@ -307,12 +307,12 @@ 
         $column = $columnDiff->column;
 
         // Do not return alter clause if only comment has changed.
-        if ( ! ($columnDiff->hasChanged('comment') && count($columnDiff->changedProperties) === 1)) {
-            $columnAlterationClause = 'ALTER ' .
+        if (!($columnDiff->hasChanged('comment') && count($columnDiff->changedProperties) === 1)) {
+            $columnAlterationClause = 'ALTER '.
                 $this->getColumnDeclarationSQL($column->getQuotedName($this), $column->toArray());
 
             if ($columnDiff->hasChanged('default') && null === $column->getDefault()) {
-                $columnAlterationClause .= ', ALTER ' . $column->getQuotedName($this) . ' DROP DEFAULT';
+                $columnAlterationClause .= ', ALTER '.$column->getQuotedName($this).' DROP DEFAULT';
             }
 
             return $columnAlterationClause;
@@ -367,7 +367,7 @@ 
     {
         $nullClause = isset($columnDef['notnull']) && (boolean) $columnDef['notnull'] === false ? ' NULL' : '';
 
-        return 'BIT' . $nullClause;
+        return 'BIT'.$nullClause;
     }
 
     /**
@@ -387,7 +387,7 @@ 
         $columnName = new Identifier($columnName);
         $comment = $comment === null ? 'NULL' : $this->quoteStringLiteral($comment);
 
-        return "COMMENT ON COLUMN " . $tableName->getQuotedName($this) . '.' . $columnName->getQuotedName($this) .
+        return "COMMENT ON COLUMN ".$tableName->getQuotedName($this).'.'.$columnName->getQuotedName($this).
             " IS $comment";
     }
 
@@ -396,7 +396,7 @@ 
      */
     public function getConcatExpression()
     {
-        return 'STRING(' . implode(', ', (array) func_get_args()) . ')';
+        return 'STRING('.implode(', ', (array) func_get_args()).')';
     }
 
     /**
@@ -412,8 +412,8 @@ 
             $table = $table->getQuotedName($this);
         }
 
-        return 'ALTER TABLE ' . $table .
-               ' ADD ' . $this->getTableConstraintDeclarationSQL($constraint, $constraint->getQuotedName($this));
+        return 'ALTER TABLE '.$table.
+               ' ADD '.$this->getTableConstraintDeclarationSQL($constraint, $constraint->getQuotedName($this));
     }
 
     /**
@@ -423,7 +423,7 @@ 
     {
         $database = new Identifier($database);
 
-        return "CREATE DATABASE '" . $database->getName() . "'";
+        return "CREATE DATABASE '".$database->getName()."'";
     }
 
     /**
@@ -433,7 +433,7 @@ 
      */
     public function getCreateIndexSQL(Index $index, $table)
     {
-        return parent::getCreateIndexSQL($index, $table). $this->getAdvancedIndexOptionsSQL($index);
+        return parent::getCreateIndexSQL($index, $table).$this->getAdvancedIndexOptionsSQL($index);
     }
 
     /**
@@ -445,7 +445,7 @@ 
             $table = $table->getQuotedName($this);
         }
 
-        return 'ALTER TABLE ' . $table . ' ADD ' . $this->getPrimaryKeyDeclarationSQL($index);
+        return 'ALTER TABLE '.$table.' ADD '.$this->getPrimaryKeyDeclarationSQL($index);
     }
 
     /**
@@ -453,7 +453,7 @@ 
      */
     public function getCreateTemporaryTableSnippetSQL()
     {
-        return 'CREATE ' . $this->getTemporaryTableSQL() . ' TABLE';
+        return 'CREATE '.$this->getTemporaryTableSQL().' TABLE';
     }
 
     /**
@@ -461,7 +461,7 @@ 
      */
     public function getCreateViewSQL($name, $sql)
     {
-        return 'CREATE VIEW ' . $name . ' AS ' . $sql;
+        return 'CREATE VIEW '.$name.' AS '.$sql;
     }
 
     /**
@@ -499,7 +499,7 @@ 
             $factorClause = '-1 * ';
         }
 
-        return 'DATEADD(' . $unit . ', ' . $factorClause . $interval . ', ' . $date . ')';
+        return 'DATEADD('.$unit.', '.$factorClause.$interval.', '.$date.')';
     }
 
     /**
@@ -507,7 +507,7 @@ 
      */
     public function getDateDiffExpression($date1, $date2)
     {
-        return 'DATEDIFF(day, ' . $date2 . ', ' . $date1 . ')';
+        return 'DATEDIFF(day, '.$date2.', '.$date1.')';
     }
 
     /**
@@ -557,7 +557,7 @@ 
     {
         $database = new Identifier($database);
 
-        return "DROP DATABASE '" . $database->getName() . "'";
+        return "DROP DATABASE '".$database->getName()."'";
     }
 
     /**
@@ -569,29 +569,29 @@ 
             $index = $index->getQuotedName($this);
         }
 
-        if ( ! is_string($index)) {
+        if (!is_string($index)) {
             throw new \InvalidArgumentException(
-                'SQLAnywherePlatform::getDropIndexSQL() expects $index parameter to be string or ' .
+                'SQLAnywherePlatform::getDropIndexSQL() expects $index parameter to be string or '.
                 '\Doctrine\DBAL\Schema\Index.'
             );
         }
 
-        if ( ! isset($table)) {
-            return 'DROP INDEX ' . $index;
+        if (!isset($table)) {
+            return 'DROP INDEX '.$index;
         }
 
         if ($table instanceof Table) {
             $table = $table->getQuotedName($this);
         }
 
-        if ( ! is_string($table)) {
+        if (!is_string($table)) {
             throw new \InvalidArgumentException(
-                'SQLAnywherePlatform::getDropIndexSQL() expects $table parameter to be string or ' .
+                'SQLAnywherePlatform::getDropIndexSQL() expects $table parameter to be string or '.
                 '\Doctrine\DBAL\Schema\Table.'
             );
         }
 
-        return 'DROP INDEX ' . $table . '.' . $index;
+        return 'DROP INDEX '.$table.'.'.$index;
     }
 
     /**
@@ -599,7 +599,7 @@ 
      */
     public function getDropViewSQL($name)
     {
-        return 'DROP VIEW ' . $name;
+        return 'DROP VIEW '.$name;
     }
 
     /**
@@ -613,8 +613,8 @@ 
         $foreignColumns   = $foreignKey->getQuotedForeignColumns($this);
         $foreignTableName = $foreignKey->getQuotedForeignTableName($this);
 
-        if ( ! empty($foreignKeyName)) {
-            $sql .= 'CONSTRAINT ' . $foreignKey->getQuotedName($this) . ' ';
+        if (!empty($foreignKeyName)) {
+            $sql .= 'CONSTRAINT '.$foreignKey->getQuotedName($this).' ';
         }
 
         if (empty($localColumns)) {
@@ -633,10 +633,10 @@ 
             $sql .= 'NOT NULL ';
         }
 
-        return $sql .
-            'FOREIGN KEY (' . $this->getIndexFieldDeclarationListSQL($localColumns) . ') ' .
-            'REFERENCES ' . $foreignKey->getQuotedForeignTableName($this) .
-            ' (' . $this->getIndexFieldDeclarationListSQL($foreignColumns) . ')';
+        return $sql.
+            'FOREIGN KEY ('.$this->getIndexFieldDeclarationListSQL($localColumns).') '.
+            'REFERENCES '.$foreignKey->getQuotedForeignTableName($this).
+            ' ('.$this->getIndexFieldDeclarationListSQL($foreignColumns).')';
     }
 
     /**
@@ -663,7 +663,7 @@ 
             case self::FOREIGN_KEY_MATCH_FULL_UNIQUE:
                 return 'UNIQUE FULL';
             default:
-                throw new \InvalidArgumentException('Invalid foreign key match type: ' . $type);
+                throw new \InvalidArgumentException('Invalid foreign key match type: '.$type);
         }
     }
 
@@ -971,10 +971,10 @@ 
     public function getLocateExpression($str, $substr, $startPos = false)
     {
         if ($startPos == false) {
-            return 'LOCATE(' . $str . ', ' . $substr . ')';
+            return 'LOCATE('.$str.', '.$substr.')';
         }
 
-        return 'LOCATE(' . $str . ', ' . $substr . ', ' . $startPos . ')';
+        return 'LOCATE('.$str.', '.$substr.', '.$startPos.')';
     }
 
     /**
@@ -990,7 +990,7 @@ 
      */
     public function getMd5Expression($column)
     {
-        return "HASH(" . $column . ", 'MD5')";
+        return "HASH(".$column.", 'MD5')";
     }
 
     /**
@@ -1014,7 +1014,7 @@ 
      */
     public function getPrimaryKeyDeclarationSQL(Index $index, $name = null)
     {
-        if ( ! $index->isPrimary()) {
+        if (!$index->isPrimary()) {
             throw new \InvalidArgumentException(
                 'Can only create primary key declarations with getPrimaryKeyDeclarationSQL()'
             );
@@ -1028,7 +1028,7 @@ 
      */
     public function getSetTransactionIsolationSQL($level)
     {
-        return 'SET TEMPORARY OPTION isolation_level = ' . $this->_getTransactionIsolationLevelSQL($level);
+        return 'SET TEMPORARY OPTION isolation_level = '.$this->_getTransactionIsolationLevelSQL($level);
     }
 
     /**
@@ -1058,7 +1058,7 @@ 
     {
         $database = new Identifier($database);
 
-        return "START DATABASE '" . $database->getName() . "' AUTOSTOP OFF";
+        return "START DATABASE '".$database->getName()."' AUTOSTOP OFF";
     }
 
     /**
@@ -1077,7 +1077,7 @@ 
     {
         $database = new Identifier($database);
 
-        return 'STOP DATABASE "' . $database->getName() . '" UNCONDITIONALLY';
+        return 'STOP DATABASE "'.$database->getName().'" UNCONDITIONALLY';
     }
 
     /**
@@ -1086,10 +1086,10 @@ 
     public function getSubstringExpression($value, $from, $length = null)
     {
         if (null === $length) {
-            return 'SUBSTRING(' . $value . ', ' . $from . ')';
+            return 'SUBSTRING('.$value.', '.$from.')';
         }
 
-        return 'SUBSTRING(' . $value . ', ' . $from . ', ' . $length . ')';
+        return 'SUBSTRING('.$value.', '.$from.', '.$length.')';
     }
 
     /**
@@ -1121,14 +1121,14 @@ 
      */
     public function getTrimExpression($str, $pos = TrimMode::UNSPECIFIED, $char = false)
     {
-        if ( ! $char) {
+        if (!$char) {
             switch ($pos) {
                 case TrimMode::LEADING:
                     return $this->getLtrimExpression($str);
                 case TrimMode::TRAILING:
                     return $this->getRtrimExpression($str);
                 default:
-                    return 'TRIM(' . $str . ')';
+                    return 'TRIM('.$str.')';
             }
         }
 
@@ -1136,13 +1136,13 @@ 
 
         switch ($pos) {
             case TrimMode::LEADING:
-                return 'SUBSTR(' . $str . ', PATINDEX(' . $pattern . ', ' . $str . '))';
+                return 'SUBSTR('.$str.', PATINDEX('.$pattern.', '.$str.'))';
             case TrimMode::TRAILING:
-                return 'REVERSE(SUBSTR(REVERSE(' . $str . '), PATINDEX(' . $pattern . ', REVERSE(' . $str . '))))';
+                return 'REVERSE(SUBSTR(REVERSE('.$str.'), PATINDEX('.$pattern.', REVERSE('.$str.'))))';
             default:
                 return
-                    'REVERSE(SUBSTR(REVERSE(SUBSTR(' . $str . ', PATINDEX(' . $pattern . ', ' . $str . '))), ' .
-                    'PATINDEX(' . $pattern . ', REVERSE(SUBSTR(' . $str . ', PATINDEX(' . $pattern . ', ' . $str . '))))))';
+                    'REVERSE(SUBSTR(REVERSE(SUBSTR('.$str.', PATINDEX('.$pattern.', '.$str.'))), '.
+                    'PATINDEX('.$pattern.', REVERSE(SUBSTR('.$str.', PATINDEX('.$pattern.', '.$str.'))))))';
         }
     }
 
@@ -1153,7 +1153,7 @@ 
     {
         $tableIdentifier = new Identifier($tableName);
 
-        return 'TRUNCATE TABLE ' . $tableIdentifier->getQuotedName($this);
+        return 'TRUNCATE TABLE '.$tableIdentifier->getQuotedName($this);
     }
 
     /**
@@ -1167,9 +1167,9 @@ 
             );
         }
 
-        if ( ! $index->isUnique()) {
+        if (!$index->isUnique()) {
             throw new \InvalidArgumentException(
-                'Can only create unique constraint declarations, no common index declarations with ' .
+                'Can only create unique constraint declarations, no common index declarations with '.
                 'getUniqueConstraintDeclarationSQL().'
             );
         }
@@ -1230,10 +1230,10 @@ 
      */
     protected function _getCommonIntegerTypeDeclarationSQL(array $columnDef)
     {
-        $unsigned      = ! empty($columnDef['unsigned']) ? 'UNSIGNED ' : '';
-        $autoincrement = ! empty($columnDef['autoincrement']) ? ' IDENTITY' : '';
+        $unsigned      = !empty($columnDef['unsigned']) ? 'UNSIGNED ' : '';
+        $autoincrement = !empty($columnDef['autoincrement']) ? ' IDENTITY' : '';
 
-        return $unsigned . $columnDef['integer_type'] . $autoincrement;
+        return $unsigned.$columnDef['integer_type'].$autoincrement;
     }
 
     /**
@@ -1244,40 +1244,40 @@ 
         $columnListSql = $this->getColumnDeclarationListSQL($columns);
         $indexSql = [];
 
-        if ( ! empty($options['uniqueConstraints'])) {
+        if (!empty($options['uniqueConstraints'])) {
             foreach ((array) $options['uniqueConstraints'] as $name => $definition) {
-                $columnListSql .= ', ' . $this->getUniqueConstraintDeclarationSQL($name, $definition);
+                $columnListSql .= ', '.$this->getUniqueConstraintDeclarationSQL($name, $definition);
             }
         }
 
-        if ( ! empty($options['indexes'])) {
+        if (!empty($options['indexes'])) {
             /** @var \Doctrine\DBAL\Schema\Index $index */
             foreach ((array) $options['indexes'] as $index) {
                 $indexSql[] = $this->getCreateIndexSQL($index, $tableName);
             }
         }
 
-        if ( ! empty($options['primary'])) {
+        if (!empty($options['primary'])) {
             $flags = '';
 
             if (isset($options['primary_index']) && $options['primary_index']->hasFlag('clustered')) {
                 $flags = ' CLUSTERED ';
             }
 
-            $columnListSql .= ', PRIMARY KEY' . $flags . ' (' . implode(', ', array_unique(array_values((array) $options['primary']))) . ')';
+            $columnListSql .= ', PRIMARY KEY'.$flags.' ('.implode(', ', array_unique(array_values((array) $options['primary']))).')';
         }
 
-        if ( ! empty($options['foreignKeys'])) {
+        if (!empty($options['foreignKeys'])) {
             foreach ((array) $options['foreignKeys'] as $definition) {
-                $columnListSql .= ', ' . $this->getForeignKeyDeclarationSQL($definition);
+                $columnListSql .= ', '.$this->getForeignKeyDeclarationSQL($definition);
             }
         }
 
-        $query = 'CREATE TABLE ' . $tableName . ' (' . $columnListSql;
+        $query = 'CREATE TABLE '.$tableName.' ('.$columnListSql;
         $check = $this->getCheckDeclarationSQL($columns);
 
-        if ( ! empty($check)) {
-            $query .= ', ' . $check;
+        if (!empty($check)) {
+            $query .= ', '.$check;
         }
 
         $query .= ')';
@@ -1300,7 +1300,7 @@ 
             case TransactionIsolationLevel::SERIALIZABLE:
                 return 3;
             default:
-                throw new \InvalidArgumentException('Invalid isolation level:' . $level);
+                throw new \InvalidArgumentException('Invalid isolation level:'.$level);
         }
     }
 
@@ -1312,7 +1312,7 @@ 
         $limitOffsetClause = '';
 
         if ($limit > 0) {
-            $limitOffsetClause = 'TOP ' . $limit . ' ';
+            $limitOffsetClause = 'TOP '.$limit.' ';
         }
 
         if ($offset > 0) {
@@ -1320,11 +1320,11 @@ 
                 $limitOffsetClause = 'TOP ALL ';
             }
 
-            $limitOffsetClause .= 'START AT ' . ($offset + 1) . ' ';
+            $limitOffsetClause .= 'START AT '.($offset + 1).' ';
         }
 
         if ($limitOffsetClause) {
-            return preg_replace('/^\s*(SELECT\s+(DISTINCT\s+)?)/i', '\1' . $limitOffsetClause, $query);
+            return preg_replace('/^\s*(SELECT\s+(DISTINCT\s+)?)/i', '\1'.$limitOffsetClause, $query);
         }
 
         return $query;
@@ -1342,7 +1342,7 @@ 
     {
         $sql = '';
 
-        if ( ! $index->isPrimary() && $index->hasFlag('for_olap_workload')) {
+        if (!$index->isPrimary() && $index->hasFlag('for_olap_workload')) {
             $sql .= ' FOR OLAP WORKLOAD';
         }
 
@@ -1355,8 +1355,8 @@ 
     protected function getBinaryTypeDeclarationSQLSnippet($length, $fixed)
     {
         return $fixed
-            ? 'BINARY(' . ($length ?: $this->getBinaryDefaultLength()) . ')'
-            : 'VARBINARY(' . ($length ?: $this->getBinaryDefaultLength()) . ')';
+            ? 'BINARY('.($length ?: $this->getBinaryDefaultLength()).')'
+            : 'VARBINARY('.($length ?: $this->getBinaryDefaultLength()).')';
     }
 
     /**
@@ -1375,13 +1375,13 @@ 
             return $this->getForeignKeyDeclarationSQL($constraint);
         }
 
-        if ( ! $constraint instanceof Index) {
-            throw new \InvalidArgumentException('Unsupported constraint type: ' . get_class($constraint));
+        if (!$constraint instanceof Index) {
+            throw new \InvalidArgumentException('Unsupported constraint type: '.get_class($constraint));
         }
 
-        if ( ! $constraint->isPrimary() && ! $constraint->isUnique()) {
+        if (!$constraint->isPrimary() && !$constraint->isUnique()) {
             throw new \InvalidArgumentException(
-                'Can only create primary, unique or foreign key constraint declarations, no common index declarations ' .
+                'Can only create primary, unique or foreign key constraint declarations, no common index declarations '.
                 'with getTableConstraintDeclarationSQL().'
             );
         }
@@ -1395,9 +1395,9 @@ 
         $sql   = '';
         $flags = '';
 
-        if ( ! empty($name)) {
+        if (!empty($name)) {
             $name = new Identifier($name);
-            $sql .= 'CONSTRAINT ' . $name->getQuotedName($this) . ' ';
+            $sql .= 'CONSTRAINT '.$name->getQuotedName($this).' ';
         }
 
         if ($constraint->hasFlag('clustered')) {
@@ -1405,10 +1405,10 @@ 
         }
 
         if ($constraint->isPrimary()) {
-            return $sql . 'PRIMARY KEY ' . $flags . '('. $this->getIndexFieldDeclarationListSQL($constraintColumns) . ')';
+            return $sql.'PRIMARY KEY '.$flags.'('.$this->getIndexFieldDeclarationListSQL($constraintColumns).')';
         }
 
-        return $sql . 'UNIQUE ' . $flags . '('. $this->getIndexFieldDeclarationListSQL($constraintColumns) . ')';
+        return $sql.'UNIQUE '.$flags.'('.$this->getIndexFieldDeclarationListSQL($constraintColumns).')';
     }
 
     /**
@@ -1438,7 +1438,7 @@ 
     protected function getRenameIndexSQL($oldIndexName, Index $index, $tableName)
     {
         return [
-            'ALTER INDEX ' . $oldIndexName . ' ON ' . $tableName . ' RENAME TO ' . $index->getQuotedName($this)
+            'ALTER INDEX '.$oldIndexName.' ON '.$tableName.' RENAME TO '.$index->getQuotedName($this)
         ];
     }
 
@@ -1456,8 +1456,8 @@ 
     protected function getVarcharTypeDeclarationSQLSnippet($length, $fixed)
     {
         return $fixed
-            ? ($length ? 'CHAR(' . $length . ')' : 'CHAR(' . $this->getVarcharDefaultLength() . ')')
-            : ($length ? 'VARCHAR(' . $length . ')' : 'VARCHAR(' . $this->getVarcharDefaultLength() . ')');
+            ? ($length ? 'CHAR('.$length.')' : 'CHAR('.$this->getVarcharDefaultLength().')')
+            : ($length ? 'VARCHAR('.$length.')' : 'VARCHAR('.$this->getVarcharDefaultLength().')');
     }
 
     /**