hfw / db

src/DB/SQL/ComparisonTrait.php

Braces +1 added lines, -2 removed lines

@@ -64,8 +64,7 @@
         }
         if ($arg === null or is_bool($arg)) {
             $arg = ['' => 'NULL', 1 => 'TRUE', 0 => 'FALSE'][$arg];
-        }
-        else {
+        } else {
             $arg = $this->db->quote($arg);
         }
         if ($this->db->isMySQL()) {

Spacing +19 added lines, -19 removed lines

@@ -26,7 +26,7 @@ 
      * @param array $values
      * @return Value
      */
-    public function coalesce (array $values) {
+    public function coalesce(array $values) {
         array_unshift($values, $this);
         $values = $this->db->quoteList($values);
         return $this->db->factory(Value::class, $this->db, "COALESCE({$values})");
@@ -38,7 +38,7 @@ 
      * @param array $values `[when => then]`
      * @return Choice
      */
-    public function getChoice (array $values) {
+    public function getChoice(array $values) {
         return $this->db->factory(Choice::class, $this->db, "{$this}", $values);
     }
 
@@ -51,7 +51,7 @@ 
      * @param null|bool|number|string|Select $arg
      * @return Predicate
      */
-    public function is ($arg): Predicate {
+    public function is($arg): Predicate {
         if ($arg instanceof Select) {
             if ($this->db->isSQLite()) {
                 /** @var Select $sub */
@@ -79,7 +79,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 $this->db->factory(Predicate::class, "{$this} BETWEEN {$min} AND {$max}");
@@ -91,7 +91,7 @@ 
      * @param bool|number|string|array|Select $arg
      * @return Predicate
      */
-    public function isEqual ($arg) {
+    public function isEqual($arg) {
         return $this->db->match($this, $arg);
     }
 
@@ -100,7 +100,7 @@ 
      *
      * @return Predicate
      */
-    public function isFalse () {
+    public function isFalse() {
         return $this->db->factory(Predicate::class, "{$this} IS FALSE");
     }
 
@@ -116,7 +116,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) {
             switch ($this->db) {
                 case 'sqlite':
@@ -147,7 +147,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) {
             switch ($this->db) {
                 case 'sqlite':
@@ -178,7 +178,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) {
             switch ($this->db) {
                 case 'sqlite':
@@ -209,7 +209,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) {
             switch ($this->db) {
                 case 'sqlite':
@@ -234,7 +234,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isLike (string $pattern) {
+    public function isLike(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return $this->db->factory(Predicate::class, "{$this} LIKE {$pattern}");
     }
@@ -245,7 +245,7 @@ 
      * @param null|bool|number|string|Select $arg
      * @return Predicate
      */
-    public function isNot ($arg) {
+    public function isNot($arg) {
         return $this->is($arg)->not();
     }
 
@@ -256,7 +256,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 $this->db->factory(Predicate::class, "{$this} NOT BETWEEN {$min} AND {$max}");
@@ -268,7 +268,7 @@ 
      * @param bool|number|string|array|Select $arg
      * @return Predicate
      */
-    public function isNotEqual ($arg) {
+    public function isNotEqual($arg) {
         if ($arg instanceof Select) {
             return $this->db->factory(Predicate::class, "{$this} NOT IN ({$arg->toSql()})");
         }
@@ -284,7 +284,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isNotLike (string $pattern) {
+    public function isNotLike(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return $this->db->factory(Predicate::class, "{$this} NOT LIKE {$pattern}");
     }
@@ -294,7 +294,7 @@ 
      *
      * @return Predicate
      */
-    public function isNotNull () {
+    public function isNotNull() {
         return $this->db->factory(Predicate::class, "{$this} IS NOT NULL");
     }
 
@@ -304,7 +304,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isNotRegExp (string $pattern) {
+    public function isNotRegExp(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return $this->db->factory(Predicate::class, "{$this} NOT REGEXP {$pattern}");
     }
@@ -314,7 +314,7 @@ 
      *
      * @return Predicate
      */
-    public function isNull () {
+    public function isNull() {
         return $this->db->factory(Predicate::class, "{$this} IS NULL");
     }
 
@@ -324,7 +324,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isRegExp (string $pattern) {
+    public function isRegExp(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return $this->db->factory(Predicate::class, "{$this} REGEXP {$pattern}");
     }

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

@@ -73,8 +73,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()] = $db->factory(EAV::class, $db, $attr['table']);
                 }
             }
@@ -241,8 +240,7 @@ 
     public function save (EntityInterface $entity): int {
         if (!$entity->getId()) {
             $this->saveInsert($entity);
-        }
-        else {
+        } else {
             $this->saveUpdate($entity);
         }
         $this->saveEav($entity);

src/DB/Table.php

Spacing +13 added lines, -13 removed lines

@@ -39,7 +39,7 @@ 
      * @param string $name
      * @param string[] $columns
      */
-    public function __construct (DB $db, $name, array $columns) {
+    public function __construct(DB $db, $name, array $columns) {
         parent::__construct($db);
         $this->name = $name;
         foreach ($columns as $column) {
@@ -52,7 +52,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->name;
     }
 
@@ -62,7 +62,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);
         switch ($this->db) {
@@ -84,7 +84,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] ?? $this->_cache[$key] = $prepare->__invoke();
     }
 
@@ -92,7 +92,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));
@@ -108,7 +108,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);
         }
@@ -119,14 +119,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;
     }
 
@@ -136,7 +136,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)");
@@ -146,7 +146,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;
         }
@@ -159,7 +159,7 @@ 
      * @param string[] $columns Defaults to all columns.
      * @return Select
      */
-    public function select (array $columns = []) {
+    public function select(array $columns = []) {
         if (empty($columns)) {
             $columns = $this->columns;
         }
@@ -172,7 +172,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) {
@@ -190,7 +190,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/SQL/Predicate.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
      *
      * @return Predicate
      */
-    public function not () {
+    public function not() {
         return new static("NOT({$this})");
     }