hfw / db

src/DB.php

Spacing +19 added lines, -19 removed lines

@@ -53,7 +53,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($dsn, $username, $passwd, $options);
         $this->driver = $this->getAttribute(self::ATTR_DRIVER_NAME);
         $this->setAttribute(self::ATTR_DEFAULT_FETCH_MODE, self::FETCH_ASSOC);
@@ -74,7 +74,7 @@ 
      * @param string $sql
      * @return int
      */
-    public function exec ($sql): int {
+    public function exec($sql): int {
         $this->logger->__invoke($sql);
         return parent::exec($sql);
     }
@@ -82,7 +82,7 @@ 
     /**
      * @return string
      */
-    final public function getDriver (): string {
+    final public function getDriver(): string {
         return $this->driver;
     }
 
@@ -92,7 +92,7 @@ 
      * @param string $interface
      * @return Junction
      */
-    public function getJunction ($interface): Junction {
+    public function getJunction($interface): Junction {
         if (!isset($this->junctions[$interface])) {
             $this->junctions[$interface] = Junction::fromInterface($this, $interface);
         }
@@ -102,7 +102,7 @@ 
     /**
      * @return Closure
      */
-    public function getLogger (): Closure {
+    public function getLogger(): Closure {
         return $this->logger;
     }
 
@@ -112,7 +112,7 @@ 
      * @param string|EntityInterface $class
      * @return Record
      */
-    public function getRecord ($class): Record {
+    public function getRecord($class): Record {
         $name = $class;
         if (is_object($name)) {
             $name = get_class($name);
@@ -137,7 +137,7 @@ 
      * @param mixed $b
      * @return string
      */
-    public function match ($a, $b) {
+    public function match($a, $b) {
         if ($b instanceof Closure) {
             if (!$a instanceof Column) {
                 $a = new Column($this, $a);
@@ -163,7 +163,7 @@ 
      * @param array $match
      * @return string[]
      */
-    public function matchArray (array $match) {
+    public function matchArray(array $match) {
         return array_map([$this, 'match'], array_keys($match), $match);
     }
 
@@ -171,7 +171,7 @@ 
      * @param string $access Class or interface name.
      * @return bool
      */
-    public function offsetExists ($access): bool {
+    public function offsetExists($access): bool {
         return (bool)$this->offsetGet($access);
     }
 
@@ -179,7 +179,7 @@ 
      * @param string $access Class or interface name.
      * @return null|Record|Junction
      */
-    public function offsetGet ($access) {
+    public function offsetGet($access) {
         if (class_exists($access)) {
             return $this->getRecord($access);
         }
@@ -196,7 +196,7 @@ 
      * @param void $value
      * @throws Exception
      */
-    final public function offsetSet ($access, $value): void {
+    final public function offsetSet($access, $value): void {
         throw new Exception('The schema is immutable.');
     }
 
@@ -206,7 +206,7 @@ 
      * @param void $access
      * @throws Exception
      */
-    final public function offsetUnset ($access): void {
+    final public function offsetUnset($access): void {
         $this->offsetSet($access, null);
     }
 
@@ -217,7 +217,7 @@ 
      * @param array $options
      * @return Statement
      */
-    public function prepare ($sql, $options = []): Statement {
+    public function prepare($sql, $options = []): Statement {
         $this->logger->__invoke($sql);
         /** @var Statement $statement */
         $statement = parent::prepare($sql, $options);
@@ -233,7 +233,7 @@ 
      * @param array $ctorargs
      * @return Statement
      */
-    public function query ($sql, $mode = PDO::ATTR_DEFAULT_FETCH_MODE, $arg3 = null, array $ctorargs = []): Statement {
+    public function query($sql, $mode = PDO::ATTR_DEFAULT_FETCH_MODE, $arg3 = null, array $ctorargs = []): Statement {
         $this->logger->__invoke($sql);
         /** @var Statement $statement */
         $statement = parent::query(...func_get_args());
@@ -252,7 +252,7 @@ 
      * @param int $type Ignored.
      * @return string
      */
-    public function quote ($value, $type = null) {
+    public function quote($value, $type = null) {
         if ($value instanceof ExpressionInterface) {
             return $value;
         }
@@ -272,7 +272,7 @@ 
      * @param array $values
      * @return array
      */
-    public function quoteArray (array $values): array {
+    public function quoteArray(array $values): array {
         return array_map([$this, 'quote'], $values);
     }
 
@@ -282,7 +282,7 @@ 
      * @param mixed $value
      * @return array|string
      */
-    public function quoteMixed ($value) {
+    public function quoteMixed($value) {
         if (is_array($value)) {
             return $this->quoteArray($value);
         }
@@ -295,7 +295,7 @@ 
      * @param EntityInterface $entity
      * @return int ID
      */
-    public function save (EntityInterface $entity): int {
+    public function save(EntityInterface $entity): int {
         return $this->getRecord($entity)->save($entity);
     }
 
@@ -303,7 +303,7 @@ 
      * @param Closure $logger
      * @return $this
      */
-    public function setLogger (Closure $logger) {
+    public function setLogger(Closure $logger) {
         $this->logger = $logger;
         return $this;
     }

src/DB/Select.php

Spacing +21 added lines, -21 removed lines

@@ -73,7 +73,7 @@ 
      * @param string|Select $table
      * @param string[] $columns
      */
-    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();
@@ -97,7 +97,7 @@ 
     /**
      * Gives the clone a new alias.
      */
-    public function __clone () {
+    public function __clone() {
         $this->alias = uniqid('_') . "__{$this->table}";
     }
 
@@ -105,7 +105,7 @@ 
      * @param array $args
      * @return Statement
      */
-    public function __invoke (array $args = []): Statement {
+    public function __invoke(array $args = []): Statement {
         return $this->execute($args);
     }
 
@@ -114,7 +114,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->alias;
     }
 
@@ -124,7 +124,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(*)';
         return (int)$clone->execute($args)->fetchColumn();
@@ -136,7 +136,7 @@ 
      * @param array $args
      * @return Statement
      */
-    public function execute (array $args = []): Statement {
+    public function execute(array $args = []): Statement {
         if (!empty($args)) {
             return $this->prepare()->__invoke($args);
         }
@@ -151,7 +151,7 @@ 
      * @param array $args Execution arguments.
      * @return array
      */
-    public function fetchAll (array $args = []): array {
+    public function fetchAll(array $args = []): array {
         return iterator_to_array($this->fetcher->__invoke($this->execute($args)));
     }
 
@@ -164,7 +164,7 @@ 
      * @param array $args Execution arguments.
      * @return Generator
      */
-    public function fetchEach (array $args = []) {
+    public function fetchEach(array $args = []) {
         yield from $this->fetcher->__invoke($this->execute($args));
     }
 
@@ -175,7 +175,7 @@ 
      *
      * @return Generator
      */
-    public function getIterator () {
+    public function getIterator() {
         yield from $this->fetchEach();
     }
 
@@ -185,7 +185,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}";
         }
@@ -201,7 +201,7 @@ 
      * @param string $condition
      * @return $this
      */
-    public function having (string $condition) {
+    public function having(string $condition) {
         if (!strlen($this->_having)) {
             $this->_having = " HAVING {$condition}";
         }
@@ -219,7 +219,7 @@ 
      * @param string $type
      * @return $this
      */
-    public function join ($table, string $condition, string $type = 'INNER') {
+    public function join($table, string $condition, string $type = 'INNER') {
         if ($table instanceof Select) {
             $table = $table->toSubquery();
         }
@@ -234,7 +234,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 = '';
         }
@@ -253,7 +253,7 @@ 
      * @param string $name Name or alias if used.
      * @return bool
      */
-    public function offsetExists ($name): bool {
+    public function offsetExists($name): bool {
         return true;
     }
 
@@ -263,7 +263,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);
     }
 
@@ -273,7 +273,7 @@ 
      * @param string $order
      * @return $this
      */
-    public function order (string $order) {
+    public function order(string $order) {
         if (strlen($order)) {
             $order = " ORDER BY {$order}";
         }
@@ -284,7 +284,7 @@ 
     /**
      * @return Statement
      */
-    public function prepare (): Statement {
+    public function prepare(): Statement {
         return $this->db->prepare($this->toSql());
     }
 
@@ -292,7 +292,7 @@ 
      * @param Closure $fetcher
      * @return $this
      */
-    public function setFetcher (Closure $fetcher) {
+    public function setFetcher(Closure $fetcher) {
         $this->fetcher = $fetcher;
         return $this;
     }
@@ -300,7 +300,7 @@ 
     /**
      * @return string
      */
-    public function toSql (): string {
+    public function toSql(): string {
         $sql = "SELECT {$this->_columns} FROM {$this->table}";
         $sql .= $this->_join;
         $sql .= $this->_where;
@@ -316,7 +316,7 @@ 
      *
      * @return string
      */
-    public function toSubquery (): string {
+    public function toSubquery(): string {
         return "({$this->toSql()}) AS {$this->alias}";
     }
 
@@ -326,7 +326,7 @@ 
      * @param string $condition
      * @return $this
      */
-    public function where (string $condition) {
+    public function where(string $condition) {
         if (!strlen($this->_where)) {
             $this->_where = " WHERE {$condition}";
         }

src/DB/EAV.php

Spacing +7 added lines, -7 removed lines

@@ -19,7 +19,7 @@ 
      * @param Record $record The entity's storage access.
      * @param $name
      */
-    public function __construct (Record $record, $name) {
+    public function __construct(Record $record, $name) {
         $this->record = $record;
         parent::__construct($record->db, $name, ['entity', 'attribute', 'value']);
     }
@@ -30,7 +30,7 @@ 
      * @param int $id
      * @return int
      */
-    public function count (int $id): int {
+    public function count(int $id): int {
         $count = $this->cache(__FUNCTION__, function() {
             return $this->select(['COUNT(*)'])->where('entity=?')->prepare();
         });
@@ -44,7 +44,7 @@ 
      * @param string $attribute
      * @return bool
      */
-    public function exists (int $id, string $attribute): bool {
+    public function exists(int $id, string $attribute): bool {
         $exists = $this->cache(__FUNCTION__, function() {
             $select = $this->select(['COUNT(*) > 0']);
             $select->where('entity = ? AND attribute = ?');
@@ -62,7 +62,7 @@ 
      * @param array $match `[attribute => value]`. If empty, selects all IDs for entities having at least one attribute.
      * @return Select
      */
-    public function find (array $match): Select {
+    public function find(array $match): Select {
         $select = $this->select([$this['entity']]);
         $prior = $this;
         foreach ($match as $attribute => $value) {
@@ -84,7 +84,7 @@ 
      * @param int $id
      * @return array `[attribute => value]`
      */
-    public function load (int $id): array {
+    public function load(int $id): array {
         $load = $this->cache(__FUNCTION__, function() {
             $select = $this->select(['attribute', 'value']);
             $select->where('entity = ?');
@@ -100,7 +100,7 @@ 
      * @param int[] $ids
      * @return array[] `[id => attribute => value]
      */
-    public function loadAll (array $ids): array {
+    public function loadAll(array $ids): array {
         if (empty($ids)) {
             return [];
         }
@@ -125,7 +125,7 @@ 
      * @param array $values `[attribute => value]`
      * @return $this
      */
-    public function save (int $id, array $values) {
+    public function save(int $id, array $values) {
         $this->delete([
             $this['entity']->isEqual($id),
             $this['attribute']->isNotEqual(array_keys($values))

src/DB/Junction.php

Spacing +9 added lines, -9 removed lines

@@ -28,7 +28,7 @@ 
      * @param string $interface
      * @return Junction
      */
-    public static function fromInterface (DB $db, string $interface) {
+    public static function fromInterface(DB $db, string $interface) {
         try {
             $ref = new ReflectionClass($interface);
         }
@@ -51,7 +51,7 @@ 
      * @param string $table
      * @param string[] $keys Columns, keyed by class.
      */
-    public function __construct (DB $db, string $table, array $keys) {
+    public function __construct(DB $db, string $table, array $keys) {
         parent::__construct($db, $table, $keys);
         $this->keys = $keys;
     }
@@ -62,7 +62,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} = ?")->prepare();
@@ -79,7 +79,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[$class]->isEqual($record['id']));
@@ -93,7 +93,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);
         }
@@ -111,7 +111,7 @@ 
      * @param EntityInterface[] $entities
      * @return int Rows affected.
      */
-    public function link (array $entities): int {
+    public function link(array $entities): int {
         $link = $this->cache(__FUNCTION__, function() {
             $slots = implode(',', SQL::slots($this->keys));
             $columns = implode(',', $this->keys);
@@ -133,7 +133,7 @@ 
      * @param string $name
      * @return bool
      */
-    public function offsetExists ($name): bool {
+    public function offsetExists($name): bool {
         return isset($this->columns[$name]) or isset($this->keys[$name]);
     }
 
@@ -143,7 +143,7 @@ 
      * @param string $name
      * @return Column
      */
-    public function offsetGet ($name): Column {
+    public function offsetGet($name): Column {
         return $this->columns[$name] ?? $this->columns[$this->keys[$name]];
     }
 
@@ -156,7 +156,7 @@ 
      * @param EntityInterface[] $entities
      * @return int Rows affected.
      */
-    public function unlink (array $entities): int {
+    public function unlink(array $entities): int {
         $unlink = $this->cache(__FUNCTION__, function() {
             $slots = Predicate::all(SQL::slotsEqual($this->keys));
             return $this->db->prepare("DELETE FROM {$this} WHERE {$slots}");

Braces +1 added lines, -2 removed lines

@@ -31,8 +31,7 @@
     public static function fromInterface (DB $db, string $interface) {
         try {
             $ref = new ReflectionClass($interface);
-        }
-        catch (ReflectionException $exception) {
+        } catch (ReflectionException $exception) {
             throw new LogicException('Unexpected ReflectionException', 0, $exception);
         }
         $doc = $ref->getDocComment();

src/DB/Record.php

Spacing +17 added lines, -17 removed lines

@@ -59,7 +59,7 @@ 
      * @param string|EntityInterface $class
      * @return Record
      */
-    public static function fromClass (DB $db, $class) {
+    public static function fromClass(DB $db, $class) {
         try {
             $rClass = new ReflectionClass($class);
         }
@@ -92,7 +92,7 @@ 
      * @param string[] $columns Property names.
      * @param string[] $eav Table names, 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;
         try {
@@ -125,7 +125,7 @@ 
      * @param Statement $statement
      * @return EntityInterface[] Enumerated
      */
-    public function fetchAll (Statement $statement): array {
+    public function fetchAll(Statement $statement): array {
         return iterator_to_array($this->fetchEach($statement));
     }
 
@@ -136,7 +136,7 @@ 
      * @param Statement $statement
      * @return Generator
      */
-    public function fetchEach (Statement $statement) {
+    public function fetchEach(Statement $statement) {
         do {
             $entities = [];
             for ($i = 0; $i < 256 and false !== $row = $statement->fetch(); $i++) {
@@ -159,7 +159,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));
@@ -175,14 +175,14 @@ 
      * @param string $property
      * @return EAV
      */
-    final public function getEav (string $property): EAV {
+    final public function getEav(string $property): EAV {
         return $this->eav[$property];
     }
 
     /**
      * @return EntityInterface
      */
-    public function getProto (): EntityInterface {
+    public function getProto(): EntityInterface {
         return $this->proto;
     }
 
@@ -190,7 +190,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);
@@ -204,7 +204,7 @@ 
      * @param int $id
      * @return null|EntityInterface
      */
-    public function load (int $id): ?EntityInterface {
+    public function load(int $id): ?EntityInterface {
         $load = $this->cache(__FUNCTION__, function() {
             return $this->select(array_keys($this->columns))->where('id = ?')->prepare();
         });
@@ -222,7 +222,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) {
@@ -239,7 +239,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);
         }
@@ -253,7 +253,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);
@@ -268,7 +268,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']);
@@ -286,7 +286,7 @@ 
      *
      * @param EntityInterface $entity
      */
-    protected function saveUpdate (EntityInterface $entity): void {
+    protected function saveUpdate(EntityInterface $entity): void {
         $this->cache(__FUNCTION__, function() {
             $slots = SQL::slotsEqual(array_keys($this->columns));
             unset($slots['id']);
@@ -301,7 +301,7 @@ 
      * @param array $columns Defaults to all columns.
      * @return Select
      */
-    public function select (array $columns = []): Select {
+    public function select(array $columns = []): Select {
         return parent::select($columns)->setFetcher(function(Statement $statement) {
             yield from $this->fetchEach($statement);
         });
@@ -311,7 +311,7 @@ 
      * @param EntityInterface $proto
      * @return $this
      */
-    public function setProto (EntityInterface $proto) {
+    public function setProto(EntityInterface $proto) {
         $this->proto = $proto;
         return $this;
     }
@@ -320,7 +320,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 +4 added lines, -8 removed lines

@@ -62,8 +62,7 @@ 
     public static function fromClass (DB $db, $class) {
         try {
             $rClass = new ReflectionClass($class);
-        }
-        catch (ReflectionException $exception) {
+        } catch (ReflectionException $exception) {
             throw new LogicException('Unexpected ReflectionException', 0, $exception);
         }
         $columns = [];
@@ -73,8 +72,7 @@ 
             $name = $rProp->getName();
             if (preg_match('/@col(umn)?[\s$]/', $doc)) {
                 $columns[] = $name;
-            }
-            elseif (preg_match('/@eav\s+(?<table>\S+)/', $doc, $match)) {
+            } elseif (preg_match('/@eav\s+(?<table>\S+)/', $doc, $match)) {
                 $eav[$name] = $match['table'];
             }
         }
@@ -113,8 +111,7 @@ 
                 $this->properties[$name] = $rProp;
                 $this->eav[$name] = new EAV($this, $table);
             }
-        }
-        catch (ReflectionException $exception) {
+        } catch (ReflectionException $exception) {
             throw new LogicException('Unexpected ReflectionException', 0, $exception);
         }
     }
@@ -242,8 +239,7 @@ 
     public function save (EntityInterface $entity): int {
         if (!$entity->getId()) {
             $this->saveInsert($entity);
-        }
-        else {
+        } else {
             $this->saveUpdate($entity);
         }
         $this->saveEav($entity);