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

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
      * @param int|array|Countable $count
      * @return ExpressionInterface[]
      */
-    public static function marks ($count): array {
+    public static function marks($count): array {
         if (is_array($count) or $count instanceof Countable) {
             $count = count($count);
         }
@@ -34,7 +34,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);
@@ -46,7 +46,7 @@ 
      * @param string[] $columns
      * @return string[] `["column" => "column=:column"]`
      */
-    public static function slotsEqual (array $columns): array {
+    public static function slotsEqual(array $columns): array {
         $slots = static::slots($columns);
         foreach ($slots as $column => $slot) {
             $slots[$column] = "{$column} = {$slot}";
@@ -54,5 +54,5 @@ 
         return $slots;
     }
 
-    final private function __construct () { }
+    final private function __construct() { }
 }
\ No newline at end of file

src/DB/Column.php

Spacing +6 added lines, -6 removed lines

@@ -38,7 +38,7 @@ 
      * @param string $name
      * @param string $qualifier
      */
-    public function __construct (DB $db, string $name, string $qualifier = '') {
+    public function __construct(DB $db, string $name, string $qualifier = '') {
         $this->db = $db;
         $this->name = $name;
         $this->qualifier = $qualifier;
@@ -49,7 +49,7 @@ 
      *
      * @return string
      */
-    public function __toString (): string {
+    public function __toString(): string {
         if (strlen($this->qualifier)) {
             return "{$this->qualifier}.{$this->name}";
         }
@@ -59,14 +59,14 @@ 
     /**
      * @return string
      */
-    final public function getName (): string {
+    final public function getName(): string {
         return $this->name;
     }
 
     /**
      * @return string
      */
-    final public function getQualifier (): string {
+    final public function getQualifier(): string {
         return $this->qualifier;
     }
 
@@ -74,7 +74,7 @@ 
      * @param string $name
      * @return $this
      */
-    public function setName (string $name) {
+    public function setName(string $name) {
         $clone = clone $this;
         $clone->name = $name;
         return $clone;
@@ -84,7 +84,7 @@ 
      * @param string $qualifier
      * @return $this
      */
-    public function setQualifier (string $qualifier) {
+    public function setQualifier(string $qualifier) {
         $clone = clone $this;
         $clone->qualifier = $qualifier;
         return $clone;

src/DB/SQL/PredicateTrait.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
      *
      * @return Predicate
      */
-    public function isFalse () {
+    public function isFalse() {
         return new Predicate("{$this} IS FALSE");
     }
 
@@ -21,7 +21,7 @@ 
      *
      * @return Predicate
      */
-    public function isNotNull () {
+    public function isNotNull() {
         return new Predicate("{$this} IS NOT NULL");
     }
 
@@ -30,7 +30,7 @@ 
      *
      * @return Predicate
      */
-    public function isNull () {
+    public function isNull() {
         return new Predicate("{$this} IS NULL");
     }
 }
\ No newline at end of file

src/DB/SQL/Expression.php

Spacing +2 added lines, -2 removed lines

@@ -15,14 +15,14 @@
     /**
      * @param string $expression
      */
-    public function __construct (string $expression) {
+    public function __construct(string $expression) {
         $this->expression = $expression;
     }
 
     /**
      * @return string
      */
-    public function __toString () {
+    public function __toString() {
         return $this->expression;
     }
 }
\ No newline at end of file

src/DB/Junction.php

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();

Spacing +4 added lines, -4 removed lines

@@ -29,7 +29,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);
         }
@@ -52,7 +52,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;
     }
@@ -66,7 +66,7 @@ 
      * @param array $match Keyed by junction column.
      * @return Select
      */
-    public function getCollection (string $key, array $match = []) {
+    public function getCollection(string $key, array $match = []) {
         $record = $this->db->getRecord($this->classes[$key]);
         $select = $record->select();
         $select->join($this, $this[$key]->isEqual($record['id']));
@@ -82,7 +82,7 @@ 
      * @param int[] $ids Keyed by column.
      * @return int Rows affected.
      */
-    public function link (array $ids): int {
+    public function link(array $ids): int {
         $link = $this->cache(__FUNCTION__, function() {
             $columns = implode(',', array_keys($this->columns));
             $slots = implode(',', SQL::slots(array_keys($this->columns)));

src/DB/EAV.php

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
      * @param DB $db
      * @param $name
      */
-    public function __construct (DB $db, $name) {
+    public function __construct(DB $db, $name) {
         parent::__construct($db, $name, ['entity', 'attribute', 'value']);
     }
 
@@ -25,7 +25,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 = ?');
@@ -43,7 +43,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) {
+    public function find(array $match) {
         $select = $this->select([$this['entity']]);
         $prior = $this;
         foreach ($match as $attribute => $value) {
@@ -65,7 +65,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 = ?');
@@ -81,7 +81,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 [];
         }
@@ -106,7 +106,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/Record.php

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, $attr)) {
+            } elseif (preg_match('/@eav\s+(?<table>\S+)/', $doc, $attr)) {
                 $eav[$name] = new EAV($db, $attr['table']);
             }
         }
@@ -113,8 +111,7 @@ 
                 $rProp->setAccessible(true);
                 $this->properties[$name] = $rProp;
             }
-        }
-        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);

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 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;
         try {
@@ -128,7 +128,7 @@ 
      * @param array[] $eavMatch `[eav property => attribute => mixed]`
      * @return Select
      */
-    public function find (array $match, array $eavMatch = []) {
+    public function find(array $match, array $eavMatch = []) {
         $select = $this->select();
         foreach ($match as $a => $b) {
             $select->where($this->db->match($this[$a] ?? $a, $b));
@@ -146,7 +146,7 @@ 
      * @param Statement $statement
      * @return EntityInterface[] Enumerated
      */
-    public function getAll (Statement $statement): array {
+    public function getAll(Statement $statement): array {
         return iterator_to_array($this->getEach($statement));
     }
 
@@ -157,7 +157,7 @@ 
      * @param Statement $statement
      * @return Generator
      */
-    public function getEach (Statement $statement) {
+    public function getEach(Statement $statement) {
         do {
             $entities = [];
             for ($i = 0; $i < 256 and false !== $row = $statement->fetch(); $i++) {
@@ -175,14 +175,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;
     }
 
@@ -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) {
+    public function load(int $id) {
         $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 = []) {
+    public function select(array $columns = []) {
         $select = parent::select($columns);
         if (empty($columns)) {
             $select->setFetcher(function(Statement $statement) {
@@ -315,7 +315,7 @@ 
      * @param EntityInterface $proto
      * @return $this
      */
-    public function setProto (EntityInterface $proto) {
+    public function setProto(EntityInterface $proto) {
         $this->proto = $proto;
         return $this;
     }
@@ -324,7 +324,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);