vakata / database

src/TableColumn.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
             $instance->setDefault($data['default']);
         }
         if ($instance->getBasicType() === 'enum' && strpos($instance->getType(), 'enum(') === 0) {
-            $temp = array_map(function ($v) {
+            $temp = array_map(function($v) {
                 return str_replace("''", "'", $v);
             }, explode("','", substr($instance->getType(), 6, -2)));
             $instance->setValues($temp);

src/driver/Oracle.php

Spacing +1 added lines, -2 removed lines

@@ -18,8 +18,7 @@
                     $this->settings->password,
                     $this->settings->servername,
                     $this->settings->charset
-                ) :
-                @oci_connect(
+                ) : @oci_connect(
                     $this->settings->username,
                     $this->settings->password,
                     $this->settings->servername,

src/driver/Pdo.php

Spacing +7 added lines, -7 removed lines

@@ -85,34 +85,34 @@
         foreach ($data as $i => $v) {
             switch (gettype($v)) {
                 case 'boolean':
-                    $sql->bindValue($i+1, $v, \PDO::PARAM_BOOL);
+                    $sql->bindValue($i + 1, $v, \PDO::PARAM_BOOL);
                     break;
                 case 'integer':
-                    $sql->bindValue($i+1, $v, \PDO::PARAM_INT);
+                    $sql->bindValue($i + 1, $v, \PDO::PARAM_INT);
                     break;
                 case 'NULL':
-                    $sql->bindValue($i+1, $v, \PDO::PARAM_NULL);
+                    $sql->bindValue($i + 1, $v, \PDO::PARAM_NULL);
                     break;
                 case 'double':
-                    $sql->bindValue($i+1, $v);
+                    $sql->bindValue($i + 1, $v);
                     break;
                 default:
                     // keep in mind oracle needs a transaction when inserting LOBs, aside from the specific syntax:
                     // INSERT INTO table (column, lobcolumn) VALUES (?, ?, EMPTY_BLOB()) RETURNING lobcolumn INTO ?
                     if (is_resource($v) && get_resource_type($v) === 'stream') {
-                        $sql->bindParam($i+1, $v, \PDO::PARAM_LOB);
+                        $sql->bindParam($i + 1, $v, \PDO::PARAM_LOB);
                         continue;
                     }
                     if (!is_string($data[$i])) {
                         $data[$i] = serialize($data[$i]);
                     }
-                    $sql->bindValue($i+1, $v);
+                    $sql->bindValue($i + 1, $v);
                     break;
             }
         }
         $rtrn = $sql->execute();
         if (!$rtrn) {
-            throw new DatabaseException('Prepared execute error : '. implode(',', $sql->errorInfo()));
+            throw new DatabaseException('Prepared execute error : '.implode(',', $sql->errorInfo()));
         }
         $this->aff = $sql->rowCount();
         return $sql->columnCount() ? $sql : $rtrn;

src/driver/Postgre.php

Spacing +2 added lines, -4 removed lines

@@ -27,8 +27,7 @@ 
                         'password='.$this->settings->password.' '.
                         'dbname='.$this->settings->database.' '.
                         "options='--client_encoding=".strtoupper($this->settings->charset)."' "
-                    ) :
-                    @pg_connect(
+                    ) : @pg_connect(
                         'host='.$this->settings->servername.' '.
                         'port='.$this->settings->serverport.' '.
                         'user='.$this->settings->username.' '.
@@ -78,8 +77,7 @@ 
             $data = array();
         }
         $temp = (is_array($data) && count($data)) ?
-            pg_query_params($this->lnk, $sql, $data) :
-            pg_query_params($this->lnk, $sql, array());
+            pg_query_params($this->lnk, $sql, $data) : pg_query_params($this->lnk, $sql, array());
         if (!$temp) {
             throw new DatabaseException('Could not execute query : '.pg_last_error($this->lnk).' <'.$sql.'>');
         }

src/driver/Mysql.php

Spacing +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
                         $this->settings->servername.':'.$this->settings->serverport,
                         $this->settings->username,
                         $this->settings->password
-                    ) :
-                    @mysql_connect(
+                    ) : @mysql_connect(
                         $this->settings->servername.':'.$this->settings->serverport,
                         $this->settings->username,
                         $this->settings->password

src/driver/Ibase.php

Spacing +2 added lines, -4 removed lines

@@ -17,8 +17,7 @@ 
         }
         $this->settings->servername =
             ($this->settings->servername === 'localhost' || $this->settings->servername === '') ?
-                '' :
-                $this->settings->servername.':';
+                '' : $this->settings->servername.':';
     }
     protected function connect()
     {
@@ -29,8 +28,7 @@ 
                         $this->settings->username,
                         $this->settings->password,
                         strtoupper($this->settings->charset)
-                    ) :
-                    @\ibase_connect(
+                    ) : @\ibase_connect(
                         $this->settings->servername.$this->settings->database,
                         $this->settings->username,
                         $this->settings->password,

src/Result.php

Spacing +2 added lines, -3 removed lines

@@ -102,8 +102,7 @@ 
             }
         }
         $cnt = $this->mode === 'assoc_ci' ?
