hfw / db

src/DB/Junction.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,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);
         }
@@ -54,7 +54,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;
     }
@@ -68,7 +68,7 @@ 
      * @param array $match Keyed by junction column.
      * @return Select|EntityInterface[]
      */
-    public function find (string $key, array $match = []) {
+    public function find(string $key, array $match = []) {
         $record = $this->db->getRecord($this->classes[$key]);
         $select = $record->loadAll();
         $select->join($this, $this[$key]->isEqual($record['id']));
@@ -84,7 +84,7 @@ 
      * @param int[] $ids Keyed by column.
      * @return int Rows affected.
      */
-    public function link (array $ids): int {
+    public function link(array $ids): int {
         $statement = $this->cache(__FUNCTION__, function() {
             $columns = implode(',', array_keys($this->columns));
             $slots = implode(',', SQL::slots(array_keys($this->columns)));
@@ -108,7 +108,7 @@ 
      * @param array $ids Keyed by Column
      * @return int Rows affected
      */
-    public function unlink (array $ids): int {
+    public function unlink(array $ids): int {
         return $this->delete($ids);
     }
 }
\ No newline at end of file

src/DB/Record.php

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

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

Spacing +4 added lines, -4 removed lines

@@ -59,7 +59,7 @@ 
      * @param null|string $subject
      * @param array $values `[when => then]` for the subject.
      */
-    public function __construct (DB $db, string $subject = null, array $values = []) {
+    public function __construct(DB $db, string $subject = null, array $values = []) {
         parent::__construct($db, '');
         $this->subject = $subject;
         $this->whenValues($values);
@@ -68,7 +68,7 @@ 
     /**
      * @return string
      */
-    public function __toString (): string {
+    public function __toString(): string {
         $sql = 'CASE';
         if (isset($this->subject)) {
             $sql .= " {$this->subject}";
@@ -99,7 +99,7 @@ 
      * @param string|ValueInterface $then
      * @return $this
      */
-    public function when ($expression, $then) {
+    public function when($expression, $then) {
         $this->values[$this->db->quote($expression)] = $this->db->quote($then);
         return $this;
     }
@@ -113,7 +113,7 @@ 
      * @param array $values `[when => then]`
      * @return $this
      */
-    public function whenValues (array $values) {
+    public function whenValues(array $values) {
         foreach ($values as $when => $then) {
             $this->when($when, $then);
         }

src/DB/SQL/NumTrait.php

Spacing +14 added lines, -14 removed lines

@@ -14,7 +14,7 @@ 
      *
      * @return Num
      */
-    public function abs () {
+    public function abs() {
         return Num::factory($this->db, "ABS({$this})");
     }
 
@@ -24,7 +24,7 @@ 
      * @param number|ValueInterface $arg
      * @return Num
      */
-    public function add ($arg) {
+    public function add($arg) {
         return Num::factory($this->db, "({$this} + {$arg})");
     }
 
@@ -33,7 +33,7 @@ 
      *
      * @return Num
      */
-    public function ceil () {
+    public function ceil() {
         return Num::factory($this->db, "CEIL({$this})");
     }
 
@@ -43,7 +43,7 @@ 
      * @param number|ValueInterface $arg
      * @return Num
      */
-    public function divide ($arg) {
+    public function divide($arg) {
         return Num::factory($this->db, "({$this} / {$arg})");
     }
 
@@ -52,7 +52,7 @@ 
      *
      * @return Num
      */
-    public function floor () {
+    public function floor() {
         return Num::factory($this->db, "FLOOR({$this})");
     }
 
@@ -61,7 +61,7 @@ 
      *
      * @return Predicate
      */
-    public function isEven () {
+    public function isEven() {
         return Predicate::factory($this->db, "({$this} % 2) = 0");
     }
 
@@ -70,7 +70,7 @@ 
      *
      * @return Predicate
      */
-    public function isNegative () {
+    public function isNegative() {
         return Predicate::factory($this->db, "{$this} < 0");
     }
 
@@ -79,7 +79,7 @@ 
      *
      * @return Predicate
      */
-    public function isOdd () {
+    public function isOdd() {
         return Predicate::factory($this->db, "({$this} % 2) <> 0");
     }
 
@@ -88,7 +88,7 @@ 
      *
      * @return Predicate
      */
-    public function isPositive () {
+    public function isPositive() {
         return Predicate::factory($this->db, "{$this} > 0");
     }
 
@@ -98,7 +98,7 @@ 
      * @param number|ValueInterface $arg
      * @return Num
      */
-    public function mod ($arg) {
+    public function mod($arg) {
         return Num::factory($this->db, "({$this} % {$arg})");
     }
 
@@ -108,7 +108,7 @@ 
      * @param number|ValueInterface $arg
      * @return Num
      */
-    public function multiply ($arg) {
+    public function multiply($arg) {
         return Num::factory($this->db, "({$this} * {$arg})");
     }
 
@@ -118,7 +118,7 @@ 
      * @param number|ValueInterface $exponent
      * @return Num
      */
-    public function pow ($exponent) {
+    public function pow($exponent) {
         return Num::factory($this->db, "POW({$this},{$exponent})");
     }
 
@@ -128,7 +128,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})");
     }
 
@@ -138,7 +138,7 @@ 
      * @param number|ValueInterface $arg
      * @return Num
      */
-    public function subtract (ValueInterface $arg) {
+    public function subtract(ValueInterface $arg) {
         return Num::factory($this->db, "({$this} - {$arg})");
     }
 }
\ No newline at end of file

src/DB/SQL/ComparisonTrait.php

Spacing +17 added lines, -17 removed lines

@@ -25,7 +25,7 @@ 
      * @param null|scalar|Select $arg
      * @return Predicate
      */
-    public function is ($arg): Predicate {
+    public function is($arg): Predicate {
         if ($arg instanceof Select) {
             if ($this->db->isSQLite()) {
                 return Select::factory($this->db, $arg, [$arg[0]])
@@ -53,7 +53,7 @@ 
      * @param number $max
      * @return Predicate
      */
-    public function isBetween ($min, $max) {
+    public function isBetween($min, $max) {
         $min = $this->db->quote($min);
         $max = $this->db->quote($max);
         return Predicate::factory($this->db, "{$this} BETWEEN {$min} AND {$max}");
@@ -65,7 +65,7 @@ 
      * @param scalar|array|Select $arg
      * @return Predicate
      */
-    public function isEqual ($arg) {
+    public function isEqual($arg) {
         return $this->db->match($this, $arg);
     }
 
@@ -74,7 +74,7 @@ 
      *
      * @return Predicate
      */
-    public function isFalse () {
+    public function isFalse() {
         return Predicate::factory($this->db, "{$this} IS FALSE");
     }
 
@@ -90,7 +90,7 @@ 
      * @param string $multi `ALL|ANY`
      * @return Predicate
      */
-    public function isGreater ($arg, string $multi = 'ALL') {
+    public function isGreater($arg, string $multi = 'ALL') {
         if ($arg instanceof Select) {
             if ($this->db->isSQLite()) {
                 $sub = Select::factory($this->db, $arg, [$arg[0]]);
@@ -116,7 +116,7 @@ 
      * @param string $multi `ALL|ANY`
      * @return Predicate
      */
-    public function isGreaterOrEqual ($arg, string $multi = 'ALL') {
+    public function isGreaterOrEqual($arg, string $multi = 'ALL') {
         if ($arg instanceof Select) {
             if ($this->db->isSQLite()) {
                 $sub = Select::factory($this->db, $arg, [$arg[0]]);
@@ -142,7 +142,7 @@ 
      * @param string $multi `ALL|ANY`
      * @return Predicate
      */
-    public function isLess ($arg, string $multi = 'ALL') {
+    public function isLess($arg, string $multi = 'ALL') {
         if ($arg instanceof Select) {
             if ($this->db->isSQLite()) {
                 $sub = Select::factory($this->db, $arg, [$arg[0]]);
@@ -168,7 +168,7 @@ 
      * @param string $multi `ALL|ANY`
      * @return Predicate
      */
-    public function isLessOrEqual ($arg, string $multi = 'ALL') {
+    public function isLessOrEqual($arg, string $multi = 'ALL') {
         if ($arg instanceof Select) {
             if ($this->db->isSQLite()) {
                 $sub = Select::factory($this->db, $arg, [$arg[0]]);
@@ -188,7 +188,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isLike (string $pattern) {
+    public function isLike(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return Predicate::factory($this->db, "{$this} LIKE {$pattern}");
     }
@@ -199,7 +199,7 @@ 
      * @param null|scalar|Select $arg
      * @return Predicate
      */
-    public function isNot ($arg) {
+    public function isNot($arg) {
         return $this->is($arg)->not();
     }
 
@@ -210,7 +210,7 @@ 
      * @param number $max
      * @return Predicate
      */
-    public function isNotBetween ($min, $max) {
+    public function isNotBetween($min, $max) {
         $min = $this->db->quote($min);
         $max = $this->db->quote($max);
         return Predicate::factory($this->db, "{$this} NOT BETWEEN {$min} AND {$max}");
@@ -222,7 +222,7 @@ 
      * @param scalar|array|Select $arg
      * @return Predicate
      */
-    public function isNotEqual ($arg) {
+    public function isNotEqual($arg) {
         if ($arg instanceof Select) {
             return Predicate::factory($this->db, "{$this} NOT IN ({$arg->toSql()})");
         }
@@ -238,7 +238,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isNotLike (string $pattern) {
+    public function isNotLike(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return Predicate::factory($this->db, "{$this} NOT LIKE {$pattern}");
     }
@@ -248,7 +248,7 @@ 
      *
      * @return Predicate
      */
-    public function isNotNull () {
+    public function isNotNull() {
         return Predicate::factory($this->db, "{$this} IS NOT NULL");
     }
 
@@ -258,7 +258,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isNotRegExp (string $pattern) {
+    public function isNotRegExp(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return Predicate::factory($this->db, "{$this} NOT REGEXP {$pattern}");
     }
@@ -268,7 +268,7 @@ 
      *
      * @return Predicate
      */
-    public function isNull () {
+    public function isNull() {
         return Predicate::factory($this->db, "{$this} IS NULL");
     }
 
@@ -278,7 +278,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isRegExp (string $pattern) {
+    public function isRegExp(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return Predicate::factory($this->db, "{$this} REGEXP {$pattern}");
     }