hfw / db

src/DB/EntityInterface.php

Spacing +1 added lines, -1 removed lines

@@ -10,5 +10,5 @@
     /**
      * @return int
      */
-    public function getId ();
+    public function getId();
 }
\ No newline at end of file

src/DB/Statement.php

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
      *
      * @param DB $db
      */
-    protected function __construct (DB $db) {
+    protected function __construct(DB $db) {
         $this->db = $db;
     }
 
@@ -31,7 +31,7 @@ 
      * @param array $args
      * @return $this
      */
-    public function __invoke (array $args = null) {
+    public function __invoke(array $args = null) {
         $this->execute($args);
         return $this;
     }
@@ -41,7 +41,7 @@ 
      *
      * @return string
      */
-    public function __toString () {
+    public function __toString() {
         return $this->queryString;
     }
 
@@ -54,7 +54,7 @@ 
      * @return bool
      * @throws ArgumentCountError
      */
-    public function execute ($args = null) {
+    public function execute($args = null) {
         $this->db->getLogger()->__invoke($this->queryString);
         if ($result = !parent::execute($args)) {
             $info = $this->errorInfo();
@@ -71,7 +71,7 @@ 
      *
      * @return int
      */
-    public function getId (): int {
+    public function getId(): int {
         return (int)$this->db->lastInsertId();
     }
 }

src/DB/FactoryTrait.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
      * @param array $args The first argument must be a {@link DB} instance.
      * @return static
      */
-    public static function __callStatic (string $ignored, array $args) {
+    public static function __callStatic(string $ignored, array $args) {
         /** @var DB $db */
         $db = $args[0];
         unset($args[0]);

src/DB/Transaction.php

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
      *
      * @param DB $db
      */
-    public function __construct (DB $db) {
+    public function __construct(DB $db) {
         $this->db = $db;
         $db->beginTransaction();
     }
@@ -41,7 +41,7 @@ 
     /**
      * Rolls back if the instance wasn't committed.
      */
-    public function __destruct () {
+    public function __destruct() {
         if (!$this->committed) {
             $this->db->rollBack();
         }
@@ -54,14 +54,14 @@ 
      *
      * @return true
      */
-    public function commit (): bool {
+    public function commit(): bool {
         return $this->committed or $this->committed = $this->db->commit();
     }
 
     /**
      * @return bool
      */
-    final public function wasCommitted (): bool {
+    final public function wasCommitted(): bool {
         return $this->committed;
     }
 }
\ No newline at end of file

src/DB/Table.php

Spacing +13 added lines, -13 removed lines

@@ -42,7 +42,7 @@ 
      * @param string $name
      * @param string[] $columns
      */
-    public function __construct (DB $db, string $name, array $columns) {
+    public function __construct(DB $db, string $name, array $columns) {
         parent::__construct($db);
         $this->name = $name;
         foreach ($columns as $column) {
@@ -55,7 +55,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->name;
     }
 
@@ -65,7 +65,7 @@ 
      * @param array $values
      * @return int Rows affected.
      */
-    public function apply (array $values): int {
+    public function apply(array $values): int {
         $columns = implode(',', array_keys($values));
         $values = $this->db->quoteList($values);
         if ($this->db->isSQLite()) {
@@ -85,7 +85,7 @@ 
      * @param Closure $prepare `():Statement`
      * @return Statement
      */
-    protected function cache (string $key, Closure $prepare) {
+    protected function cache(string $key, Closure $prepare) {
         return $this->_cache[$key] ??= $prepare->__invoke();
     }
 
@@ -93,7 +93,7 @@ 
      * @param array $match `[a => b]`
      * @return int
      */
-    public function count (array $match = []) {
+    public function count(array $match = []) {
         $select = $this->select(['COUNT(*)']);
         foreach ($match as $a => $b) {
             $select->where($this->db->match($this[$a] ?? $a, $b));
@@ -109,7 +109,7 @@ 
      * @param array $match
      * @return int Rows affected.
      */
-    public function delete (array $match): int {
+    public function delete(array $match): int {
         foreach ($match as $a => $b) {
             $match[$a] = $this->db->match($this[$a] ?? $a, $b);
         }
@@ -120,14 +120,14 @@ 
     /**
      * @return Column[]
      */
-    public function getColumns () {
+    public function getColumns() {
         return $this->columns;
     }
 
     /**
      * @return string
      */
-    final public function getName (): string {
+    final public function getName(): string {
         return $this->name;
     }
 
@@ -137,7 +137,7 @@ 
      * @param array $values
      * @return Statement
      */
-    public function insert (array $values) {
+    public function insert(array $values) {
         $columns = implode(',', array_keys($values));
         $values = $this->db->quoteList($values);
         return $this->db->query("INSERT INTO {$this} ($columns) VALUES ($values)");
@@ -147,7 +147,7 @@ 
      * @param int|string $column
      * @return Column
      */
-    public function offsetGet ($column) {
+    public function offsetGet($column) {
         if (is_int($column)) {
             return current(array_slice($this->columns, $column, 1)) ?: null;
         }
@@ -160,7 +160,7 @@ 
      * @param string[] $columns
      * @return Select|array[]
      */
-    public function select (array $columns = ['*']) {
+    public function select(array $columns = ['*']) {
         return Select::factory($this->db, $this, $columns);
     }
 
@@ -170,7 +170,7 @@ 
      * @param string $name
      * @return Table
      */
-    public function setName (string $name) {
+    public function setName(string $name) {
         $clone = clone $this;
         $clone->name = $name;
         foreach ($this->columns as $name => $column) {
@@ -188,7 +188,7 @@ 
      * @param array $match
      * @return int Rows affected.
      */
-    public function update (array $values, array $match): int {
+    public function update(array $values, array $match): int {
         foreach ($this->db->quoteArray($values) as $key => $value) {
             $values[$key] = "{$key} = {$value}";
         }

src/DB/AbstractTable.php

Spacing +7 added lines, -7 removed lines

@@ -16,20 +16,20 @@ 
      *
      * @return string
      */
-    abstract public function __toString ();
+    abstract public function __toString();
 
     /**
      * Columns keyed by name/alias.
      *
      * @return Column[]
      */
-    abstract public function getColumns ();
+    abstract public function getColumns();
 
     /**
      * @param int|string $column
      * @return null|Column
      */
-    abstract public function offsetGet ($column);
+    abstract public function offsetGet($column);
 
     /**
      * @var DB
@@ -39,7 +39,7 @@ 
     /**
      * @param DB $db
      */
-    public function __construct (DB $db) {
+    public function __construct(DB $db) {
         $this->db = $db;
     }
 
@@ -47,7 +47,7 @@ 
      * @param int|string $column
      * @return bool
      */
-    public function offsetExists ($column): bool {
+    public function offsetExists($column): bool {
         return $this->offsetGet($column) !== null;
     }
 
@@ -58,7 +58,7 @@ 
      * @param void $value
      * @throws Exception
      */
-    final public function offsetSet ($offset, $value): void {
+    final public function offsetSet($offset, $value): void {
         throw new Exception('Tables are immutable.');
     }
 
@@ -68,7 +68,7 @@ 
      * @param void $name
      * @throws Exception
      */
-    final public function offsetUnset ($name): void {
+    final public function offsetUnset($name): void {
         $this->offsetSet($name, null);
     }
 }
\ No newline at end of file

src/DB/Select.php

Spacing +30 added lines, -30 removed lines

@@ -125,7 +125,7 @@ 
      * @param string|AbstractTable $table
      * @param string[] $columns
      */
-    public function __construct (DB $db, $table, array $columns = ['*']) {
+    public function __construct(DB $db, $table, array $columns = ['*']) {
         static $autoAlias = 0;
         $autoAlias++;
         parent::__construct($db);
@@ -152,7 +152,7 @@ 
      * @param array $args
      * @return Statement
      */
-    public function __invoke (array $args = []) {
+    public function __invoke(array $args = []) {
         return $this->execute($args);
     }
 
@@ -161,7 +161,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->alias;
     }
 
@@ -171,7 +171,7 @@ 
      * @param array $args Execution arguments.
      * @return int
      */
-    public function count (array $args = []): int {
+    public function count(array $args = []): int {
         $clone = clone $this;
         $clone->_columns = 'COUNT(*)';
         $clone->_order = '';
@@ -184,7 +184,7 @@ 
      * @param array $args
      * @return Statement
      */
-    public function execute (array $args = []) {
+    public function execute(array $args = []) {
         if (empty($args)) {
             return $this->db->query($this->toSql());
         }
@@ -199,14 +199,14 @@ 
      * @param array $args Execution arguments.
      * @return array
      */
-    public function getAll (array $args = []): array {
+    public function getAll(array $args = []): array {
         return iterator_to_array($this->fetcher->__invoke($this->execute($args)));
     }
 
     /**
      * @return Column[]
      */
-    public function getColumns () {
+    public function getColumns() {
         return $this->refs;
     }
 
@@ -219,7 +219,7 @@ 
      * @param array $args Execution arguments.
      * @return Generator
      */
-    public function getEach (array $args = []) {
+    public function getEach(array $args = []) {
         yield from $this->fetcher->__invoke($this->execute($args));
     }
 
@@ -231,7 +231,7 @@ 
      * @param array $args
      * @return mixed
      */
-    public function getFirst (array $args = []) {
+    public function getFirst(array $args = []) {
         return $this->getEach($args)->current();
     }
 
@@ -242,7 +242,7 @@ 
      *
      * @return Generator
      */
-    public function getIterator () {
+    public function getIterator() {
         yield from $this->getEach();
     }
 
@@ -252,7 +252,7 @@ 
      *
      * @return null|mixed
      */
-    public function getResult (array $args = []) {
+    public function getResult(array $args = []) {
         return $this->execute($args)->fetchColumn();
     }
 
@@ -262,7 +262,7 @@ 
      * @param string $column
      * @return $this
      */
-    public function group (string $column) {
+    public function group(string $column) {
         if (!strlen($this->_group)) {
             $this->_group = " GROUP BY {$column}";
         }
@@ -278,7 +278,7 @@ 
      * @param string ...$conditions
      * @return $this
      */
-    public function having (string ...$conditions) {
+    public function having(string ...$conditions) {
         assert(count($conditions) > 0);
         $conditions = implode(' AND ', $conditions);
         if (!strlen($this->_having)) {
@@ -298,7 +298,7 @@ 
      * @param Select $select
      * @return $this
      */
-    public function intersect (Select $select) {
+    public function intersect(Select $select) {
         if ($this->db->isMySQL()) {
             // to be standards compliant, this hack must fail if they don't have the same cols.
             assert(count($this->refs) === count($select->refs) and !array_diff_key($this->refs, $select->refs));
@@ -319,7 +319,7 @@ 
      *
      * @return Predicate
      */
-    public function isEmpty () {
+    public function isEmpty() {
         return Predicate::factory($this->db, "NOT EXISTS ({$this->toSql()})");
     }
 
@@ -328,7 +328,7 @@ 
      *
      * @return Predicate
      */
-    public function isNotEmpty () {
+    public function isNotEmpty() {
         return Predicate::factory($this->db, "EXISTS ({$this->toSql()})");
     }
 
@@ -339,7 +339,7 @@ 
      * @param string ...$conditions
      * @return $this
      */
-    public function join ($table, string ...$conditions) {
+    public function join($table, string ...$conditions) {
         assert(count($conditions) > 0);
         if ($table instanceof Select) {
             $table = $table->toSubquery();
@@ -356,7 +356,7 @@ 
      * @param string ...$conditions
      * @return $this
      */
-    public function joinLeft ($table, string ...$conditions) {
+    public function joinLeft($table, string ...$conditions) {
         assert(count($conditions) > 0);
         if ($table instanceof Select) {
             $table = $table->toSubquery();
@@ -373,7 +373,7 @@ 
      * @param int $offset
      * @return $this
      */
-    public function limit (int $limit, int $offset = 0) {
+    public function limit(int $limit, int $offset = 0) {
         if ($limit == 0) {
             $this->_limit = '';
         }
@@ -392,7 +392,7 @@ 
      * @param int|string $ref Ordinal or reference name.
      * @return null|Column
      */
-    public function offsetGet ($ref) {
+    public function offsetGet($ref) {
         if (is_int($ref)) {
             return current(array_slice($this->refs, $ref, 1)) ?: null;
         }
@@ -405,7 +405,7 @@ 
      * @param string $order
      * @return $this
      */
-    public function order (string $order) {
+    public function order(string $order) {
         if (strlen($order)) {
             $order = " ORDER BY {$order}";
         }
@@ -416,7 +416,7 @@ 
     /**
      * @return Statement
      */
-    public function prepare () {
+    public function prepare() {
         return $this->db->prepare($this->toSql());
     }
 
@@ -424,7 +424,7 @@ 
      * @param string $alias
      * @return $this
      */
-    public function setAlias (string $alias) {
+    public function setAlias(string $alias) {
         $this->alias = $alias;
         foreach ($this->refs as $k => $column) {
             $this->refs[$k] = $column->setQualifier($alias);
@@ -441,7 +441,7 @@ 
      * @param string[] $expressions Keyed by alias if applicable.
      * @return $this
      */
-    public function setColumns (array $expressions = ['*']) {
+    public function setColumns(array $expressions = ['*']) {
         if ($expressions === ['*']) {
             $expressions = array_keys($this->table->getColumns());
         }
@@ -469,7 +469,7 @@ 
      * @param Closure $fetcher
      * @return $this
      */
-    public function setFetcher (Closure $fetcher) {
+    public function setFetcher(Closure $fetcher) {
         $this->fetcher = $fetcher;
         return $this;
     }
@@ -479,7 +479,7 @@ 
      *
      * @return string
      */
-    public function toSql (): string {
+    public function toSql(): string {
         $sql = "SELECT {$this->_columns} FROM {$this->_table}";
         $sql .= $this->_join;
         $sql .= $this->_where;
@@ -496,7 +496,7 @@ 
      *
      * @return string
      */
-    public function toSubquery (): string {
+    public function toSubquery(): string {
         return "({$this->toSql()}) AS {$this->alias}";
     }
 
@@ -506,7 +506,7 @@ 
      * @param Select $select
      * @return $this
      */
-    public function union (Select $select) {
+    public function union(Select $select) {
         $select = clone $select;
         $select->_order = '';
         $select->_limit = '';
@@ -520,7 +520,7 @@ 
      * @param Select $select
      * @return $this
      */
-    public function unionAll (Select $select) {
+    public function unionAll(Select $select) {
         $select = clone $select;
         $select->_order = '';
         $select->_limit = '';
@@ -534,7 +534,7 @@ 
      * @param string ...$conditions
      * @return $this
      */
-    public function where (string ...$conditions) {
+    public function where(string ...$conditions) {
         assert(count($conditions) > 0);
         $conditions = implode(' AND ', $conditions);
         if (!strlen($this->_where)) {

Braces +6 added lines, -12 removed lines

@@ -132,8 +132,7 @@ 
         if ($table instanceof Select) {
             $this->_table = $table->toSubquery();
             $this->alias = "_anon{$autoAlias}_{$table->alias}";
-        }
-        else {
+        } else {
             if (is_string($table)) {
                 $table = $db[$table];
                 assert(isset($table));
@@ -265,8 +264,7 @@ 
     public function group (string $column) {
         if (!strlen($this->_group)) {
             $this->_group = " GROUP BY {$column}";
-        }
-        else {
+        } else {
             $this->_group .= ", {$column}";
         }
         return $this;
@@ -283,8 +281,7 @@ 
         $conditions = implode(' AND ', $conditions);
         if (!strlen($this->_having)) {
             $this->_having = " HAVING {$conditions}";
-        }
-        else {
+        } else {
             $this->_having .= " AND {$conditions}";
         }
         return $this;
@@ -376,8 +373,7 @@ 
     public function limit (int $limit, int $offset = 0) {
         if ($limit == 0) {
             $this->_limit = '';
-        }
-        else {
+        } else {
             $this->_limit = " LIMIT {$limit}";
             if ($offset > 1) {
                 $this->_limit .= " OFFSET {$offset}";
@@ -452,8 +448,7 @@ 
             $name = $match['name'] ?? null;
             if (is_int($alias)) {
                 $alias = $name;
-            }
-            elseif ($alias !== $name) {
+            } elseif ($alias !== $name) {
                 $expr .= " AS {$alias}";
             }
             if (isset($alias)) {
@@ -539,8 +534,7 @@ 
         $conditions = implode(' AND ', $conditions);
         if (!strlen($this->_where)) {
             $this->_where = " WHERE {$conditions}";
-        }
-        else {
+        } else {
             $this->_where .= " AND {$conditions}";
         }
         return $this;

src/DB/Junction.php

Braces +1 added lines, -2 removed lines

@@ -114,8 +114,7 @@
             $slots = implode(',', $this->db->slots(array_keys($this->columns)));
             if ($this->db->isSQLite()) {
                 $sql = "INSERT OR IGNORE INTO {$this} ({$columns}) VALUES ({$slots})";
-            }
-            else {
+            } else {
                 $sql = "INSERT IGNORE INTO {$this} ({$columns}) VALUES ({$slots})";
             }
             return $this->db->prepare($sql);

Spacing +9 added lines, -9 removed lines

@@ -34,7 +34,7 @@ 
      * @param string $interface
      * @return Junction
      */
-    public static function fromInterface (DB $db, string $interface) {
+    public static function fromInterface(DB $db, string $interface) {
         $ref = new ReflectionClass($interface);
         assert($ref->isInterface());
         $doc = $ref->getDocComment();
@@ -49,7 +49,7 @@ 
      * @param string $table
      * @param string[] $classes
      */
-    public function __construct (DB $db, string $table, array $classes) {
+    public function __construct(DB $db, string $table, array $classes) {
         parent::__construct($db, $table, array_keys($classes));
         $this->classes = $classes;
     }
@@ -63,7 +63,7 @@ 
      * @param array $match Keyed by junction column.
      * @return Select|EntityInterface[]
      */
-    public function findAll (string $key, array $match = []) {
+    public function findAll(string $key, array $match = []) {
         $record = $this->getRecord($key);
         $select = $record->loadAll();
         $select->join($this, $this[$key]->isEqual($record['id']));
@@ -77,14 +77,14 @@ 
      * @param string $column
      * @return string
      */
-    final public function getClass (string $column): string {
+    final public function getClass(string $column): string {
         return $this->classes[$column];
     }
 
     /**
      * @return string[]
      */
-    final public function getClasses () {
+    final public function getClasses() {
         return $this->classes;
     }
 
@@ -92,14 +92,14 @@ 
      * @param string $column
      * @return Record
      */
-    public function getRecord (string $column) {
+    public function getRecord(string $column) {
         return $this->db->getRecord($this->classes[$column]);
     }
 
     /**
      * @return Record[]
      */
-    public function getRecords () {
+    public function getRecords() {
         return array_map(fn($class) => $this->db->getRecord($class), $this->classes);
     }
 
@@ -109,7 +109,7 @@ 
      * @param int[] $ids Keyed by column.
      * @return int Rows affected.
      */
-    public function link (array $ids): int {
+    public function link(array $ids): int {
         $statement = $this->cache(__FUNCTION__, function() {
             $columns = implode(',', array_keys($this->columns));
             $slots = implode(',', $this->db->slots(array_keys($this->columns)));
@@ -132,7 +132,7 @@ 
      * @param array $ids Keyed by Column
      * @return int Rows affected
      */
-    public function unlink (array $ids): int {
+    public function unlink(array $ids): int {
         return $this->delete($ids);
     }
 }
\ No newline at end of file

src/DB/MigrationInterface.php

Spacing +2 added lines, -2 removed lines

@@ -31,11 +31,11 @@
      * @param Schema $schema
      * @return void
      */
-    public function down ($schema);
+    public function down($schema);
 
     /**
      * @param Schema $schema
      * @return void
      */
-    public function up ($schema);
+    public function up($schema);
 }
\ No newline at end of file