-            count(array_unique(array_map('strtolower', array_keys($row)))) :
-            count($row);
+            count(array_unique(array_map('strtolower', array_keys($row)))) : count($row);
         if ($this->opti && is_array($row) && $cnt <= 1) {
             $row = count($row) ? current($row) : current($tmp);
         }
@@ -123,7 +122,7 @@ 
         if ($this->rdy) {
             return next($this->all);
         }
-        if($this->rslt->nextr()) {
+        if ($this->rslt->nextr()) {
             ++$this->realKey;
         }
         else {

src/Table.php

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
     public function setPrimaryKey($column) : Table
     {
         if (!is_array($column)) {
-            $column = [ $column ];
+            $column = [$column];
         }
         $this->data['primary'] = $column;
         return $this;
@@ -165,7 +165,7 @@ 
         }
 
         if (!isset($name)) {
-            $name = $toTable->getName() . '_' . implode('_', array_keys($keymap));
+            $name = $toTable->getName().'_'.implode('_', array_keys($keymap));
         }
         $this->addRelation(new TableRelation(
             $name,

src/TableQuery.php

Spacing +61 added lines, -61 removed lines

@@ -38,7 +38,7 @@ 
     /**
      * @var int[]
      */
-    protected $li_of = [0,0];
+    protected $li_of = [0, 0];
     protected $fields = [];
     /**
      * @var array
@@ -57,7 +57,7 @@ 
     public function __construct(DatabaseInterface $db, $table)
     {
         $this->db = $db;
-        $this->definition = $table instanceof Table ? $table : $this->db->definition((string)$table);
+        $this->definition = $table instanceof Table ? $table : $this->db->definition((string) $table);
         $this->columns($this->definition->getColumns());
     }
     public function __clone()
@@ -77,7 +77,7 @@ 
     {
         $column = explode('.', $column, 2);
         if (count($column) === 1) {
-            $column = [ $this->definition->getName(), $column[0] ];
+            $column = [$this->definition->getName(), $column[0]];
         }
         if ($column[0] === $this->definition->getName()) {
             $col = $this->definition->getColumn($column[1]);
@@ -96,10 +96,10 @@ 
                     throw new DatabaseException('Invalid column name in related table');
                 }
             } else {
-                throw new DatabaseException('Invalid foreign table name: ' . implode(',', $column));
+                throw new DatabaseException('Invalid foreign table name: '.implode(',', $column));
             }
         }
-        return [ 'name' => implode('.', $column), 'data' => $col ];
+        return ['name' => implode('.', $column), 'data' => $col];
     }
     protected function normalizeValue(TableColumn $col, $value)
     {
@@ -138,7 +138,7 @@ 
                 }
                 return $value;
             case 'int':
-                return (int)$value;
+                return (int) $value;
             default:
                 return $value;
         }
@@ -153,12 +153,12 @@ 
     {
         list($name, $column) = array_values($this->getColumn($column));
         if (is_null($value)) {
-            return $this->where($name . ' IS NULL');
+            return $this->where($name.' IS NULL');
         }
         if (!is_array($value)) {
             return $this->where(
-                $name . ' = ?',
-                [ $this->normalizeValue($column, $value) ]
+                $name.' = ?',
+                [$this->normalizeValue($column, $value)]
             );
         }
         if (isset($value['beg']) && isset($value['end'])) {
@@ -171,8 +171,8 @@ 
             );
         }
         return $this->where(
-            $name . ' IN (??)',
-            [ array_map(function ($v) use ($column) { return $this->normalizeValue($column, $v); }, $value) ]
+            $name.' IN (??)',
+            [array_map(function($v) use ($column) { return $this->normalizeValue($column, $v); }, $value)]
         );
     }
     /**
@@ -183,7 +183,7 @@ 
      */
     public function sort(string $column, bool $desc = false) : TableQuery
     {
-        return $this->order($this->getColumn($column)['name'] . ' ' . ($desc ? 'DESC' : 'ASC'));
+        return $this->order($this->getColumn($column)['name'].' '.($desc ? 'DESC' : 'ASC'));
     }
     /**
      * Group by a column (or columns)
@@ -193,7 +193,7 @@ 
     public function group($column) : TableQuery
     {
         if (!is_array($column)) {
-            $column = [ $column ];
+            $column = [$column];
         }
         foreach ($column as $k => $v) {
             $column[$k] = $this->getColumn($v)['name'];
@@ -234,7 +234,7 @@ 
         $this->withr = [];
         $this->order = [];
         $this->having = [];
-        $this->li_of = [0,0];
+        $this->li_of = [0, 0];
         $this->qiterator = null;
         return $this;
     }
@@ -247,7 +247,7 @@ 
     public function groupBy(string $sql, array $params = []) : TableQuery
     {
         $this->qiterator = null;
-        $this->group = [ $sql, $params ];
+        $this->group = [$sql, $params];
         return $this;
     }
     /**
@@ -260,7 +260,7 @@ 
      */
     public function join($table, array $fields, string $name = null, bool $multiple = true)
     {
-        $table = $table instanceof Table ? $table : $this->db->definition((string)$table);
+        $table = $table instanceof Table ? $table : $this->db->definition((string) $table);
         $name = $name ?? $table->getName();
         if (isset($this->joins[$name]) || $this->definition->hasRelation($name)) {
             throw new DatabaseException('Alias / table name already in use');
@@ -269,7 +269,7 @@ 
         foreach ($fields as $k => $v) {
             $k = explode('.', $k, 2);
             $k = count($k) == 2 ? $k[1] : $k[0];
-            $this->joins[$name]->keymap[$this->getColumn($name . '.' . $k)['name']] = $this->getColumn($v)['name'];
+            $this->joins[$name]->keymap[$this->getColumn($name.'.'.$k)['name']] = $this->getColumn($v)['name'];
         }
         return $this;
     }
@@ -282,7 +282,7 @@ 
     public function where(string $sql, array $params = []) : TableQuery
     {
         $this->qiterator = null;
-        $this->where[] = [ $sql, $params ];
+        $this->where[] = [$sql, $params];
         return $this;
     }
     /**
@@ -294,7 +294,7 @@ 
     public function having(string $sql, array $params = []) : TableQuery
     {
         $this->qiterator = null;
-        $this->having[] = [ $sql, $params ];
+        $this->having[] = [$sql, $params];
         return $this;
     }
     /**
@@ -306,7 +306,7 @@ 
     public function order(string $sql, array $params = []) : TableQuery
     {
         $this->qiterator = null;
-        $this->order = [ $sql, $params ];
+        $this->order = [$sql, $params];
         return $this;
     }
     /**
@@ -318,7 +318,7 @@ 
     public function limit(int $limit, int $offset = 0) : TableQuery
     {
         $this->qiterator = null;
-        $this->li_of = [ $limit, $offset ];
+        $this->li_of = [$limit, $offset];
         return $this;
     }
     /**
@@ -335,22 +335,22 @@ 
         $relations = $this->withr;
         foreach ($this->definition->getRelations() as $k => $v) {
             foreach ($this->where as $vv) {
-                if (strpos($vv[0], $k . '.') !== false) {
+                if (strpos($vv[0], $k.'.') !== false) {
                     $relations[] = $k;
                 }
             }
-            if (isset($this->order[0]) && strpos($this->order[0], $k . '.') !== false) {
+            if (isset($this->order[0]) && strpos($this->order[0], $k.'.') !== false) {
                 $relations[] = $k;
             }
         }
 
         foreach ($this->joins as $k => $v) {
-            $sql .= ($v->many ? 'LEFT ' : '' ) . 'JOIN '.$v->table->getName().' '.$k.' ON ';
+            $sql .= ($v->many ? 'LEFT ' : '').'JOIN '.$v->table->getName().' '.$k.' ON ';
             $tmp = [];
             foreach ($v->keymap as $kk => $vv) {
                 $tmp[] = $kk.' = '.$vv;
             }
-            $sql .= implode(' AND ', $tmp) . ' ';
+            $sql .= implode(' AND ', $tmp).' ';
         }
         foreach (array_unique($relations) as $k) {
             $v = $this->definition->getRelation($k);
@@ -360,13 +360,13 @@ 
                 foreach ($v->keymap as $kk => $vv) {
                     $tmp[] = $table.'.'.$kk.' = '.$k.'_pivot.'.$vv.' ';
                 }
-                $sql .= implode(' AND ', $tmp) . ' ';
+                $sql .= implode(' AND ', $tmp).' ';
                 $sql .= 'LEFT JOIN '.$v->table->getName().' '.$k.' ON ';
                 $tmp = [];
                 foreach ($v->pivot_keymap as $kk => $vv) {
                     $tmp[] = $k.'.'.$vv.' = '.$k.'_pivot.'.$kk.' ';
                 }
-                $sql .= implode(' AND ', $tmp) . ' ';
+                $sql .= implode(' AND ', $tmp).' ';
             } else {
                 $sql .= 'LEFT JOIN '.$v->table->getName().' '.$k.' ON ';
                 $tmp = [];
@@ -374,30 +374,30 @@ 
                     $tmp[] = $table.'.'.$kk.' = '.$k.'.'.$vv.' ';
                 }
                 if ($v->sql) {
-                    $tmp[] = $v->sql . ' ';
+                    $tmp[] = $v->sql.' ';
                     $par = array_merge($par, $v->par ?? []);
                 }
-                $sql .= implode(' AND ', $tmp) . ' ';
+                $sql .= implode(' AND ', $tmp).' ';
             }
         }
         if (count($this->where)) {
             $sql .= 'WHERE ';
             $tmp = [];
             foreach ($this->where as $v) {
-                $tmp[] = '(' . $v[0] . ')';
+                $tmp[] = '('.$v[0].')';
                 $par = array_merge($par, $v[1]);
             }
             $sql .= implode(' AND ', $tmp).' ';
         }
         if (count($this->group)) {
-            $sql .= 'GROUP BY ' . $this->group[0] . ' ';
+            $sql .= 'GROUP BY '.$this->group[0].' ';
             $par = array_merge($par, $this->group[1]);
         }
         if (count($this->having)) {
             $sql .= 'HAVING ';
             $tmp = [];
             foreach ($this->having as $v) {
-                $tmp[] = '(' . $v[0] . ')';
+                $tmp[] = '('.$v[0].')';
                 $par = array_merge($par, $v[1]);
             }
             $sql .= implode(' AND ', $tmp).' ';
@@ -428,7 +428,7 @@ 
                     throw new DatabaseException('Invalid foreign table name');
                 }
                 foreach ($cols as $col) {
-                    $fields[] = $table . '.' . $col;
+                    $fields[] = $table.'.'.$col;
                 }
                 unset($fields[$k]);
             }
@@ -468,37 +468,37 @@ 
         $relations = $this->withr;
         foreach ($this->definition->getRelations() as $k => $v) {
             foreach ($this->fields as $field) {
-                if (strpos($field, $k . '.') === 0) {
+                if (strpos($field, $k.'.') === 0) {
                     $relations[] = $k;
                 }
             }
             foreach ($this->where as $v) {
-                if (strpos($v[0], $k . '.') !== false) {
+                if (strpos($v[0], $k.'.') !== false) {
                     $relations[] = $k;
                 }
             }
-            if (isset($this->order[0]) && strpos($this->order[0], $k . '.') !== false) {
+            if (isset($this->order[0]) && strpos($this->order[0], $k.'.') !== false) {
                 $relations[] = $k;
             }
         }
         $select = [];
         foreach ($this->fields as $k => $field) {
-            $select[] = $field . (!is_numeric($k) ? ' ' . $k : '');
+            $select[] = $field.(!is_numeric($k) ? ' '.$k : '');
         }
         foreach ($this->withr as $relation) {
             foreach ($this->definition->getRelation($relation)->table->getColumns() as $column) {
-                $select[] = $relation . '.' . $column . ' ' . $relation . '___' . $column;
+                $select[] = $relation.'.'.$column.' '.$relation.'___'.$column;
             }
         }
         $sql = 'SELECT '.implode(', ', $select).' FROM '.$table.' ';
         $par = [];
         foreach ($this->joins as $k => $v) {
-            $sql .= ($v->many ? 'LEFT ' : '' ) . 'JOIN '.$v->table->getName().' '.$k.' ON ';
+            $sql .= ($v->many ? 'LEFT ' : '').'JOIN '.$v->table->getName().' '.$k.' ON ';
             $tmp = [];
             foreach ($v->keymap as $kk => $vv) {
                 $tmp[] = $kk.' = '.$vv;
             }
-            $sql .= implode(' AND ', $tmp) . ' ';
+            $sql .= implode(' AND ', $tmp).' ';
         }
         foreach (array_unique($relations) as $relation) {
             $v = $this->definition->getRelation($relation);
@@ -508,13 +508,13 @@ 
                 foreach ($v->keymap as $kk => $vv) {
                     $tmp[] = $table.'.'.$kk.' = '.$relation.'_pivot.'.$vv.' ';
                 }
-                $sql .= implode(' AND ', $tmp) . ' ';
+                $sql .= implode(' AND ', $tmp).' ';
                 $sql .= 'LEFT JOIN '.$v->table->getName().' '.$relation.' ON ';
                 $tmp = [];
                 foreach ($v->pivot_keymap as $kk => $vv) {
                     $tmp[] = $relation.'.'.$vv.' = '.$relation.'_pivot.'.$kk.' ';
                 }
-                $sql .= implode(' AND ', $tmp) . ' ';
+                $sql .= implode(' AND ', $tmp).' ';
             } else {
                 $sql .= 'LEFT JOIN '.$v->table->getName().' '.$relation.' ON ';
                 $tmp = [];
@@ -522,30 +522,30 @@ 
                     $tmp[] = $table.'.'.$kk.' = '.$relation.'.'.$vv.' ';
                 }
                 if ($v->sql) {
-                    $tmp[] = $v->sql . ' ';
+                    $tmp[] = $v->sql.' ';
                     $par = array_merge($par, $v->par ?? []);
                 }
-                $sql .= implode(' AND ', $tmp) . ' ';
+                $sql .= implode(' AND ', $tmp).' ';
             }
         }
         if (count($this->where)) {
             $sql .= 'WHERE ';
             $tmp = [];
             foreach ($this->where as $v) {
-                $tmp[] = '(' . $v[0] . ')';
+                $tmp[] = '('.$v[0].')';
                 $par = array_merge($par, $v[1]);
             }
             $sql .= implode(' AND ', $tmp).' ';
         }
         if (count($this->group)) {
-            $sql .= 'GROUP BY ' . $this->group[0] . ' ';
+            $sql .= 'GROUP BY '.$this->group[0].' ';
             $par = array_merge($par, $this->group[1]);
         }
         if (count($this->having)) {
             $sql .= 'HAVING ';
             $tmp = [];
             foreach ($this->having as $v) {
-                $tmp[] = '(' . $v[0] . ')';
+                $tmp[] = '('.$v[0].')';
                 $par = array_merge($par, $v[1]);
             }
             $sql .= implode(' AND ', $tmp).' ';
@@ -554,36 +554,36 @@ 
         //    $sql .= 'GROUP BY '.$table.'.'.implode(', '.$table.'.', $primary).' ';
         //}
         if (count($this->order)) {
-            $sql .= 'ORDER BY ' . $this->order[0] . ' ';
+            $sql .= 'ORDER BY '.$this->order[0].' ';
             $par = array_merge($par, $this->order[1]);
         }
         $porder = [];
         foreach ($primary as $field) {
             $porder[] = $this->getColumn($field)['name'];
         }
-        $sql .= (count($this->order) ? ', ' : 'ORDER BY ') . implode(', ', $porder) . ' ';
+        $sql .= (count($this->order) ? ', ' : 'ORDER BY ').implode(', ', $porder).' ';
 
         if ($this->li_of[0]) {
             if ($this->db->driver() === 'oracle') {
-                if ((int)($this->db->settings()->options['version'] ?? 0) >= 12) {
-                    $sql .= 'OFFSET ' . $this->li_of[1] . ' ROWS FETCH NEXT ' . $this->li_of[0] . ' ROWS ONLY';
+                if ((int) ($this->db->settings()->options['version'] ?? 0) >= 12) {
+                    $sql .= 'OFFSET '.$this->li_of[1].' ROWS FETCH NEXT '.$this->li_of[0].' ROWS ONLY';
                 } else {
-                    $f = array_map(function ($v) {
+                    $f = array_map(function($v) {
                         $v = explode(' ', trim($v), 2);
                         if (count($v) === 2) { return $v[1]; }
                         $v = explode('.', $v[0], 2);
                         return count($v) === 2 ? $v[1] : $v[0];
                     }, $select);
-                    $sql = "SELECT " . implode(', ', $f) . " 
+                    $sql = "SELECT ".implode(', ', $f)." 
                             FROM (
                                 SELECT tbl__.*, rownum rnum__ FROM (
-                                    " . $sql . "
+                                    " . $sql."
                                 ) tbl__ 
-                                WHERE rownum <= " . ($this->li_of[0] + $this->li_of[1]) . "
+                                WHERE rownum <= " . ($this->li_of[0] + $this->li_of[1])."
                             ) WHERE rnum__ > " . $this->li_of[1];
                 }
             } else {
-                $sql .= 'LIMIT ' . $this->li_of[0] . ' OFFSET ' . $this->li_of[1];
+                $sql .= 'LIMIT '.$this->li_of[0].' OFFSET '.$this->li_of[1];
             }
         }
         // echo $sql; die();
@@ -592,7 +592,7 @@ 
             $this->definition->getPrimaryKey(),
             array_combine(
                 $this->withr,
-                array_map(function ($relation) {
+                array_map(function($relation) {
                     return $this->definition->getRelation($relation);
                 }, $this->withr)
             )
@@ -639,7 +639,7 @@ 
                 $ret[$k] = str_repeat(' ', 255);
                 $par[] = &$ret[$k];
             }
-            $sql .= ' RETURNING ' . implode(',', $primary) . ' INTO ' . implode(',', array_fill(0, count($primary), '?'));
+            $sql .= ' RETURNING '.implode(',', $primary).' INTO '.implode(',', array_fill(0, count($primary), '?'));
             $this->db->query($sql, $par);
             return $ret;
         } else {
@@ -671,7 +671,7 @@ 
         }
         $sql = 'UPDATE '.$table.' SET ';
         $par = [];
-        $sql .= implode(', ', array_map(function ($v) { return $v . ' = ?'; }, array_keys($update))) . ' ';
+        $sql .= implode(', ', array_map(function($v) { return $v.' = ?'; }, array_keys($update))).' ';
         $par = array_merge($par, array_values($update));
         if (count($this->where)) {
             $sql .= 'WHERE ';
@@ -680,7 +680,7 @@ 
                 $tmp[] = $v[0];
                 $par = array_merge($par, $v[1]);
             }
-            $sql .= implode(' AND ', $tmp) . ' ';
+            $sql .= implode(' AND ', $tmp).' ';
         }
         if (count($this->order)) {
             $sql .= $this->order[0];
@@ -704,7 +704,7 @@ 
                 $tmp[] = $v[0];
                 $par = array_merge($par, $v[1]);
             }
-            $sql .= implode(' AND ', $tmp) . ' ';
+            $sql .= implode(' AND ', $tmp).' ';
         }
         if (count($this->order)) {
             $sql .= $this->order[0];