hfw / db

src/DB/Select.php

Spacing +30 added lines, -30 removed lines

@@ -124,7 +124,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);
@@ -151,7 +151,7 @@ 
      * @param array $args
      * @return Statement
      */
-    public function __invoke (array $args = []) {
+    public function __invoke(array $args = []) {
         return $this->execute($args);
     }
 
@@ -160,7 +160,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->alias;
     }
 
@@ -170,7 +170,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 = '';
@@ -183,7 +183,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());
         }
@@ -198,14 +198,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;
     }
 
@@ -218,7 +218,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));
     }
 
@@ -230,7 +230,7 @@ 
      * @param array $args
      * @return mixed
      */
-    public function getFirst (array $args = []) {
+    public function getFirst(array $args = []) {
         return $this->getEach($args)->current();
     }
 
@@ -241,7 +241,7 @@ 
      *
      * @return Generator
      */
-    public function getIterator () {
+    public function getIterator() {
         yield from $this->getEach();
     }
 
@@ -251,7 +251,7 @@ 
      *
      * @return mixed
      */
-    public function getResult (array $args = []) {
+    public function getResult(array $args = []) {
         return $this->execute($args)->fetchColumn();
     }
 
@@ -261,7 +261,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}";
         }
@@ -277,7 +277,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)) {
@@ -297,7 +297,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));
@@ -318,7 +318,7 @@ 
      *
      * @return Predicate
      */
-    public function isEmpty () {
+    public function isEmpty() {
         return Predicate::factory($this->db, "NOT EXISTS ({$this->toSql()})");
     }
 
@@ -327,7 +327,7 @@ 
      *
      * @return Predicate
      */
-    public function isNotEmpty () {
+    public function isNotEmpty() {
         return Predicate::factory($this->db, "EXISTS ({$this->toSql()})");
     }
 
@@ -338,7 +338,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();
@@ -355,7 +355,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();
@@ -372,7 +372,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 = '';
         }
@@ -391,7 +391,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;
         }
@@ -404,7 +404,7 @@ 
      * @param string $order
      * @return $this
      */
-    public function order (string $order) {
+    public function order(string $order) {
         if (strlen($order)) {
             $order = " ORDER BY {$order}";
         }
@@ -415,7 +415,7 @@ 
     /**
      * @return Statement
      */
-    public function prepare () {
+    public function prepare() {
         return $this->db->prepare($this->toSql());
     }
 
@@ -423,7 +423,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);
@@ -440,7 +440,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());
         }
@@ -468,7 +468,7 @@ 
      * @param Closure $fetcher
      * @return $this
      */
