hfw / db

src/DB/Record.php

Spacing +17 added lines, -17 removed lines

@@ -64,7 +64,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 = [];
@@ -93,7 +93,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) {
@@ -130,7 +130,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));
@@ -148,7 +148,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));
     }
 
@@ -159,7 +159,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++) {
@@ -176,14 +176,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;
     }
 
@@ -191,7 +191,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);
@@ -205,7 +205,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();
         });
@@ -223,7 +223,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) {
@@ -238,7 +238,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);
         }
@@ -252,7 +252,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
@@ -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);

Braces +2 added lines, -4 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']);
                 }
             }
@@ -243,8 +242,7 @@ 
     public function save (EntityInterface $entity): int {
         if (!$entity->getId()) {
             $this->saveInsert($entity);
-        }
-        else {
+        } else {
             $this->saveUpdate($entity);
         }
         $this->saveEav($entity);

src/DB/SQL/Choice.php

Braces +3 added lines, -1 removed lines

@@ -85,8 +85,10 @@
      * @param string|ValueInterface $else
      * @return $this
      */
-    public function else ($else) {
+    public function else {
+        ($else) {
         $this->else = isset($else) ? $this->db->quote($else) : null;
+    }
         return $this;
     }
 

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 () {
+    public function __toString() {
         $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.php

Spacing +5 added lines, -5 removed lines

@@ -18,11 +18,11 @@ 
      * @param int|array|Countable $count
      * @return ExpressionInterface[]
      */
-    public static function marks ($count): array {
+    public static function marks($count): array {
         static $mark;
         $mark ??= new class implements ExpressionInterface {
 
-            public function __toString () {
+            public function __toString() {
                 return '?';
             }
         };
@@ -41,7 +41,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[$column] = ':' . str_replace('.', '__', $column);
@@ -53,7 +53,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}";
@@ -61,6 +61,6 @@ 
         return $slots;
     }
 
-    final private function __construct () {
+    final private function __construct() {
     }
 }
\ No newline at end of file

src/DB/SQL/DateTimeTrait.php

Spacing +14 added lines, -14 removed lines

@@ -9,7 +9,7 @@ 
  */
 trait DateTimeTrait {
 
-    abstract public function __toString ();
+    abstract public function __toString();
 
     /**
      * @var DB
@@ -21,7 +21,7 @@ 
      *
      * @return Text
      */
-    public function getDate () {
+    public function getDate() {
         return Text::factory($this->db, $this->getDateTimeFormat('%Y-%m-%d'));
     }
 
@@ -31,7 +31,7 @@ 
      * @param string|array $format Format, or formats keyed by driver name.
      * @return Text
      */
-    public function getDateTimeFormat ($format) {
+    public function getDateTimeFormat($format) {
         if (is_array($format)) {
             $format = $format[$this->db->getDriver()];
         }
@@ -47,7 +47,7 @@ 
      *
      * @return Numeric
      */
-    public function getDay () {
+    public function getDay() {
         return Numeric::factory($this->db, $this->getDateTimeFormat('%d'));
     }
 
@@ -56,7 +56,7 @@ 
      *
      * @return Numeric
      */
-    public function getDayOfWeek () {
+    public function getDayOfWeek() {
         return Numeric::factory($this->db, $this->getDateTimeFormat('%w'));
     }
 
@@ -65,7 +65,7 @@ 
      *
      * @return Numeric
      */
-    public function getDayOfYear () {
+    public function getDayOfYear() {
         return Numeric::factory($this->db, $this->getDateTimeFormat('%j'));
     }
 
@@ -74,7 +74,7 @@ 
      *
      * @return Numeric
      */
-    public function getHours () {
+    public function getHours() {
         return Numeric::factory($this->db, $this->getDateTimeFormat('%H'));
     }
 
@@ -83,7 +83,7 @@ 
      *
      * @return Numeric
      */
-    public function getMinutes () {
+    public function getMinutes() {
         return Numeric::factory($this->db, $this->getDateTimeFormat([
             'mysql' => '%i',
             'sqlite' => '%M'
@@ -95,7 +95,7 @@ 
      *
      * @return Numeric
      */
-    public function getMonth () {
+    public function getMonth() {
         return Numeric::factory($this->db, $this->getDateTimeFormat('%m'));
     }
 
@@ -104,7 +104,7 @@ 
      *
      * @return Numeric
      */
-    public function getSeconds () {
+    public function getSeconds() {
         return Numeric::factory($this->db, $this->getDateTimeFormat('%S'));
     }
 
@@ -113,7 +113,7 @@ 
      *
      * @return Text
      */
-    public function getTime () {
+    public function getTime() {
         return Text::factory($this->db, $this->getDateTimeFormat([
             'mysql' => '%H:%i:%S',
             'sqlite' => '%H:%M:%S'
@@ -125,7 +125,7 @@ 
      *
      * @return Numeric
      */
-    public function getTimestamp () {
+    public function getTimestamp() {
         if ($this->db->isSQLite()) {
             return Numeric::factory($this->db, "STRFTIME('%s',{$this})");
         }
@@ -137,7 +137,7 @@ 
      *
      * @return Numeric
      */
-    public function getWeekOfYear () {
+    public function getWeekOfYear() {
         return Numeric::factory($this->db, $this->getDateTimeFormat([
             'mysql' => '%U',
             'sqlite' => '%W'
@@ -149,7 +149,7 @@ 
      *
      * @return Numeric
      */
-    public function getYear () {
+    public function getYear() {
         return Numeric::factory($this->db, $this->getDateTimeFormat('%Y'));
     }
 }
\ No newline at end of file

src/DB/SQL/Text.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
      *
      * @return Numeric
      */
-    public function toFloat () {
+    public function toFloat() {
         if ($this->db->isSQLite()) {
             return Numeric::factory($this->db, "CAST({$this} AS REAL)");
         }
@@ -26,7 +26,7 @@ 
      *
      * @return Numeric
      */
-    public function toInt () {
+    public function toInt() {
         if ($this->db->isSQLite()) {
             return Numeric::factory($this->db, "CAST({$this} AS INTEGER)");
         }

src/DB/SQL/NumericTrait.php

Spacing +15 added lines, -15 removed lines

@@ -9,7 +9,7 @@ 
  */
 trait NumericTrait {
 
-    abstract public function __toString ();
+    abstract public function __toString();
 
     /**
      * @var DB
@@ -21,7 +21,7 @@ 
      *
      * @return Numeric
      */
-    public function abs () {
+    public function abs() {
         return Numeric::factory($this->db, "ABS({$this})");
     }
 
@@ -31,7 +31,7 @@ 
      * @param number|ValueInterface $arg
      * @return Numeric
      */
-    public function add ($arg) {
+    public function add($arg) {
         return Numeric::factory($this->db, "({$this} + {$arg})");
     }
 
@@ -40,7 +40,7 @@ 
      *
      * @return Numeric
      */
-    public function ceil () {
+    public function ceil() {
         return Numeric::factory($this->db, "CEIL({$this})");
     }
 
@@ -50,7 +50,7 @@ 
      * @param number|ValueInterface $arg
      * @return Numeric
      */
-    public function divide ($arg) {
+    public function divide($arg) {
         return Numeric::factory($this->db, "({$this} / {$arg})");
     }
 
@@ -59,7 +59,7 @@ 
      *
      * @return Numeric
      */
-    public function floor () {
+    public function floor() {
         return Numeric::factory($this->db, "FLOOR({$this})");
     }
 
@@ -68,7 +68,7 @@ 
      *
      * @return Predicate
      */
-    public function isEven () {
+    public function isEven() {
         return Predicate::factory($this->db, "({$this} % 2) = 0");
     }
 
@@ -77,7 +77,7 @@ 
      *
      * @return Predicate
      */
-    public function isNegative () {
+    public function isNegative() {
         return Predicate::factory($this->db, "{$this} < 0");
     }
 
@@ -86,7 +86,7 @@ 
      *
      * @return Predicate
      */
-    public function isOdd () {
+    public function isOdd() {
         return Predicate::factory($this->db, "({$this} % 2) <> 0");
     }
 
@@ -95,7 +95,7 @@ 
      *
      * @return Predicate
      */
-    public function isPositive () {
+    public function isPositive() {
         return Predicate::factory($this->db, "{$this} > 0");
     }
 
@@ -105,7 +105,7 @@ 
      * @param number|ValueInterface $arg
      * @return Numeric
      */
-    public function modulo ($arg) {
+    public function modulo($arg) {
         return Numeric::factory($this->db, "({$this} % {$arg})");
     }
 
@@ -115,7 +115,7 @@ 
      * @param number|ValueInterface $arg
      * @return Numeric
      */
-    public function multiply ($arg) {
+    public function multiply($arg) {
         return Numeric::factory($this->db, "({$this} * {$arg})");
     }
 
@@ -125,7 +125,7 @@ 
      * @param number|ValueInterface $exponent
      * @return Numeric
      */
-    public function pow ($exponent) {
+    public function pow($exponent) {
         return Numeric::factory($this->db, "POW({$this},{$exponent})");
     }
 
@@ -135,7 +135,7 @@ 
      * @param int $decimals
      * @return Numeric
      */
-    public function round (int $decimals = 0) {
+    public function round(int $decimals = 0) {
         return Numeric::factory($this->db, "ROUND({$this},{$decimals})");
     }
 
@@ -145,7 +145,7 @@ 
      * @param number|ValueInterface $arg
      * @return Numeric
      */
-    public function subtract (ValueInterface $arg) {
+    public function subtract(ValueInterface $arg) {
         return Numeric::factory($this->db, "({$this} - {$arg})");
     }
 }
\ No newline at end of file

src/DB/SQL/Numeric.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
      *
      * @return Text
      */
-    public function toText () {
+    public function toText() {
         if ($this->db->isSQLite()) {
             return Text::factory($this->db, "CAST({$this} AS TEXT)");
         }

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