hfw / db

src/DB.php

Spacing +15 added lines, -15 removed lines

@@ -46,7 +46,7 @@ 
      * @param string $passwd
      * @param array $options
      */
-    public function __construct ($dsn, $username = null, $passwd = null, $options = null) {
+    public function __construct($dsn, $username = null, $passwd = null, $options = null) {
         parent::__construct(...func_get_args());
         $this->setAttribute(self::ATTR_ERRMODE, self::ERRMODE_EXCEPTION);
         $this->setAttribute(self::ATTR_DEFAULT_FETCH_MODE, self::FETCH_ASSOC);
@@ -62,7 +62,7 @@ 
      * @param string $sql
      * @return int
      */
-    public function exec ($sql) {
+    public function exec($sql) {
         $this->logger->__invoke($sql);
         return parent::exec($sql);
     }
@@ -72,7 +72,7 @@ 
      *
      * @return string
      */
-    final public function getDriver () {
+    final public function getDriver() {
         return $this->getAttribute(self::ATTR_DRIVER_NAME);
     }
 
@@ -82,7 +82,7 @@ 
      * @param string $interface
      * @return Junction
      */
-    public function getJunction ($interface) {
+    public function getJunction($interface) {
         if (!isset($this->junctions[$interface])) {
             $this->junctions[$interface] = new Junction($this, $interface);
         }
@@ -95,7 +95,7 @@ 
      * @param string|EntityInterface $class
      * @return Record
      */
-    public function getRecord ($class) {
+    public function getRecord($class) {
         if (is_object($class)) {
             $class = get_class($class);
         }
@@ -122,7 +122,7 @@ 
      * @param string|array|Select|Closure $b
      * @return string|string[] Same type as `$a`, keys are not preserved.
      */
-    public function match ($a, $b = null) {
+    public function match($a, $b = null) {
         if (is_array($a)) {
             return array_map([$this, __FUNCTION__], array_keys($a), $a);
         }
@@ -139,7 +139,7 @@ 
      * @param string $access Class or interface name.
      * @return bool
      */
-    public function offsetExists ($access) {
+    public function offsetExists($access) {
         return (bool)$this->offsetGet($access);
     }
 
@@ -147,7 +147,7 @@ 
      * @param string $access Class or interface name.
      * @return Record|Junction|null
      */
-    public function offsetGet ($access) {
+    public function offsetGet($access) {
         if (class_exists($access)) {
             return $this->getRecord($access);
         }
@@ -164,7 +164,7 @@ 
      * @param void $value
      * @throws LogicException
      */
-    final public function offsetSet ($access, $value) {
+    final public function offsetSet($access, $value) {
         throw new LogicException('The schema cannot be altered by ArrayAccess.');
     }
 
@@ -174,7 +174,7 @@ 
      * @param void $access
      * @throws LogicException
      */
-    final public function offsetUnset ($access) {
+    final public function offsetUnset($access) {
         $this->offsetSet($access, null);
     }
 
@@ -185,7 +185,7 @@ 
      * @param array $options
      * @return PDOStatement
      */
-    public function prepare ($sql, $options = null) {
+    public function prepare($sql, $options = null) {
         $this->logger->__invoke($sql);
         return parent::prepare(...func_get_args());
     }
@@ -199,7 +199,7 @@ 
      * @param array $ctorargs
      * @return PDOStatement
      */
-    public function query ($sql, $mode = PDO::ATTR_DEFAULT_FETCH_MODE, $arg3 = null, array $ctorargs = []) {
+    public function query($sql, $mode = PDO::ATTR_DEFAULT_FETCH_MODE, $arg3 = null, array $ctorargs = []) {
         $this->logger->__invoke($sql);
         return parent::query(...func_get_args());
     }
@@ -217,7 +217,7 @@ 
      * @param int $type Ignored.
      * @return mixed
      */
-    public function quote ($value, $type = null) {
+    public function quote($value, $type = null) {
         switch (gettype($value)) {
             case 'array' :
                 return array_map([$this, __FUNCTION__], $value);
@@ -236,14 +236,14 @@ 
      * @param EntityInterface $entity
      * @return int ID
      */
-    public function save (EntityInterface $entity) {
+    public function save(EntityInterface $entity) {
         return $this->getRecord($entity)->save($entity);
     }
 
     /**
      * @param Closure $logger
      */
-    public function setLogger (Closure $logger) {
+    public function setLogger(Closure $logger) {
         $this->logger = $logger;
     }
 }
\ No newline at end of file

src/DB/EntityInterface.php

Spacing +1 added lines, -1 removed lines

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

src/DB/Select.php

Spacing +23 added lines, -23 removed lines

@@ -75,7 +75,7 @@ 
      * @param string|Select $table
      * @param array $columns Strings or {@link Column}. Keys are used for aliasing.
      */
-    public function __construct (DB $db, $table, array $columns) {
+    public function __construct(DB $db, $table, array $columns) {
         parent::__construct($db);
         if ($table instanceof Select) {
             $table = $table->toSubquery();
@@ -91,7 +91,7 @@ 
     /**
      * Gives the instance a new alias.
      */
-    public function __clone () {
+    public function __clone() {
         $this->alias = uniqid('_');
     }
 
@@ -99,7 +99,7 @@ 
      * @param array $args
      * @return PDOStatement
      */
-    public function __invoke (array $args = []) {
+    public function __invoke(array $args = []) {
         return $this->execute($args);
     }
 
@@ -108,7 +108,7 @@ 
      *
      * @return string
      */
-    public function __toString (): string {
+    public function __toString(): string {
         return $this->alias;
     }
 
@@ -118,7 +118,7 @@ 
      * @param array $args Execution arguments.
      * @return int
      */
-    public function count (array $args = []): int {
+    public function count(array $args = []): int {
         $clone = clone $this;
         $clone->setColumns(['COUNT(*)']);
         return (int)$clone->execute($args)->fetchColumn();
@@ -130,7 +130,7 @@ 
      * @param array $args
      * @return PDOStatement
      */
-    public function execute (array $args = []): PDOStatement {
+    public function execute(array $args = []): PDOStatement {
         $statement = $this->prepare();
         $statement->execute($args);
         return $statement;
@@ -144,21 +144,21 @@ 
      * @param array $args Execution arguments.
      * @return array
      */
-    public function fetchAll (array $args = []): array {
+    public function fetchAll(array $args = []): array {
         return $this->fetcher->__invoke($this->execute($args));
     }
 
     /**
      * @return string
      */
-    final public function getAlias (): string {
+    final public function getAlias(): string {
         return $this->alias;
     }
 
     /**
      * @return Closure
      */
-    public function getFetcher (): Closure {
+    public function getFetcher(): Closure {
         return $this->fetcher;
     }
 
@@ -169,7 +169,7 @@ 
      *
      * @return ArrayIterator
      */
-    public function getIterator () {
+    public function getIterator() {
         return new ArrayIterator($this->fetchAll());
     }
 
@@ -179,7 +179,7 @@ 
      * @param string $column
      * @return $this
      */
-    public function group ($column) {
+    public function group($column) {
         $this->_group[] = $column;
         return $this;
     }
@@ -190,7 +190,7 @@ 
      * @param string $condition
      * @return $this
      */
-    public function having ($condition) {
+    public function having($condition) {
         $this->_having[] = $condition;
         return $this;
     }
@@ -203,7 +203,7 @@ 
      * @param string $type
      * @return $this
      */
-    public function join ($table, $condition, $type = 'INNER') {
+    public function join($table, $condition, $type = 'INNER') {
         if ($table instanceof Select) {
             $table = $table->toSubquery();
         }
@@ -218,7 +218,7 @@ 
      * @param int $offset
      * @return $this
      */
-    public function limit ($limit, $offset = 0) {
+    public function limit($limit, $offset = 0) {
         $this->_limit = " LIMIT {$limit}";
         if ($offset) {
             $this->_limit .= " OFFSET {$offset}";
@@ -232,7 +232,7 @@ 
      * @param string $name Name or alias if used.
      * @return bool
      */
-    public function offsetExists ($name): bool {
+    public function offsetExists($name): bool {
         return isset($this->columns[$name]);
     }
 
@@ -242,7 +242,7 @@ 
      * @param string $name Name or alias if used.
      * @return Column
      */
-    public function offsetGet ($name): Column {
+    public function offsetGet($name): Column {
         return new Column($this->db, $name, $this->alias);
     }
 
@@ -252,7 +252,7 @@ 
      * @param string $order
      * @return $this
      */
-    public function order ($order) {
+    public function order($order) {
         $this->_order = " ORDER BY {$order}";
         return $this;
     }
@@ -260,7 +260,7 @@ 
     /**
      * @return PDOStatement
      */
-    public function prepare (): PDOStatement {
+    public function prepare(): PDOStatement {
         return $this->db->prepare($this->toSql());
     }
 
@@ -270,7 +270,7 @@ 
      * @param array $columns Strings or {@link Column}. Keys are used for aliasing.
      * @return $this
      */
-    public function setColumns (array $columns) {
+    public function setColumns(array $columns) {
         $this->columns = [];
         foreach ($columns as $alias => $column) {
             if ($column instanceof Column) {
@@ -294,7 +294,7 @@ 
      * @param Closure $fetcher
      * @return $this
      */
-    public function setFetcher (Closure $fetcher) {
+    public function setFetcher(Closure $fetcher) {
         $this->fetcher = $fetcher;
         return $this;
     }
@@ -302,7 +302,7 @@ 
     /**
      * @return string
      */
-    public function toSql (): string {
+    public function toSql(): string {
         $columns = [];
         foreach ($this->columns as $alias => $column) {
             if ($alias !== $column) {
@@ -336,7 +336,7 @@ 
      *
      * @return string
      */
-    public function toSubquery (): string {
+    public function toSubquery(): string {
         return "({$this->toSql()}) AS {$this->getAlias()}";
     }
 
@@ -346,7 +346,7 @@ 
      * @param string $condition
      * @return $this
      */
-    public function where ($condition) {
+    public function where($condition) {
         $this->_where[] = $condition;
         return $this;
     }

Braces +3 added lines, -6 removed lines

@@ -276,14 +276,12 @@ 
             if ($column instanceof Column) {
                 $name = $column->getName();
                 $column = (string)$column;
-            }
-            else {
+            } else {
                 $name = $column = (string)$column;
             }
             if (is_string($alias) and $alias !== $name) {
                 $this->columns[$alias] = $column;
-            }
-            else {
+            } else {
                 $this->columns[$column] = $column;
             }
         }
@@ -307,8 +305,7 @@ 
         foreach ($this->columns as $alias => $column) {
             if ($alias !== $column) {
                 $columns[] = "{$column} AS {$alias}";
-            }
-            else {
+            } else {
                 $columns[] = "{$column}";
             }
         }

src/DB/AbstractAccess.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
     /**
      * @param DB $db
      */
-    public function __construct (DB $db) {
+    public function __construct(DB $db) {
         $this->db = $db;
     }
 
@@ -37,7 +37,7 @@ 
      * @param Closure $prepare `():PDOStatement`
      * @return PDOStatement
      */
-    protected function cache (string $key, Closure $prepare): PDOStatement {
+    protected function cache(string $key, Closure $prepare): PDOStatement {
         return $this->_cache[$key] ?? $this->_cache[$key] = $prepare->__invoke();
     }
 

src/DB/Record.php

Spacing +16 added lines, -16 removed lines

@@ -63,7 +63,7 @@ 
      * @param DB $db
      * @param string $class
      */
-    public function __construct (DB $db, string $class) {
+    public function __construct(DB $db, string $class) {
         $this->db = $db;
         $this->class = $class;
         try {
@@ -109,7 +109,7 @@ 
      * @param PDOStatement $statement
      * @return EntityInterface[] Enumerated
      */
-    public function fetchAll (PDOStatement $statement): array {
+    public function fetchAll(PDOStatement $statement): array {
         $entities = [];
         foreach ($statement->fetchAll() as $row) {
             $clone = clone $this->proto;
@@ -129,7 +129,7 @@ 
      * @param array[] $eavMatch Additional `[eav property => attribute => mixed]`
      * @return Select
      */
-    public function find (array $match, array $eavMatch = []): Select {
+    public function find(array $match, array $eavMatch = []): Select {
         $select = $this->select();
         foreach ($match as $column => $value) {
             $select->where($this->db->match($column, $value));
@@ -144,7 +144,7 @@ 
     /**
      * @return string
      */
-    final public function getClass (): string {
+    final public function getClass(): string {
         return $this->class;
     }
 
@@ -152,14 +152,14 @@ 
      * @param string $property
      * @return EAV
      */
-    final public function getEav ($property): EAV {
+    final public function getEav($property): EAV {
         return $this->eav[$property];
     }
 
     /**
      * @return EntityInterface
      */
-    public function getProto (): EntityInterface {
+    public function getProto(): EntityInterface {
         return $this->proto;
     }
 
@@ -167,7 +167,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);
@@ -181,7 +181,7 @@ 
      * @param int $id
      * @return null|EntityInterface
      */
-    public function load ($id): ?EntityInterface {
+    public function load($id): ?EntityInterface {
         $load = $this->cache(__FUNCTION__, function() {
             return $this->select()->where('id=:id')->prepare();
         });
@@ -200,7 +200,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) {
@@ -215,7 +215,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);
         }
@@ -229,7 +229,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) {
             $values = $this->properties[$name]->getValue($entity);
@@ -244,7 +244,7 @@ 
      *
      * @param EntityInterface $entity
      */
-    protected function saveInsert (EntityInterface $entity): void {
+    protected function saveInsert(EntityInterface $entity): void {
         $insert = $this->cache(__FUNCTION__, function() {
             $slots = SQL::slots(array_keys($this->columns));
             unset($slots['id']);
@@ -263,7 +263,7 @@ 
      *
      * @param EntityInterface $entity
      */
-    protected function saveUpdate (EntityInterface $entity): void {
+    protected function saveUpdate(EntityInterface $entity): void {
         $this->cache(__FUNCTION__, function() {
             $slots = SQL::slots(array_keys($this->columns));
             unset($slots['id']);
@@ -278,7 +278,7 @@ 
      * @param array $columns Defaults to all columns.
      * @return Select
      */
-    public function select (array $columns = []): Select {
+    public function select(array $columns = []): Select {
         $select = parent::select($columns);
         $select->setFetcher(function(PDOStatement $statement) {
             return $this->fetchAll($statement);
@@ -290,7 +290,7 @@ 
      * @param EntityInterface $proto
      * @return $this
      */
-    public function setProto (EntityInterface $proto) {
+    public function setProto(EntityInterface $proto) {
         $this->proto = $proto;
         return $this;
     }
@@ -299,7 +299,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) {
             settype($value, $this->types[$name]);
             $this->properties[$name]->setValue($entity, $value);

Braces +3 added lines, -6 removed lines

@@ -68,8 +68,7 @@ 
         $this->class = $class;
         try {
             $class = new ReflectionClass($class);
-        }
-        catch (ReflectionException $exception) {
+        } catch (ReflectionException $exception) {
             throw new LogicException('Unexpected ReflectionException', 0, $exception);
         }
         $this->proto = $class->newInstanceWithoutConstructor();
@@ -88,8 +87,7 @@ 
                 if (preg_match('/@var\s+(?<type>\S+)/', $doc, $var)) {
                     $types[$name] = $var['type'];
                 }
-            }
-            elseif (preg_match('/@eav\s+(?<table>\S+)/', $doc, $match)) {
+            } elseif (preg_match('/@eav\s+(?<table>\S+)/', $doc, $match)) {
                 $eav[$name] = $match['table'];
                 $this->properties[$name] = $property;
             }
@@ -218,8 +216,7 @@ 
     public function save (EntityInterface $entity): int {
         if (!$entity->getId()) {
             $this->saveInsert($entity);
-        }
-        else {
+        } else {
             $this->saveUpdate($entity);
         }
         $this->saveEav($entity);

src/DB/AttributesTrait.php

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
     /**
      * @return array
      */
-    public function getAttributes (): array {
+    public function getAttributes(): array {
         return $this->attributes ?: [];
     }
 
@@ -30,7 +30,7 @@ 
      * @param $offset
      * @return bool
      */
-    public function offsetExists ($offset): bool {
+    public function offsetExists($offset): bool {
         return $this->attributes and array_key_exists($offset, $this->attributes);
     }
 
@@ -38,7 +38,7 @@ 
      * @param $offset
      * @return mixed Returns `NULL` for nonexistent attributes.
      */
-    public function offsetGet ($offset) {
+    public function offsetGet($offset) {
         return $this->attributes[$offset] ?? null;
     }
 
@@ -46,14 +46,14 @@ 
      * @param $offset
      * @param $value
      */
-    public function offsetSet ($offset, $value): void {
+    public function offsetSet($offset, $value): void {
         $this->attributes[$offset] = $value;
     }
 
     /**
      * @param $offset
      */
-    public function offsetUnset ($offset): void {
+    public function offsetUnset($offset): void {
         unset($this->attributes[$offset]);
     }
 
@@ -61,7 +61,7 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function setAttributes (array $attributes) {
+    public function setAttributes(array $attributes) {
         $this->attributes = $attributes;
         return $this;
     }

src/DB/SQL.php

Spacing +18 added lines, -18 removed lines

@@ -15,7 +15,7 @@ 
      * @param string[] $conditions
      * @return string
      */
-    public static function all (array $conditions): string {
+    public static function all(array $conditions): string {
         if (count($conditions) === 1) {
             return reset($conditions);
         }
@@ -28,7 +28,7 @@ 
      * @param string[] $conditions
      * @return string
      */
-    public static function any (array $conditions): string {
+    public static function any(array $conditions): string {
         if (count($conditions) === 1) {
             return reset($conditions);
         }
@@ -67,7 +67,7 @@ 
      * @param string $listOperator
      * @return string|array
      */
-    public static function compare ($a, $operator, $b = null, $subqueryOperator = null, $listOperator = null) {
+    public static function compare($a, $operator, $b = null, $subqueryOperator = null, $listOperator = null) {
         if (is_array($a)) {
             $cmp = [];
             foreach ($a as $k => $v) {
@@ -91,7 +91,7 @@ 
      * @param string|array|Select $b
      * @return string|array
      */
-    public static function isEqual ($a, $b = null) {
+    public static function isEqual($a, $b = null) {
         return static::compare($a, '=', $b, 'ANY', 'IN');
     }
 
@@ -102,7 +102,7 @@ 
      * @param string|Select $b
      * @return string|array
      */
-    public static function isGreater ($a, $b = null) {
+    public static function isGreater($a, $b = null) {
         return static::compare($a, '>', $b, 'ALL');
     }
 
@@ -113,7 +113,7 @@ 
      * @param string|Select $b
      * @return string|array
      */
-    public static function isGreaterOrEqual ($a, $b = null) {
+    public static function isGreaterOrEqual($a, $b = null) {
         return static::compare($a, '>=', $b, 'ALL');
     }
 
@@ -124,7 +124,7 @@ 
      * @param string|Select $b
      * @return string|array
      */
-    public static function isLess ($a, $b = null) {
+    public static function isLess($a, $b = null) {
         return static::compare($a, '<', $b, 'ALL');
     }
 
@@ -135,7 +135,7 @@ 
      * @param string|Select $b
      * @return string|array
      */
-    public static function isLessOrEqual ($a, $b = null) {
+    public static function isLessOrEqual($a, $b = null) {
         return static::compare($a, '<=', $b, 'ALL');
     }
 
@@ -146,7 +146,7 @@ 
      * @param string $pattern
      * @return string|array
      */
-    public static function isLike ($x, string $pattern = null) {
+    public static function isLike($x, string $pattern = null) {
         return static::compare($x, 'LIKE', $pattern);
     }
 
@@ -157,7 +157,7 @@ 
      * @param null|bool $identity
      * @return string|array
      */
-    public static function isNot ($x, $identity) {
+    public static function isNot($x, $identity) {
         return static::compare($x, 'IS NOT', ['' => 'UNKNOWN', 1 => 'TRUE', 0 => 'FALSE'][$identity]);
     }
 
@@ -168,7 +168,7 @@ 
      * @param string|array|Select $b
      * @return string|array
      */
-    public static function isNotEqual ($a, $b = null) {
+    public static function isNotEqual($a, $b = null) {
         return static::compare($a, '<>', $b, 'ALL', 'NOT IN');
     }
 
@@ -179,7 +179,7 @@ 
      * @param string $pattern
      * @return string|array
      */
-    public static function isNotLike ($x, string $pattern = null) {
+    public static function isNotLike($x, string $pattern = null) {
         return static::compare($x, 'NOT LIKE', $pattern);
     }
 
@@ -189,7 +189,7 @@ 
      * @param string|array $x
      * @return string|array
      */
-    public static function isNotNull ($x) {
+    public static function isNotNull($x) {
         if (is_array($x)) {
             return array_map(__METHOD__, $x);
         }
@@ -203,7 +203,7 @@ 
      * @param string $pattern
      * @return string|array
      */
-    public static function isNotRegExp ($x, string $pattern = null) {
+    public static function isNotRegExp($x, string $pattern = null) {
         return static::compare($x, 'NOT REGEXP', $pattern);
     }
 
@@ -214,7 +214,7 @@ 
      * @param string $pattern
      * @return string|array
      */
-    public static function isRegExp ($x, string $pattern = null) {
+    public static function isRegExp($x, string $pattern = null) {
         return static::compare($x, 'REGEXP', $pattern);
     }
 
@@ -224,7 +224,7 @@ 
      * @param string|array $x
      * @return string|array
      */
-    public static function not ($x) {
+    public static function not($x) {
         if (is_array($x)) {
             return array_map(__METHOD__, $x);
         }
@@ -239,7 +239,7 @@ 
      * @param string[] $columns
      * @return string[] `[column => :column]`
      */
-    public static function slots (array $columns): array {
+    public static function slots(array $columns): array {
         $slots = [];
         foreach ($columns as $column) {
             $slots[(string)$column] = ':' . str_replace('.', '__', $column);
@@ -247,6 +247,6 @@ 
         return $slots;
     }
 
-    final private function __construct () { }
+    final private function __construct() { }
 
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -74,11 +74,9 @@
                 $cmp[$k] = static::compare($k, $operator, $v, $subqueryOperator, $listOperator);
             }
             return $cmp;
-        }
-        elseif (is_array($b)) {
+        } elseif (is_array($b)) {
             return "{$a} {$listOperator} (" . implode(',', $b) . ")";
-        }
-        elseif ($b instanceof Select) {
+        } elseif ($b instanceof Select) {
             return "{$a} {$operator} {$subqueryOperator} ({$b->toSql()})";
         }
         return "{$a} {$operator} {$b}";

src/DB/Table.php

Spacing +11 added lines, -11 removed lines

@@ -28,7 +28,7 @@ 
      * @param string $name
      * @param string[] $columns
      */
-    public function __construct (DB $db, $name, array $columns) {
+    public function __construct(DB $db, $name, array $columns) {
         parent::__construct($db);
         $this->name = $name;
         foreach ($columns as $column) {
@@ -41,7 +41,7 @@ 
      *
      * @return string
      */
-    final public function __toString (): string {
+    final public function __toString(): string {
         return $this->name;
     }
 
@@ -51,7 +51,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 = implode(',', $this->db->quote($values));
         switch ($this->db->getDriver()) {
@@ -70,7 +70,7 @@ 
      * @param array $match
      * @return int Rows affected.
      */
-    public function delete (array $match): int {
+    public function delete(array $match): int {
         $match = SQL::all($this->db->match($match));
         return $this->db->exec("DELETE FROM {$this} WHERE {$match}");
     }
@@ -78,14 +78,14 @@ 
     /**
      * @return Column[]
      */
-    final public function getColumns (): array {
+    final public function getColumns(): array {
         return $this->columns;
     }
 
     /**
      * @return string
      */
-    final public function getName (): string {
+    final public function getName(): string {
         return $this->name;
     }
 
@@ -95,7 +95,7 @@ 
      * @param array $values
      * @return int Insertion ID.
      */
-    public function insert (array $values): int {
+    public function insert(array $values): int {
         $columns = implode(',', array_keys($values));
         $values = implode(',', $this->db->quote($values));
         $this->db->exec("INSERT INTO {$this} ($columns) VALUES ($values)");
@@ -106,7 +106,7 @@ 
      * @param string $name
      * @return bool
      */
-    final public function offsetExists ($name): bool {
+    final public function offsetExists($name): bool {
         return isset($this->columns[$name]);
     }
 
@@ -114,7 +114,7 @@ 
      * @param string $name
      * @return Column
      */
-    final public function offsetGet ($name): Column {
+    final public function offsetGet($name): Column {
         return $this->columns[$name];
     }
 
@@ -124,7 +124,7 @@ 
      * @param string[] $columns Defaults to all columns.
      * @return Select
      */
-    public function select (array $columns = []): Select {
+    public function select(array $columns = []): Select {
         if (!$columns) {
             $columns = $this->columns;
         }
@@ -140,7 +140,7 @@ 
      * @param array $match
      * @return int Rows affected.
      */
-    public function update (array $values, array $match): int {
+    public function update(array $values, array $match): int {
         $values = implode(', ', SQL::isEqual($this->db->quote($values)));
         $match = SQL::all($this->db->match($match));
         return $this->db->exec("UPDATE {$this} SET {$values} WHERE {$match}");

src/DB/Junction.php

Spacing +7 added lines, -7 removed lines

@@ -31,7 +31,7 @@ 
      * @param DB $db
      * @param string $interface
      */
-    public function __construct (DB $db, string $interface) {
+    public function __construct(DB $db, string $interface) {
         $this->interface = $interface;
         try {
             $interface = new ReflectionClass($interface);
@@ -57,7 +57,7 @@ 
      * @param EntityInterface $entity
      * @return int
      */
-    public function count (EntityInterface $entity): int {
+    public function count(EntityInterface $entity): int {
         $key = $this->getKey($entity);
         $count = $this->cache("count.{$key}", function() use ($key) {
             return $this->select(['COUNT(*)'])->where("{$key}=:id")->prepare();
@@ -75,7 +75,7 @@ 
      * @param string $class
      * @return Select
      */
-    public function getCollection (EntityInterface $owner, string $class): Select {
+    public function getCollection(EntityInterface $owner, string $class): Select {
         $record = $this->db->getRecord($class);
         $select = $record->select();
         $select->join($this, "{$this}.{$this->getKey($class)}={$record}.id");
@@ -86,7 +86,7 @@ 
     /**
      * @return string
      */
-    final public function getInterface (): string {
+    final public function getInterface(): string {
         return $this->interface;
     }
 
@@ -96,7 +96,7 @@ 
      * @param EntityInterface|string $class
      * @return string
      */
-    public function getKey ($class): string {
+    public function getKey($class): string {
         if (is_object($class)) {
             $class = get_class($class);
         }
@@ -114,7 +114,7 @@ 
      * @param EntityInterface[] $entities
      * @return int Rows affected.
      */
-    public function link (array $entities): int {
+    public function link(array $entities): int {
         $apply = [];
         foreach ($entities as $entity) {
             $apply[$this->getKey($entity)] = $entity->getId();
@@ -131,7 +131,7 @@ 
      * @param EntityInterface[] $entities
      * @return int Rows affected.
      */
-    public function unlink (array $entities): int {
+    public function unlink(array $entities): int {
         $match = [];
         foreach ($entities as $entity) {
             $match[$this->getKey($entity)] = $entity->getId();

Braces +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
         $this->interface = $interface;
         try {
             $interface = new ReflectionClass($interface);
-        }
-        catch (ReflectionException $exception) {
+        } catch (ReflectionException $exception) {
             throw new LogicException('Unexpected ReflectionException', 0, $exception);
         }
         $doc = $interface->getDocComment();