vakata / database

src/driver/postgre/Driver.php

Spacing +13 added lines, -13 removed lines

@@ -147,7 +147,7 @@ 
                      JOIN information_schema.constraint_table_usage ct ON kc.constraint_name = ct.constraint_name AND ct.table_schema = kc.table_schema
                      WHERE
                         kc.table_schema = ? AND kc.table_name IS NOT NULL AND kc.position_in_unique_constraint IS NOT NULL",
-                    [ $this->connection['opts']['schema'] ?? $this->connection['name'] ]
+                    [$this->connection['opts']['schema'] ?? $this->connection['name']]
                 )
             )->toArray();
             foreach ($col as $row) {
@@ -159,10 +159,10 @@ 
         $columns = Collection::from($this
             ->query(
                 "SELECT * FROM information_schema.columns WHERE table_name = ? AND table_schema = ?",
-                [ $table, $this->connection['opts']['schema'] ?? $this->connection['name'] ]
+                [$table, $this->connection['opts']['schema'] ?? $this->connection['name']]
             ))
-            ->mapKey(function ($v) { return $v['column_name']; })
-            ->map(function ($v) {
+            ->mapKey(function($v) { return $v['column_name']; })
+            ->map(function($v) {
                 $v['length'] = null;
                 if (!isset($v['data_type'])) {
                     return $v;
@@ -170,7 +170,7 @@ 
                 switch ($v['data_type']) {
                     case 'character':
                     case 'character varying':
-                        $v['length'] = (int)$v['character_maximum_length'];
+                        $v['length'] = (int) $v['character_maximum_length'];
                         break;
                 }
                 return $v;
@@ -183,7 +183,7 @@ 
             ->query(
                 "SELECT constraint_name FROM information_schema.table_constraints
                 WHERE table_name = ? AND constraint_type = ? AND table_schema = ?",
-                [ $table, 'PRIMARY KEY', $this->connection['opts']['schema'] ?? $this->connection['name'] ]
+                [$table, 'PRIMARY KEY', $this->connection['opts']['schema'] ?? $this->connection['name']]
             ))
             ->pluck('constraint_name')
             ->value();
@@ -193,7 +193,7 @@ 
                 ->query(
                     "SELECT column_name FROM information_schema.constraint_column_usage
                      WHERE table_name = ? AND constraint_name = ? AND table_schema = ?",
-                    [ $table, $pkname, $this->connection['opts']['schema'] ?? $this->connection['name'] ]
+                    [$table, $pkname, $this->connection['opts']['schema'] ?? $this->connection['name']]
                 ))
                 ->pluck('column_name')
                 ->toArray();
@@ -224,7 +224,7 @@ 
                 $usedcol = [];
                 if (count($columns)) {
                     foreach (Collection::from($relationsT[$data['table']] ?? [])
-                        ->filter(function ($v) use ($columns) {
+                        ->filter(function($v) use ($columns) {
                             return in_array($v['column_name'], $columns);
                         }) as $relation
                     ) {
@@ -238,7 +238,7 @@ 
                     $relname = $foreign['table'];
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $foreign['table'] . '_' . (++ $cntr);
+                        $relname = $foreign['table'].'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -254,7 +254,7 @@ 
                     $relname = $data['table'];
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $data['table'] . '_' . (++ $cntr);
+                        $relname = $data['table'].'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -278,7 +278,7 @@ 
                 $relname = $data['table'];
                 $cntr = 1;
                 while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                    $relname = $data['table'] . '_' . (++ $cntr);
+                    $relname = $data['table'].'_'.(++$cntr);
                 }
                 $definition->addRelation(
                     new TableRelation(
@@ -297,10 +297,10 @@ 
         return Collection::from($this
             ->query(
                 "SELECT table_name FROM information_schema.tables where table_schema = ?",
-                [ $this->connection['opts']['schema'] ?? $this->connection['name'] ]
+                [$this->connection['opts']['schema'] ?? $this->connection['name']]
             ))
             ->pluck('table_name')
-            ->map(function ($v) {
+            ->map(function($v) {
                 return $this->table($v);
             })
             ->toArray();

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

Doc Comments +5 added lines, -1 removed lines

@@ -43,6 +43,10 @@ 
             protected $changed = [];
             protected $fetched = [];
 
+            /**
+             * @param Mapper $mapper
+             * @param Table $definition
+             */
             public function __construct($mapper, $definition, array $data = [])
             {
                 $this->mapper = $mapper;
@@ -156,7 +160,7 @@ 
     /**
      * Get a collection of entities
      *
-     * @param TableQuery $iterator
+     * @param TableQueryIterator $iterator
      * @param Table $definition
      * @return Collection
      */

Spacing +8 added lines, -11 removed lines

@@ -58,8 +58,7 @@ 
             {
                 if (isset($this->fetched[$property])) {
                     return is_callable($this->fetched[$property]) ?
-                        $this->fetched[$property] = call_user_func($this->fetched[$property]) :
-                        $this->fetched[$property];
+                        $this->fetched[$property] = call_user_func($this->fetched[$property]) : $this->fetched[$property];
                 }
                 if (isset($this->changed[$property])) {
                     return $this->changed[$property];
@@ -78,8 +77,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;
@@ -163,7 +161,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);
             });
     }
@@ -238,7 +236,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);
@@ -252,12 +250,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);
@@ -283,7 +281,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) {
@@ -291,8 +289,7 @@ 
                             }
                         }
                         return $relation->many ?
-                            $query->iterator() :
-                            $query[0];
+                            $query->iterator() : $query[0];
                     }
             );
         }