hfw / db

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

src/DB/SQL/AggregateTrait.php

Spacing +9 added lines, -9 removed lines

@@ -14,7 +14,7 @@ 
      *
      * @return Num
      */
-    public function avg () {
+    public function avg() {
         return Num::factory($this->db, "AVG({$this})");
     }
 
@@ -23,7 +23,7 @@ 
      *
      * @return Num
      */
-    public function avgDistinct () {
+    public function avgDistinct() {
         return Num::factory($this->db, "AVG(DISTINCT {$this})");
     }
 
@@ -32,7 +32,7 @@ 
      *
      * @return Num
      */
-    public function count () {
+    public function count() {
         return Num::factory($this->db, "COUNT({$this})");
     }
 
@@ -41,7 +41,7 @@ 
      *
      * @return Num
      */
-    public function countDistinct () {
+    public function countDistinct() {
         return Num::factory($this->db, "COUNT(DISTINCT {$this})");
     }
 
@@ -51,7 +51,7 @@ 
      * @param string $delimiter
      * @return Text
      */
-    public function groupConcat (string $delimiter = ',') {
+    public function groupConcat(string $delimiter = ',') {
         $delimiter = $this->db->quote($delimiter);
         if ($this->db->isSQLite()) {
             return Text::factory($this->db, "GROUP_CONCAT({$this},{$delimiter})");
@@ -64,7 +64,7 @@ 
      *
      * @return Num
      */
-    public function max () {
+    public function max() {
         return Num::factory($this->db, "MAX({$this})");
     }
 
@@ -73,7 +73,7 @@ 
      *
      * @return Num
      */
-    public function min () {
+    public function min() {
         return Num::factory($this->db, "MIN({$this})");
     }
 
@@ -82,7 +82,7 @@ 
      *
      * @return Num
      */
-    public function sum () {
+    public function sum() {
         return Num::factory($this->db, "SUM({$this})");
     }
 
@@ -91,7 +91,7 @@ 
      *
      * @return Num
      */
-    public function sumDistinct () {
+    public function sumDistinct() {
         return Num::factory($this->db, "SUM(DISTINCT {$this})");
     }
 }
\ No newline at end of file

src/DB/SQL/TextTrait.php

Spacing +8 added lines, -8 removed lines

@@ -16,7 +16,7 @@ 
      *
      * @return Text
      */
-    public function hex () {
+    public function hex() {
         return Text::factory($this->db, "HEX({$this})");
     }
 
@@ -27,7 +27,7 @@ 
      *
      * @return Num
      */
-    public function length () {
+    public function length() {
         if ($this->db->isSQLite()) {
             return Num::factory($this->db, "LENGTH(CAST({$this} AS TEXT))");
         }
@@ -41,7 +41,7 @@ 
      *
      * @return Text
      */
-    public function lower () {
+    public function lower() {
         return Text::factory($this->db, "LOWER({$this})");
     }
 
@@ -53,7 +53,7 @@ 
      * @param string $substring
      * @return Num
      */
-    public function position (string $substring) {
+    public function position(string $substring) {
         $substring = $this->db->quote($substring);
         if ($this->db->isSQLite()) {
             return Num::factory($this->db, "INSTR({$this},{$substring})");
@@ -70,7 +70,7 @@ 
      * @param string $replace
      * @return Text
      */
-    public function replace (string $search, string $replace) {
+    public function replace(string $search, string $replace) {
         $search = $this->db->quote($search);
         $replace = $this->db->quote($replace);
         return Text::factory($this->db, "REPLACE({$this},{$search},{$replace})");
@@ -81,7 +81,7 @@ 
      *
      * @return Num
      */
-    public function size () {
+    public function size() {
         if ($this->db->isSQLite()) {
             return Num::factory($this->db, "LENGTH(CAST({$this} AS BLOB))");
         }
@@ -97,7 +97,7 @@ 
      * @param null|int $length
      * @return Text
      */
-    public function substr (int $start, int $length = null) {
+    public function substr(int $start, int $length = null) {
         if (isset($length)) {
             return Text::factory($this->db, "SUBSTR({$this},{$start},{$length})");
         }
@@ -111,7 +111,7 @@ 
      *
      * @return Text
      */
-    public function upper () {
+    public function upper() {
         return Text::factory($this->db, "UPPER({$this})");
     }
 }
\ No newline at end of file

src/DB/SQL/NumTrait.php

Spacing +29 added lines, -29 removed lines

@@ -14,7 +14,7 @@ 
      *
      * @return Num
      */
-    public function abs () {
+    public function abs() {
         return Num::factory($this->db, "ABS({$this})");
     }
 
@@ -23,7 +23,7 @@ 
      *
      * @return Num
      */
-    public function acos () {
+    public function acos() {
         return Num::factory($this->db, "ACOS({$this})");
     }
 
@@ -33,7 +33,7 @@ 
      * @param number|ValueInterface $arg
      * @return Num
      */
-    public function add ($arg) {
+    public function add($arg) {
         $arg = $this->db->quote($arg);
         return Num::factory($this->db, "({$this} + {$arg})");
     }
@@ -43,7 +43,7 @@ 
      *
      * @return Num
      */
-    public function asin () {
+    public function asin() {
         return Num::factory($this->db, "ASIN({$this})");
     }
 
@@ -52,7 +52,7 @@ 
      *
      * @return Num
      */
-    public function atan () {
+    public function atan() {
         return Num::factory($this->db, "ATAN({$this})");
     }
 
@@ -61,7 +61,7 @@ 
      *
      * @return Num
      */
-    public function ceil () {
+    public function ceil() {
         return Num::factory($this->db, "CEIL({$this})");
     }
 
@@ -70,7 +70,7 @@ 
      *
      * @return Num
      */
-    public function cos () {
+    public function cos() {
         return Num::factory($this->db, "COS({$this})");
     }
 
@@ -81,7 +81,7 @@ 
      *
      * @return Num
      */
-    public function degrees () {
+    public function degrees() {
         return Num::factory($this->db, "DEGREES({$this})");
     }
 
@@ -91,7 +91,7 @@ 
      * @param number|ValueInterface $arg
      * @return Num
      */
-    public function div ($arg) {
+    public function div($arg) {
         $arg = $this->db->quote($arg);
         return Num::factory($this->db, "({$this} / {$arg})");
     }
@@ -103,7 +103,7 @@ 
      *
      * @return Num
      */
-    public function exp () {
+    public function exp() {
         return Num::factory($this->db, "EXP({$this})");
     }
 
@@ -112,7 +112,7 @@ 
      *
      * @return Num
      */
-    public function floor () {
+    public function floor() {
         return Num::factory($this->db, "FLOOR({$this})");
     }
 
@@ -121,7 +121,7 @@ 
      *
      * @return Predicate
      */
-    public function isEven () {
+    public function isEven() {
         return Predicate::factory($this->db, "({$this} % 2) = 0");
     }
 
@@ -130,7 +130,7 @@ 
      *
      * @return Predicate
      */
-    public function isNegative () {
+    public function isNegative() {
         return Predicate::factory($this->db, "{$this} < 0");
     }
 
@@ -139,7 +139,7 @@ 
      *
      * @return Predicate
      */
-    public function isOdd () {
+    public function isOdd() {
         return Predicate::factory($this->db, "({$this} % 2) <> 0");
     }
 
@@ -148,7 +148,7 @@ 
      *
      * @return Predicate
      */
-    public function isPositive () {
+    public function isPositive() {
         return Predicate::factory($this->db, "{$this} > 0");
     }
 
@@ -157,7 +157,7 @@ 
      *
      * @return Num
      */
-    public function ln () {
+    public function ln() {
         return Num::factory($this->db, "LN({$this})");
     }
 
@@ -169,7 +169,7 @@ 
      * @param float $base
      * @return Num
      */
-    public function log (float $base) {
+    public function log(float $base) {
         return Num::factory($this->db, "LOG({$base},{$this})");
     }
 
@@ -178,7 +178,7 @@ 
      *
      * @return Num
      */
-    public function log10 () {
+    public function log10() {
         return Num::factory($this->db, "LOG10({$this})");
     }
 
@@ -187,7 +187,7 @@ 
      *
      * @return Num
      */
-    public function log2 () {
+    public function log2() {
         return Num::factory($this->db, "LOG2({$this})");
     }
 
@@ -197,7 +197,7 @@ 
      * @param float $divisor
      * @return Num
      */
-    public function mod (float $divisor) {
+    public function mod(float $divisor) {
         return Num::factory($this->db, "({$this} % {$divisor})");
     }
 
@@ -207,7 +207,7 @@ 
      * @param number|ValueInterface $arg
      * @return Num
      */
-    public function mul ($arg) {
+    public function mul($arg) {
         $arg = $this->db->quote($arg);
         return Num::factory($this->db, "({$this} * {$arg})");
     }
@@ -218,7 +218,7 @@ 
      * @param float $exponent
      * @return Num
      */
-    public function pow (float $exponent) {
+    public function pow(float $exponent) {
         return Num::factory($this->db, "POW({$this},{$exponent})");
     }
 
@@ -229,7 +229,7 @@ 
      *
      * @return Num
      */
-    public function radians () {
+    public function radians() {
         return Num::factory($this->db, "RADIANS({$this})");
     }
 
@@ -239,7 +239,7 @@ 
      * @param int $decimals
      * @return Num
      */
-    public function round (int $decimals = 0) {
+    public function round(int $decimals = 0) {
         return Num::factory($this->db, "ROUND({$this},{$decimals})");
     }
 
@@ -248,7 +248,7 @@ 
      *
      * @return Num `-1`, `0`, `1`
      */
-    public function sign () {
+    public function sign() {
         return Num::factory($this->db, "SIGN({$this})");
     }
 
@@ -257,7 +257,7 @@ 
      *
      * @return Num
      */
-    public function sin () {
+    public function sin() {
         return Num::factory($this->db, "SIN({$this})");
     }
 
@@ -266,7 +266,7 @@ 
      *
      * @return Num
      */
-    public function sqrt () {
+    public function sqrt() {
         return Num::factory($this->db, "SQRT({$this})");
     }
 
@@ -276,7 +276,7 @@ 
      * @param number|ValueInterface $arg
      * @return Num
      */
-    public function sub ($arg) {
+    public function sub($arg) {
         $arg = $this->db->quote($arg);
         return Num::factory($this->db, "({$this} - {$arg})");
     }
@@ -286,7 +286,7 @@ 
      *
      * @return Num
      */
-    public function tan () {
+    public function tan() {
         return Num::factory($this->db, "TAN({$this})");
     }
 }
\ No newline at end of file