Completed
Branch master (9240b5)
by Edgard
19:46 queued 17:25
created
src/QueryBuilder.php 2 patches
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -98,6 +98,7 @@  discard block
 block discarded – undo
98 98
 
99 99
     /**
100 100
      * @inheritdoc
101
+     * @param string $selectOption
101 102
      */
102 103
     public function buildSelect($columns, &$params, $distinct = false, $selectOption = null)
103 104
     {
@@ -147,6 +148,9 @@  discard block
 block discarded – undo
147 148
 
148 149
     /**
149 150
      * @inheritdoc
151
+     * @param string $sql
152
+     * @param integer $limit
153
+     * @param integer $offset
150 154
      */
151 155
     public function buildOrderByAndLimit($sql, $orderBy, $limit, $offset)
152 156
     {
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -375,9 +375,9 @@  discard block
 block discarded – undo
375 375
             }
376 376
         }
377 377
         
378
-        $baseSql    = 'ALTER TABLE ' . $this->db->quoteTableName($table)
379
-        . ' ALTER '. $this->db->quoteColumnName($column)
380
-        . (($hasType)? ' TYPE ': ' ') .  $this->getColumnType($type);
378
+        $baseSql = 'ALTER TABLE ' . $this->db->quoteTableName($table)
379
+        . ' ALTER ' . $this->db->quoteColumnName($column)
380
+        . (($hasType) ? ' TYPE ' : ' ') . $this->getColumnType($type);
381 381
         
382 382
         if ($columnSchema->allowNull == $allowNullNewType) {
383 383
             return $baseSql;
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
425 425
             $value = (int) $value;
426 426
         } else {
427 427
             // use master connection to get the biggest PK value
428
-            $value = $this->db->useMaster(function (Connection $db) use ($tableSchema) {
428
+            $value = $this->db->useMaster(function(Connection $db) use ($tableSchema) {
429 429
                 $key = reset($tableSchema->primaryKey);
430 430
                 return $db->createCommand("SELECT MAX({$this->db->quoteColumnName($key)}) FROM {$this->db->quoteTableName($tableSchema->name)}")->queryScalar();
431 431
             }) + 1;
Please login to merge, or discard this patch.
src/Schema.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 
84 84
     public function quoteSimpleTableName($name)
85 85
     {
86
-        if($this->db->tablePrefix !== ''){
86
+        if ($this->db->tablePrefix !== '') {
87 87
             return $name;
88 88
         }
89 89
 
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
         $c->name = strtolower(rtrim($column['fname']));
250 250
         $c->allowNull = $column['fnull'] !== '1';
251 251
         $c->isPrimaryKey = $column['fprimary'];
252
-        $c->autoIncrement = (boolean)$column['fautoinc'];
252
+        $c->autoIncrement = (boolean) $column['fautoinc'];
253 253
         $c->comment = $column['fcomment'] === null ? '' : $column['fcomment'];
254 254
 
255 255
         $c->type = self::TYPE_STRING;
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
497 497
         $returnColumns = $this->getTableSchema($table)->primaryKey;
498 498
         if (!empty($returnColumns)) {
499 499
             $returning = [];
500
-            foreach ((array)$returnColumns as $name) {
500
+            foreach ((array) $returnColumns as $name) {
501 501
                 $returning[] = $this->quoteColumnName($name);
502 502
             }
503 503
             $sql .= ' RETURNING ' . implode(', ', $returning);
@@ -511,7 +511,7 @@  discard block
 block discarded – undo
511 511
             return false;
512 512
         } else {
513 513
             if (!empty($returnColumns)) {
514
-                foreach ((array)$returnColumns as $name) {
514
+                foreach ((array) $returnColumns as $name) {
515 515
                     if ($this->getTableSchema($table)->getColumn($name)->autoIncrement) {
516 516
                         $this->_lastInsertID = $result[$name];
517 517
                         break;
@@ -532,7 +532,7 @@  discard block
 block discarded – undo
532 532
         }
533 533
         
534 534
         if ($sequenceName !== '') {
535
-            return $this->db->createCommand('SELECT GEN_ID('. $this->db->quoteTableName($sequenceName) .  ', 0 ) FROM RDB$DATABASE;')->queryScalar();
535
+            return $this->db->createCommand('SELECT GEN_ID(' . $this->db->quoteTableName($sequenceName) . ', 0 ) FROM RDB$DATABASE;')->queryScalar();
536 536
         }
537 537
 
538 538
         if ($this->_lastInsertID !== false) {
Please login to merge, or discard this patch.