vakata / database

src/driver/pdo/Driver.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
                     isset($this->connection['opts']) ? $this->connection['opts'] : []
                 );
             } catch (\PDOException $e) {
-                throw new DBException('Connect error: ' . $e->getMessage());
+                throw new DBException('Connect error: '.$e->getMessage());
             }
         }
     }

src/schema/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/driver/mysql/Statement.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
             }
         }
         if (!$this->statement->execute()) {
-            throw new DBException('Prepared execute error: ' . $this->statement->error);
+            throw new DBException('Prepared execute error: '.$this->statement->error);
         }
         return new Result($this->statement);
     }

src/driver/odbc/Result.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
     }
     public function next()
     {
-        $this->fetched ++;
+        $this->fetched++;
         $temp = \odbc_fetch_row($this->statement);
         if (!$temp) {
             $this->last = false;

Doc Comments +3 added lines

@@ -18,6 +18,9 @@
     protected $fetched = -1;
     protected $iid = null;
 
+    /**
+     * @param resource $statement
+     */
     public function __construct($statement, $data, $iid, $charIn = null, $charOut = null)
     {
         $this->statement = $statement;

src/schema/TableQueryIterator.php

Spacing +7 added lines, -7 removed lines

@@ -70,7 +70,7 @@ 
                 $fields = [];
                 $exists = false;
                 foreach ($relation->table->getColumns() as $column) {
-                    $nm = $name . static::SEP . $column;
+                    $nm = $name.static::SEP.$column;
                     if (isset($this->aliases[$nm])) {
                         $nm = $this->aliases[$nm];
                     }
@@ -84,16 +84,16 @@ 
                 $parts = explode(static::SEP, $name);
                 $name  = array_pop($parts);
                 if (!$exists && !count($parts) && !isset($temp[$name])) {
-                    $temp[$name] = $relation->many ? [ '___clean' => true ] : null;
+                    $temp[$name] = $relation->many ? ['___clean' => true] : null;
                 }
                 if ($exists) {
-                    $full  = '';
+                    $full = '';
                     foreach ($parts as $item) {
-                        $full = $full ? $full . static::SEP . $item : $item;
+                        $full = $full ? $full.static::SEP.$item : $item;
                         $temp = &$temp[$item];
                         $rpk = [];
                         foreach ($this->relations[$full][0]->table->getPrimaryKey() as $pkey) {
-                            $nm = $full . static::SEP . $pkey;
+                            $nm = $full.static::SEP.$pkey;
                             if (isset($this->aliases[$nm])) {
                                 $nm = $this->aliases[$nm];
                             }
@@ -102,7 +102,7 @@ 
                         $temp = &$temp[json_encode($rpk)];
                     }
                     if (!isset($temp[$name])) {
-                        $temp[$name] = $relation->many ? [ '___clean' => true ] : null;
+                        $temp[$name] = $relation->many ? ['___clean' => true] : null;
                     }
                     $temp = &$temp[$name];
                     if ($relation->many) {
@@ -160,7 +160,7 @@ 
                 return;
             }
         }
-        $this->fetched ++;
+        $this->fetched++;
         while ($this->result->valid()) {
             $row = $this->result->current();
             $pk = [];

src/schema/TableColumn.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
             $instance->setLength($data['length']);
         }
         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/pdo/Statement.php

Spacing +6 added lines, -6 removed lines

@@ -24,28 +24,28 @@
         foreach ($data as $i => $v) {
             switch (gettype($v)) {
                 case 'boolean':
-                    $this->statement->bindValue($i+1, $v, \PDO::PARAM_BOOL);
+                    $this->statement->bindValue($i + 1, $v, \PDO::PARAM_BOOL);
                     break;
                 case 'integer':
-                    $this->statement->bindValue($i+1, $v, \PDO::PARAM_INT);
+                    $this->statement->bindValue($i + 1, $v, \PDO::PARAM_INT);
                     break;
                 case 'NULL':
-                    $this->statement->bindValue($i+1, $v, \PDO::PARAM_NULL);
+                    $this->statement->bindValue($i + 1, $v, \PDO::PARAM_NULL);
                     break;
                 case 'double':
-                    $this->statement->bindValue($i+1, $v);
+                    $this->statement->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') {
-                        $this->statement->bindParam($i+1, $v, \PDO::PARAM_LOB);
+                        $this->statement->bindParam($i + 1, $v, \PDO::PARAM_LOB);
                         break;
                     }
                     if (!is_string($data[$i])) {
                         $data[$i] = serialize($data[$i]);
                     }
-                    $this->statement->bindValue($i+1, $v);
+                    $this->statement->bindValue($i + 1, $v);
                     break;
             }
         }

src/DB.php

Spacing +14 added lines, -17 removed lines

@@ -75,8 +75,7 @@ 
         }
         $connection['name'] = $connectionString;
         $connection['type'] = isset($aliases[$connection['type']]) ?
-            $aliases[$connection['type']] :
-            $connection['type'];
+            $aliases[$connection['type']] : $connection['type'];
         $tmp = '\\vakata\\database\\driver\\'.strtolower($connection['type']).'\\Driver';
         return new $tmp($connection);
     }
@@ -105,7 +104,7 @@ 
         $new = '';
         $par = array_values($par);
         if (substr_count($sql, '?') === 2 && !is_array($par[0])) {
-            $par = [ $par ];
+            $par = [$par];
         }
         $parts = explode('??', $sql);
         $index = 0;
@@ -115,7 +114,7 @@ 
             $index += count($tmp) - 1;
             if (isset($par[$index])) {
                 if (!is_array($par[$index])) {
-                    $par[$index] = [ $par[$index] ];
+                    $par[$index] = [$par[$index]];
                 }
                 $params = $par[$index];
                 array_splice($par, $index, 1, $params);
@@ -123,7 +122,7 @@ 
                 $new .= implode(',', array_fill(0, count($params), '?'));
             }
         }
-        return [ $new, $par ];
+        return [$new, $par];
     }
     /**
      * Run a query (prepare & execute).
@@ -155,7 +154,7 @@ 
     {
         $coll = Collection::from($this->query($sql, $par));
         if (($keys = $this->driver->option('mode')) && in_array($keys, ['strtoupper', 'strtolower'])) {
-            $coll->map(function ($v) use ($keys) {
+            $coll->map(function($v) use ($keys) {
                 $new = [];
                 foreach ($v as $k => $vv) {
                     $new[call_user_func($keys, $k)] = $vv;
@@ -164,13 +163,13 @@ 
             });
         }
         if ($key !== null) {
-            $coll->mapKey(function ($v) use ($key) { return $v[$key]; });
+            $coll->mapKey(function($v) use ($key) { return $v[$key]; });
         }
         if ($skip) {
-            $coll->map(function ($v) use ($key) { unset($v[$key]); return $v; });
+            $coll->map(function($v) use ($key) { unset($v[$key]); return $v; });
         }
         if ($opti) {
-            $coll->map(function ($v) { return count($v) === 1 ? current($v) : $v; });
+            $coll->map(function($v) { return count($v) === 1 ? current($v) : $v; });
         }
         return $coll;
     }
@@ -254,8 +253,7 @@ 
     public function definition(string $table, bool $detectRelations = true) : Table
     {
         return isset($this->tables[$table]) ?
-            $this->tables[$table] :
-            $this->driver->table($table, $detectRelations);
+            $this->tables[$table] : $this->driver->table($table, $detectRelations);
     }
     /**
      * Parse all tables from the database.
@@ -272,12 +270,12 @@ 
      */
     public function getSchema($asPlainArray = true)
     {
-        return !$asPlainArray ? $this->tables : array_map(function ($table) {
+        return !$asPlainArray ? $this->tables : array_map(function($table) {
             return [
                 'name' => $table->getName(),
                 'pkey' => $table->getPrimaryKey(),
                 'comment' => $table->getComment(),
-                'columns' => array_map(function ($column) {
+                'columns' => array_map(function($column) {
                     return [
                         'name' => $column->getName(),
                         'type' => $column->getType(),
@@ -288,13 +286,13 @@ 
                         'nullable' => $column->isNullable()
                     ];
                 }, $table->getFullColumns()),
-                'relations' => array_map(function ($rel) {
+                'relations' => array_map(function($rel) {
                     $relation = clone $rel;
                     $relation->table = $relation->table->getName();
                     if ($relation->pivot) {
                         $relation->pivot = $relation->pivot->getName();
                     }
-                    return (array)$relation;
+                    return (array) $relation;
                 }, $table->getRelations())
             ];
         }, $this->tables);
@@ -342,8 +340,7 @@ 
     public function table($table, bool $mapped = false)
     {
         return $mapped ?
-            new TableQueryMapped($this, $this->definition($table)) :
-            new TableQuery($this, $this->definition($table));
+            new TableQueryMapped($this, $this->definition($table)) : new TableQuery($this, $this->definition($table));
     }
     public function __call($method, $args)
     {

src/schema/Mapper.php

Spacing +7 added lines, -9 removed lines

@@ -79,8 +79,7 @@ 
                 if (isset($this->definition->getRelations()[$method])) {
                     if (isset($this->fetched[$method])) {
                         return is_callable($this->fetched[$method]) ?
-                            $this->fetched[$method] = call_user_func($this->fetched[$method], $args[0] ?? null) :
-                            $this->fetched[$method];
+                            $this->fetched[$method] = call_user_func($this->fetched[$method], $args[0] ?? null) : $this->fetched[$method];
                     }
                 }
                 return null;
@@ -164,7 +163,7 @@ 
     public function collection(TableQueryIterator $iterator, Table $definition) : Collection
     {
         return Collection::from($iterator)
-            ->map(function ($v) use ($definition) {
+            ->map(function($v) use ($definition) {
                 return $this->entity($definition, $v);
             });
     }
@@ -239,7 +238,7 @@ 
         $definition = $entity->definition();
         foreach ($definition->getColumns() as $column) {
             if (!isset($data[$column])) {
-                $entity->__lazyProperty($column, function () use ($entity, $definition, $primary, $column) {
+                $entity->__lazyProperty($column, function() use ($entity, $definition, $primary, $column) {
                     $query = $this->db->table($definition->getName());
                     foreach ($primary as $k => $v) {
                         $query->filter($k, $v);
@@ -253,12 +252,12 @@ 
                 $name,
                 isset($data[$name]) ?
                     ($relation->many ? 
-                        array_map(function ($v) use ($relation) {
+                        array_map(function($v) use ($relation) {
                             return $this->entity($relation->table, $v);
                         }, $data[$name]) :
                         $this->entity($relation->table, $data[$name])
                     ) :
-                    function (array $columns = null) use ($entity, $definition, $primary, $relation, $data) {
+                    function(array $columns = null) use ($entity, $definition, $primary, $relation, $data) {
                         $query = $this->db->table($relation->table->getName(), true);
                         if ($columns !== null) {
                             $query->columns($columns);
@@ -284,7 +283,7 @@ 
                                 );
                             }
                             foreach ($definition->getPrimaryKey() as $v) {
-                                $query->filter($nm . '.' . $v, $data[$v] ?? null);
+                                $query->filter($nm.'.'.$v, $data[$v] ?? null);
                             }
                         } else {
                             foreach ($relation->keymap as $k => $v) {
@@ -292,8 +291,7 @@ 
                             }
                         }
                         return $relation->many ?
-                            $query->iterator() :
-                            $query[0];
+                            $query->iterator() : $query[0];
                     }
             );
         }