edgardmessias / yii2-ibm-db2

src/DataReader.php

Doc Comments +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     /**
      * Returns a single column from the next row of a result set.
      * @param integer $columnIndex zero-based column index
-     * @return mixed the column of the current row, false if no more rows available
+     * @return string|false the column of the current row, false if no more rows available
      */
     public function readColumn($columnIndex)
     {

src/QueryBuilder.php

Braces +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
             $orderByStatment = $this->buildOrderBy($newOrderBy);
 
             $sql = str_replace(':order', $orderByStatment,$sql);
-        }else{
+        } else{
             $orderByStatment = $this->buildOrderBy($orderBy);
             if ($orderByStatment !== '') {
                 $sql .= $this->separator . $orderByStatment;

Spacing +30 added lines, -30 removed lines

@@ -58,14 +58,14 @@ 
     {
         $table = $this->db->getTableSchema($tableName);
 
-        if ($table !== null && isset($table->columns[$table->sequenceName])) {
+        if ($table !== null && isset($table->columns[ $table->sequenceName ])) {
             if ($value === null) {
-                $sql = 'SELECT MAX("'. $table->sequenceName .'") FROM "'. $tableName . '"';
+                $sql = 'SELECT MAX("' . $table->sequenceName . '") FROM "' . $tableName . '"';
                 $value = $this->db->createCommand($sql)->queryScalar() + 1;
             } else {
                 $value = (int) $value;
             }
-            return 'ALTER TABLE "' . $tableName . '" ALTER COLUMN "'.$table->sequenceName.'" RESTART WITH ' . $value;
+            return 'ALTER TABLE "' . $tableName . '" ALTER COLUMN "' . $table->sequenceName . '" RESTART WITH ' . $value;
         } elseif ($table === null) {
             throw new InvalidParamException("Table not found: $tableName");
         } else {
@@ -85,7 +85,7 @@ 
     public function checkIntegrity($check = true, $schema = '', $table = '')
     {
         if ($table) {
-            $tableNames = [$table];
+            $tableNames = [ $table ];
         } else {
             if (!$schema) {
                 $schema = $this->db->defaultSchema;
@@ -118,13 +118,13 @@ 
             return '';
         }
 
-        $quotedTableNames = [];
+        $quotedTableNames = [ ];
         foreach ($tableNames as $tableName) {
-            $quotedTableNames[] = $this->db->quoteTableName($tableName) . ($check? '' : ' ALL');
+            $quotedTableNames[ ] = $this->db->quoteTableName($tableName) . ($check ? '' : ' ALL');
         }
 
         $enable = $check ? 'CHECKED' : 'UNCHECKED';
-        return 'SET INTEGRITY FOR ' . implode(', ', $quotedTableNames) . ' IMMEDIATE ' . $enable. ';';
+        return 'SET INTEGRITY FOR ' . implode(', ', $quotedTableNames) . ' IMMEDIATE ' . $enable . ';';
     }
 
     /**
@@ -137,22 +137,22 @@ 
             $sql = str_replace(':query', $sql, $limitOffsetStatment);
 
             //convert "item"."id" to "id" to use in OVER()
-            $newOrderBy = [];
+            $newOrderBy = [ ];
 
-            if(!empty($orderBy)){
+            if (!empty($orderBy)) {
                 foreach ($orderBy as $name => $direction) {
-                    if(is_string($name)){
+                    if (is_string($name)) {
                         $e = explode('.', $name);
                         $name = array_pop($e);
                     }
-                    $newOrderBy[$name] = $direction;
+                    $newOrderBy[ $name ] = $direction;
                 }
             }
 
             $orderByStatment = $this->buildOrderBy($newOrderBy);
 
-            $sql = str_replace(':order', $orderByStatment,$sql);
-        }else{
+            $sql = str_replace(':order', $orderByStatment, $sql);
+        } else {
             $orderByStatment = $this->buildOrderBy($orderBy);
             if ($orderByStatment !== '') {
                 $sql .= $this->separator . $orderByStatment;
@@ -196,24 +196,24 @@ 
      */
     protected function buildCompositeInCondition($operator, $columns, $values, &$params)
     {
-        $vss = [];
+        $vss = [ ];
         foreach ($values as $value) {
-            $vs = [];
+            $vs = [ ];
             foreach ($columns as $column) {
-                if (isset($value[$column])) {
+                if (isset($value[ $column ])) {
                     $phName = self::PARAM_PREFIX . count($params);
-                    $params[$phName] = $value[$column];
-                    $vs[] = $phName;
+                    $params[ $phName ] = $value[ $column ];
+                    $vs[ ] = $phName;
                 } else {
-                    $vs[] = 'NULL';
+                    $vs[ ] = 'NULL';
                 }
             }
-            $vss[] = 'select ' . implode(', ', $vs) . ' from SYSIBM.SYSDUMMY1';
+            $vss[ ] = 'select ' . implode(', ', $vs) . ' from SYSIBM.SYSDUMMY1';
         }
 
-        $sqlColumns = [];
+        $sqlColumns = [ ];
         foreach ($columns as $i => $column) {
-            $sqlColumns[] = strpos($column, '(') === false ? $this->db->quoteColumnName($column) : $column;
+            $sqlColumns[ ] = strpos($column, '(') === false ? $this->db->quoteColumnName($column) : $column;
         }
 
         return '(' . implode(', ', $sqlColumns) . ") $operator (" . implode(' UNION ', $vss) . ')';
@@ -228,21 +228,21 @@ 
         if (($tableSchema = $schema->getTableSchema($table)) !== null) {
             $columnSchemas = $tableSchema->columns;
         } else {
-            $columnSchemas = [];
+            $columnSchemas = [ ];
         }
-        $names = [];
-        $placeholders = [];
+        $names = [ ];
+        $placeholders = [ ];
         foreach ($columns as $name => $value) {
-            $names[] = $schema->quoteColumnName($name);
+            $names[ ] = $schema->quoteColumnName($name);
             if ($value instanceof Expression) {
-                $placeholders[] = $value->expression;
+                $placeholders[ ] = $value->expression;
                 foreach ($value->params as $n => $v) {
-                    $params[$n] = $v;
+                    $params[ $n ] = $v;
                 }
             } else {
                 $phName = self::PARAM_PREFIX . count($params);
-                $placeholders[] = $phName;
-                $params[$phName] = !is_array($value) && isset($columnSchemas[$name]) ? $columnSchemas[$name]->dbTypecast($value) : $value;
+                $placeholders[ ] = $phName;
+                $params[ $phName ] = !is_array($value) && isset($columnSchemas[ $name ]) ? $columnSchemas[ $name ]->dbTypecast($value) : $value;
             }
         }
 

src/Schema.php

Spacing +42 added lines, -42 removed lines

@@ -146,12 +146,12 @@ 
     protected function resolveTableNames($table, $name)
     {
         $parts = explode('.', str_replace('"', '', $name));
-        if (isset($parts[1])) {
-            $table->schemaName = $parts[0];
-            $table->name = $parts[1];
+        if (isset($parts[ 1 ])) {
+            $table->schemaName = $parts[ 0 ];
+            $table->name = $parts[ 1 ];
             $table->fullName = $table->schemaName . '.' . $table->name;
         } else {
-            $table->fullName = $table->name = $parts[0];
+            $table->fullName = $table->name = $parts[ 0 ];
         }
     }
 
@@ -173,7 +173,7 @@ 
         ];
         $type = gettype($data);
 
-        return isset($typeMap[$type]) ? $typeMap[$type] : PDO::PARAM_STR;
+        return isset($typeMap[ $type ]) ? $typeMap[ $type ] : PDO::PARAM_STR;
     }
 
     /**
@@ -183,24 +183,24 @@ 
     {
         $column = $this->createColumnSchema();
 
-        $column->name = $info['name'];
-        $column->dbType = $info['dbtype'];
-        $column->defaultValue = isset($info['defaultvalue']) ? trim($info['defaultvalue'], "''") : null;
-        $column->scale = (int) $info['scale'];
-        $column->size = (int) $info['size'];
-        $column->precision = (int) $info['size'];
-        $column->allowNull = $info['allownull'] === '1';
-        $column->isPrimaryKey = $info['isprimarykey'] === '1';
-        $column->autoIncrement = $info['autoincrement'] === '1';
+        $column->name = $info[ 'name' ];
+        $column->dbType = $info[ 'dbtype' ];
+        $column->defaultValue = isset($info[ 'defaultvalue' ]) ? trim($info[ 'defaultvalue' ], "''") : null;
+        $column->scale = (int) $info[ 'scale' ];
+        $column->size = (int) $info[ 'size' ];
+        $column->precision = (int) $info[ 'size' ];
+        $column->allowNull = $info[ 'allownull' ] === '1';
+        $column->isPrimaryKey = $info[ 'isprimarykey' ] === '1';
+        $column->autoIncrement = $info[ 'autoincrement' ] === '1';
         $column->unsigned = false;
-        $column->type = $this->typeMap[strtolower($info['dbtype'])];
+        $column->type = $this->typeMap[ strtolower($info[ 'dbtype' ]) ];
         $column->enumValues = null;
-        $column->comment = isset($info['comment']) ? $info['comment'] : null;
+        $column->comment = isset($info[ 'comment' ]) ? $info[ 'comment' ] : null;
 
-        if (preg_match('/(varchar|character|clob|graphic|binary|blob)/i', $info['dbtype'])) {
-            $column->dbType .= '(' . $info['size'] . ')';
-        } elseif (preg_match('/(decimal|double|real)/i', $info['dbtype'])) {
-            $column->dbType .= '(' . $info['size'] . ',' . $info['scale'] . ')';
+        if (preg_match('/(varchar|character|clob|graphic|binary|blob)/i', $info[ 'dbtype' ])) {
+            $column->dbType .= '(' . $info[ 'size' ] . ')';
+        } elseif (preg_match('/(decimal|double|real)/i', $info[ 'dbtype' ])) {
+            $column->dbType .= '(' . $info[ 'size' ] . ',' . $info[ 'scale' ] . ')';
         }
 
         if ($column->defaultValue) {
@@ -274,11 +274,11 @@ 
 
         $command = $this->db->createCommand($sql);
         $command->bindValue(':table', $table->name);
-        if($this->db->isISeries){
+        if ($this->db->isISeries) {
             $command->bindValue(':schema', $this->db->defaultSchema);
             $command->bindValue(':table1', $table->name);
 
-        }else {
+        } else {
             if (isset($table->schemaName)) {
                 $command->bindValue(':schema', $table->schemaName);
             }
@@ -293,9 +293,9 @@ 
                 $info = array_change_key_case($info, CASE_LOWER);
             }
             $column = $this->loadColumnSchema($info);
-            $table->columns[$column->name] = $column;
+            $table->columns[ $column->name ] = $column;
             if ($column->isPrimaryKey) {
-                $table->primaryKey[] = $column->name;
+                $table->primaryKey[ ] = $column->name;
                 if ($column->autoIncrement) {
                     $table->sequenceName = $column->name;
                 }
@@ -351,31 +351,31 @@ 
         }
         $command = $this->db->createCommand($sql);
         $command->bindValue(':table', $table->name);
-        if($this->db->isISeries){
+        if ($this->db->isISeries) {
             $command->bindValue(':schema', $this->db->defaultSchema);
-        }else {
+        } else {
             if (isset($table->schemaName)) {
                 $command->bindValue(':schema', $table->schemaName);
             }
         }
 
         $results = $command->queryAll();
-        $foreignKeys = [];
+        $foreignKeys = [ ];
         foreach ($results as $result) {
             if ($this->db->slavePdo->getAttribute(PDO::ATTR_CASE) !== PDO::CASE_LOWER) {
                 $result = array_change_key_case($result, CASE_LOWER);
             }
-            $tablename = $result['tablename'];
-            $fk = $result['fk'];
-            $pk = $result['pk'];
-            $foreignKeys[$tablename][$fk] = $pk;
+            $tablename = $result[ 'tablename' ];
+            $fk = $result[ 'fk' ];
+            $pk = $result[ 'pk' ];
+            $foreignKeys[ $tablename ][ $fk ] = $pk;
         }
         foreach ($foreignKeys as $tablename => $keymap) {
-            $constraint = [$tablename];
+            $constraint = [ $tablename ];
             foreach ($keymap as $fk => $pk) {
-                $constraint[$fk] = $pk;
+                $constraint[ $fk ] = $pk;
             }
-            $table->foreignKeys[] = $constraint;
+            $table->foreignKeys[ ] = $constraint;
         }
     }
 
@@ -400,7 +400,7 @@ 
                   AND qsys2.syscst.table_schema = :schema
                   ORDER BY qsys2.syskeycst.column_position
 SQL;
-        }else {
+        } else {
             $sql = <<<SQL
             SELECT
                 i.indname AS indexname,
@@ -422,20 +422,20 @@ 
         $command = $this->db->createCommand($sql);
         $command->bindValue(':table', $table->name);
 
-        if($this->db->isISeries){
+        if ($this->db->isISeries) {
             $command->bindValue(':schema', $this->db->defaultSchema);
-        }else{
+        } else {
             if (isset($table->schemaName)) {
                 $command->bindValue(':schema', $table->schemaName);
             }
         }
         $results = $command->queryAll();
-        $indexes = [];
+        $indexes = [ ];
         foreach ($results as $result) {
             if ($this->db->slavePdo->getAttribute(PDO::ATTR_CASE) !== PDO::CASE_LOWER) {
                 $result = array_change_key_case($result, CASE_LOWER);
             }
-            $indexes[$result['indexname']][] = $result['column'];
+            $indexes[ $result[ 'indexname' ] ][ ] = $result[ 'column' ];
         }
         return $indexes;
     }
@@ -447,7 +447,7 @@ 
     {
 
         if ($schema === '' && $this->db->isISeries) {
-                $schema= $this->db->defaultSchema;
+                $schema = $this->db->defaultSchema;
         }
 
         if ($this->db->isISeries) {
@@ -459,7 +459,7 @@ 
                   AND TABLE_SCHEMA = :schema
                 ORDER BY TABLE_NAME
 SQL;
-        }else {
+        } else {
 
             $sql = <<<SQL
             SELECT
@@ -538,7 +538,7 @@ 
             $this->db->createCommand($sql)->execute();
         } catch (\Exception $ex) {
             // Do not throw error on table which doesn't exist
-            if (!(isset($ex->errorInfo[1]) && $ex->errorInfo[1] === -2211)) {
+            if (!(isset($ex->errorInfo[ 1 ]) && $ex->errorInfo[ 1 ] === -2211)) {
                 throw new \Exception($ex->getMessage(), $ex->getCode(), $ex->getPrevious());
             }
         }

Braces +5 added lines, -5 removed lines

@@ -278,7 +278,7 @@ 
             $command->bindValue(':schema', $this->db->defaultSchema);
             $command->bindValue(':table1', $table->name);
 
-        }else {
+        } else {
             if (isset($table->schemaName)) {
                 $command->bindValue(':schema', $table->schemaName);
             }
@@ -353,7 +353,7 @@ 
         $command->bindValue(':table', $table->name);
         if($this->db->isISeries){
             $command->bindValue(':schema', $this->db->defaultSchema);
-        }else {
+        } else {
             if (isset($table->schemaName)) {
                 $command->bindValue(':schema', $table->schemaName);
             }
@@ -400,7 +400,7 @@ 
                   AND qsys2.syscst.table_schema = :schema
                   ORDER BY qsys2.syskeycst.column_position
 SQL;
-        }else {
+        } else {
             $sql = <<<SQL
             SELECT
                 i.indname AS indexname,
@@ -424,7 +424,7 @@ 
 
         if($this->db->isISeries){
             $command->bindValue(':schema', $this->db->defaultSchema);
-        }else{
+        } else{
             if (isset($table->schemaName)) {
                 $command->bindValue(':schema', $table->schemaName);
             }
@@ -459,7 +459,7 @@ 
                   AND TABLE_SCHEMA = :schema
                 ORDER BY TABLE_NAME
 SQL;
-        }else {
+        } else {
 
             $sql = <<<SQL
             SELECT

Indentation +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
         'timestmp'   => self::TYPE_TIMESTAMP
     ];
 
-   /**
+    /**
      * @inheritdoc
      */
     public function createQueryBuilder()

Doc Comments +4 added lines

@@ -96,6 +96,8 @@ 
 
     /**
      * @inheritdoc
+     * @param TableSchema $table
+     * @param string $name
      */
     protected function resolveTableNames($table, $name)
     {
@@ -170,6 +172,7 @@ 
 
     /**
      * @inheritdoc
+     * @param TableSchema $table
      */
     protected function findColumns($table)
     {
@@ -260,6 +263,7 @@ 
 
     /**
      * @inheritdoc
+     * @param TableSchema $table
      */
     protected function findConstraints($table)
     {

src/Connection.php

Spacing +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
     {
         parent::initConnection();
 
-        if($this->isISeries === null){
+        if ($this->isISeries === null) {
             try {
                 $stmt = $this->pdo->query('SELECT * FROM QSYS2.SYSTABLES FETCH FIRST 1 ROW ONLY');
                 $this->isISeries = boolval($stmt);
@@ -82,7 +82,7 @@ 
             }
         }
 
-        if($this->defaultSchema && !$this->isISeries){
+        if ($this->defaultSchema && !$this->isISeries) {
             $this->pdo->exec('SET CURRENT SCHEMA ' . $this->pdo->quote($this->defaultSchema));
         }