hfw / db

src/DB/SQL/Predicate.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
      *
      * @return static
      */
-    public function not () {
+    public function not() {
         return static::factory($this->db, "NOT({$this})");
     }
 

src/DB/SQL/Expression.php

Spacing +2 added lines, -2 removed lines

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

src/DB/FactoryTrait.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
      * @param array $args The first argument must be a {@link DB} instance.
      * @return static
      */
-    public static function __callStatic (string $ignored, array $args) {
+    public static function __callStatic(string $ignored, array $args) {
         /** @var DB $db */
         $db = $args[0];
         unset($args[0]);

src/DB/EAV.php

Spacing +6 added lines, -6 removed lines

@@ -15,7 +15,7 @@ 
      * @param DB $db
      * @param string $name
      */
-    public function __construct (DB $db, string $name) {
+    public function __construct(DB $db, string $name) {
         parent::__construct($db, $name, ['entity', 'attribute', 'value']);
     }
 
@@ -26,7 +26,7 @@ 
      * @param string $attribute
      * @return bool
      */
-    public function exists (int $id, string $attribute): bool {
+    public function exists(int $id, string $attribute): bool {
         $statement = $this->cache(__FUNCTION__, function() {
             return $this->select(['COUNT(*) > 0'])->where('entity = ? AND attribute = ?')->prepare();
         });
@@ -44,7 +44,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) {
@@ -66,7 +66,7 @@ 
      * @param int $id
      * @return array `[attribute => value]`
      */
-    public function load (int $id): array {
+    public function load(int $id): array {
         $statement = $this->cache(__FUNCTION__, function() {
             $select = $this->select(['attribute', 'value']);
             $select->where('entity = ?');
@@ -82,7 +82,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 [];
         }
@@ -107,7 +107,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/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[]
      */
-    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;
     }
 
@@ -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 Defaults to all columns.
      * @return Select|array[]
      */
-    public function select (array $columns = []) {
+    public function select(array $columns = []) {
         if (empty($columns)) {
             $columns = $this->columns;
         }
@@ -173,7 +173,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) {
@@ -191,7 +191,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/Record.php

Braces +3 added lines, -6 removed lines

@@ -75,8 +75,7 @@ 
             foreach ($rClass->getProperties() as $rProp) {
                 if (preg_match('/@col(umn)?[\s$]/', $rProp->getDocComment())) {
                     $columns[] = $rProp->getName();
-                }
-                elseif (preg_match('/@eav\s+(?<table>\S+)/', $rProp->getDocComment(), $attr)) {
+                } elseif (preg_match('/@eav\s+(?<table>\S+)/', $rProp->getDocComment(), $attr)) {
                     $eav[$rProp->getName()] = EAV::factory($db, $attr['table']);
                 }
             }
@@ -254,8 +253,7 @@ 
     public function save (EntityInterface $entity): int {
         if (!$entity->getId()) {
             $this->saveInsert($entity);
-        }
-        else {
+        } else {
             $this->saveUpdate($entity);
         }
         $this->saveEav($entity);
@@ -341,8 +339,7 @@ 
             if (isset($this->properties[$name])) {
                 settype($value, $this->types[$name]);
                 $this->properties[$name]->setValue($entity, $value);
-            }
-            else {
+            } else {
                 $entity->{$name} = $value;
             }
         }

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(array_keys($this->columns))->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]);

src/DB/Column.php

Spacing +7 added lines, -7 removed lines

@@ -43,7 +43,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;
@@ -54,7 +54,7 @@ 
      *
      * @return string
      */
-    public function __toString () {
+    public function __toString() {
         if (strlen($this->qualifier)) {
             return "{$this->qualifier}.{$this->name}";
         }
@@ -64,14 +64,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;
     }
 
@@ -80,7 +80,7 @@ 
      *
      * @return Select|scalar[]
      */
-    public function select () {
+    public function select() {
         return Select::factory($this->db, $this->qualifier, [$this->name])
             ->setFetcher(function(Statement $statement) {
                 while (false !== $value = $statement->fetchColumn()) {
@@ -93,7 +93,7 @@ 
      * @param string $name
      * @return $this
      */
-    public function setName (string $name) {
+    public function setName(string $name) {
         $clone = clone $this;
         $clone->name = $name;
         return $clone;
@@ -103,7 +103,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/AbstractTrait.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     /**
      * @return string
      */
-    abstract public function __toString ();
+    abstract public function __toString();
 
     /**
      * @var DB

src/DB/SQL/DateTimeTrait.php

Spacing +14 added lines, -14 removed lines

@@ -19,7 +19,7 @@ 
      *
      * @return Text
      */
-    public function date () {
+    public function date() {
         return Text::factory($this->db, $this->dateFormat('%Y-%m-%d'));
     }
 
@@ -29,7 +29,7 @@ 
      * @param string|string[] $format Format, or formats keyed by driver name.
      * @return Text
      */
-    public function dateFormat ($format) {
+    public function dateFormat($format) {
         if (is_array($format)) {
             $format = $format[$this->db->getDriver()];
         }
@@ -45,7 +45,7 @@ 
      *
      * @return Text
      */
-    public function datetime () {
+    public function datetime() {
         return Text::factory($this->db, $this->dateFormat([
             'mysql' => '%Y-%m-%d %H:%i:%S',
             'sqlite' => '%Y-%m-%d %H:%M:%S'
@@ -57,7 +57,7 @@ 
      *
      * @return Num
      */
-    public function day () {
+    public function day() {
         return Num::factory($this->db, $this->dateFormat('%d'));
     }
 
@@ -66,7 +66,7 @@ 
      *
      * @return Num
      */
-    public function dayOfWeek () {
+    public function dayOfWeek() {
         return Num::factory($this->db, $this->dateFormat('%w'));
     }
 
@@ -75,7 +75,7 @@ 
      *
      * @return Num
      */
-    public function dayOfYear () {
+    public function dayOfYear() {
         return Num::factory($this->db, $this->dateFormat('%j'));
     }
 
@@ -84,7 +84,7 @@ 
      *
      * @return Num
      */
-    public function hours () {
+    public function hours() {
         return Num::factory($this->db, $this->dateFormat('%H'));
     }
 
@@ -93,7 +93,7 @@ 
      *
      * @return Num
      */
-    public function minutes () {
+    public function minutes() {
         return Num::factory($this->db, $this->dateFormat([
             'mysql' => '%i',
             'sqlite' => '%M'
@@ -105,7 +105,7 @@ 
      *
      * @return Num
      */
-    public function month () {
+    public function month() {
         return Num::factory($this->db, $this->dateFormat('%m'));
     }
 
@@ -114,7 +114,7 @@ 
      *
      * @return Num
      */
-    public function seconds () {
+    public function seconds() {
         return Num::factory($this->db, $this->dateFormat('%S'));
     }
 
@@ -123,7 +123,7 @@ 
      *
      * @return Text
      */
-    public function time () {
+    public function time() {
         return Text::factory($this->db, $this->dateFormat([
             'mysql' => '%H:%i:%S',
             'sqlite' => '%H:%M:%S'
@@ -135,7 +135,7 @@ 
      *
      * @return Num
      */
-    public function timestamp () {
+    public function timestamp() {
         if ($this->db->isSQLite()) {
             return Num::factory($this->db, "STRFTIME('%s',{$this})");
         }
@@ -147,7 +147,7 @@ 
      *
      * @return Num
      */
-    public function weekOfYear () {
+    public function weekOfYear() {
         return Num::factory($this->db, $this->dateFormat([
             'mysql' => '%U',
             'sqlite' => '%W'
@@ -159,7 +159,7 @@ 
      *
      * @return Num
      */
-    public function year () {
+    public function year() {
         return Num::factory($this->db, $this->dateFormat('%Y'));
     }
 }
\ No newline at end of file