-    public function setFetcher (Closure $fetcher) {
+    public function setFetcher(Closure $fetcher) {
         $this->fetcher = $fetcher;
         return $this;
     }
@@ -478,7 +478,7 @@ 
      *
      * @return string
      */
-    public function toSql (): string {
+    public function toSql(): string {
         $sql = "SELECT {$this->_columns} FROM {$this->_table}";
         $sql .= $this->_join;
         $sql .= $this->_where;
@@ -495,7 +495,7 @@ 
      *
      * @return string
      */
-    public function toSubquery (): string {
+    public function toSubquery(): string {
         return "({$this->toSql()}) AS {$this->alias}";
     }
 
@@ -505,7 +505,7 @@ 
      * @param Select $select
      * @return $this
      */
-    public function union (Select $select) {
+    public function union(Select $select) {
         $select = clone $select;
         $select->_order = '';
         $select->_limit = '';
@@ -519,7 +519,7 @@ 
      * @param Select $select
      * @return $this
      */
-    public function unionAll (Select $select) {
+    public function unionAll(Select $select) {
         $select = clone $select;
         $select->_order = '';
         $select->_limit = '';
@@ -533,7 +533,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

@@ -131,8 +131,7 @@ 
         if ($table instanceof Select) {
             $this->_table = $table->toSubquery();
             $this->alias = "_anon{$autoAlias}_{$table->alias}";
-        }
-        else {
+        } else {
             if (is_string($table)) {
                 $table = $db->getTable($table);
                 assert(isset($table));
@@ -264,8 +263,7 @@ 
     public function group (string $column) {
         if (!strlen($this->_group)) {
             $this->_group = " GROUP BY {$column}";
-        }
-        else {
+        } else {
             $this->_group .= ", {$column}";
         }
         return $this;
@@ -282,8 +280,7 @@ 
         $conditions = implode(' AND ', $conditions);
         if (!strlen($this->_having)) {
             $this->_having = " HAVING {$conditions}";
-        }
-        else {
+        } else {
             $this->_having .= " AND {$conditions}";
         }
         return $this;
@@ -375,8 +372,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}";
@@ -451,8 +447,7 @@ 
             $name = $match['name'] ?? null;
             if (is_int($alias)) {
                 $alias = $name;
-            }
-            elseif ($alias !== $name) {
+            } elseif ($alias !== $name) {
                 $expr .= " AS {$alias}";
             }
             if (isset($alias)) {
@@ -538,8 +533,7 @@ 
         $conditions = implode(' AND ', $conditions);
         if (!strlen($this->_where)) {
             $this->_where = " WHERE {$conditions}";
-        }
-        else {
+        } else {
             $this->_where .= " AND {$conditions}";
         }
         return $this;

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/Record.php

Spacing +17 added lines, -17 removed lines

@@ -66,7 +66,7 @@ 
      * @param string|EntityInterface $class
      * @return Record
      */
-    public static function fromClass (DB $db, $class) {
+    public static function fromClass(DB $db, $class) {
         return (function() use ($db, $class) {
             $rClass = new ReflectionClass($class);
             $columns = [];
@@ -95,7 +95,7 @@ 
      * @param string[] $columns Property names.
      * @param EAV[] $eav Keyed by property name.
      */
-    public function __construct (DB $db, EntityInterface $proto, string $table, array $columns, array $eav = []) {
+    public function __construct(DB $db, EntityInterface $proto, string $table, array $columns, array $eav = []) {
         parent::__construct($db, $table, $columns);
         $this->proto = $proto;
         (function() use ($proto, $columns, $eav) {
@@ -132,7 +132,7 @@ 
      * @param array[] $eavMatch `[eav property => attribute => mixed]`
      * @return Select|EntityInterface[]
      */
-    public function find (array $match, array $eavMatch = []) {
+    public function find(array $match, array $eavMatch = []) {
         $select = $this->loadAll();
         foreach ($match as $a => $b) {
             $select->where($this->db->match($this[$a] ?? $a, $b));
@@ -150,7 +150,7 @@ 
      * @param Statement $statement
      * @return EntityInterface[] Keyed by ID
      */
-    public function getAll (Statement $statement): array {
+    public function getAll(Statement $statement): array {
         return iterator_to_array($this->getEach($statement));
     }
 
@@ -161,7 +161,7 @@ 
      * @param Statement $statement
      * @return Generator|EntityInterface[] Keyed by ID
      */
-    public function getEach (Statement $statement) {
+    public function getEach(Statement $statement) {
         do {
             $entities = [];
             for ($i = 0; $i < 256 and false !== $row = $statement->fetch(); $i++) {
@@ -178,14 +178,14 @@ 
      * @param string $property
      * @return EAV
      */
-    final public function getEav (string $property) {
+    final public function getEav(string $property) {
         return $this->eav[$property];
     }
 
     /**
      * @return EntityInterface
      */
-    public function getProto () {
+    public function getProto() {
         return $this->proto;
     }
 
@@ -193,7 +193,7 @@ 
      * @param EntityInterface $entity
      * @return array
      */
-    protected function getValues (EntityInterface $entity): array {
+    protected function getValues(EntityInterface $entity): array {
         $values = [];
         foreach (array_keys($this->columns) as $name) {
             $values[$name] = $this->properties[$name]->getValue($entity);
@@ -207,7 +207,7 @@ 
      * @param int $id
      * @return null|EntityInterface
      */
-    public function load (int $id) {
+    public function load(int $id) {
         $statement = $this->cache(__FUNCTION__, function() {
             return $this->select()->where('id = ?')->prepare();
         });
@@ -227,7 +227,7 @@ 
      *
      * @return Select|EntityInterface[]
      */
-    public function loadAll () {
+    public function loadAll() {
         return $this->select()->setFetcher(function(Statement $statement) {
             yield from $this->getEach($statement);
         });
@@ -238,7 +238,7 @@ 
      *
      * @param EntityInterface[] $entities
      */
-    protected function loadEav (array $entities): void {
+    protected function loadEav(array $entities): void {
         $ids = array_keys($entities);
         foreach ($this->eav as $name => $eav) {
             foreach ($eav->loadAll($ids) as $id => $values) {
@@ -253,7 +253,7 @@ 
      * @param EntityInterface $entity
      * @return int ID
      */
-    public function save (EntityInterface $entity): int {
+    public function save(EntityInterface $entity): int {
         if (!$entity->getId()) {
             $this->saveInsert($entity);
         }
@@ -267,7 +267,7 @@ 
     /**
      * @param EntityInterface $entity
      */
-    protected function saveEav (EntityInterface $entity): void {
+    protected function saveEav(EntityInterface $entity): void {
         $id = $entity->getId();
         foreach ($this->eav as $name => $eav) {
             // may be null to skip
@@ -283,7 +283,7 @@ 
      *
      * @param EntityInterface $entity
      */
-    protected function saveInsert (EntityInterface $entity): void {
+    protected function saveInsert(EntityInterface $entity): void {
         $statement = $this->cache(__FUNCTION__, function() {
             $slots = SQL::slots(array_keys($this->columns));
             unset($slots['id']);
@@ -302,7 +302,7 @@ 
      *
      * @param EntityInterface $entity
      */
-    protected function saveUpdate (EntityInterface $entity): void {
+    protected function saveUpdate(EntityInterface $entity): void {
         $statement = $this->cache(__FUNCTION__, function() {
             $slots = SQL::slotsEqual(array_keys($this->columns));
             unset($slots['id']);
@@ -317,7 +317,7 @@ 
      * @param EntityInterface $proto
      * @return $this
      */
-    public function setProto (EntityInterface $proto) {
+    public function setProto(EntityInterface $proto) {
         $this->proto = $proto;
         return $this;
     }
@@ -326,7 +326,7 @@ 
      * @param EntityInterface $entity
      * @param array $values
      */
-    protected function setValues (EntityInterface $entity, array $values): void {
+    protected function setValues(EntityInterface $entity, array $values): void {
         foreach ($values as $name => $value) {
             if (isset($this->properties[$name])) {
                 settype($value, $this->types[$name]);