hfw / db

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