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

Braces +1 added lines, -2 removed lines

@@ -157,8 +157,7 @@
             if ($this->isSQLite()) {
                 $info = $this->query("PRAGMA table_info({$this->quote($name)})")->fetchAll();
                 $cols = array_column($info, 'name');
-            }
-            else {
+            } else {
                 $cols = $this->query(
                     "SELECT column_name FROM information_schema.tables WHERE table_name = {$this->quote($name)}"
                 )->fetchAll(self::FETCH_COLUMN);

Spacing +31 added lines, -31 removed lines

@@ -62,7 +62,7 @@ 
      * @param string $password
      * @param array $options
      */
-    public function __construct ($dsn, $username = null, $password = null, array $options = []) {
+    public function __construct($dsn, $username = null, $password = null, array $options = []) {
         $options += [
             self::ATTR_STATEMENT_CLASS => [Statement::class, [$this]]
         ];
@@ -76,7 +76,7 @@ 
 
         if ($this->isSQLite()) {
             // polyfill sqlite functions
-            $this->sqliteCreateFunctions([ // deterministic functions
+            $this->sqliteCreateFunctions([// deterministic functions
                 // https://www.sqlite.org/lang_mathfunc.html
                 'ACOS' => 'acos',
                 'ASIN' => 'asin',
@@ -102,7 +102,7 @@ 
                 'SIGN' => fn($x) => ($x > 0) - ($x < 0),
             ]);
 
-            $this->sqliteCreateFunctions([ // non-deterministic
+            $this->sqliteCreateFunctions([// non-deterministic
                 'RAND' => fn() => mt_rand(0, 1),
             ], false);
         }
@@ -113,7 +113,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->driver;
     }
 
@@ -123,7 +123,7 @@ 
      * @param string $sql
      * @return int
      */
-    public function exec ($sql): int {
+    public function exec($sql): int {
         $this->logger->__invoke($sql);
         return parent::exec($sql);
     }
@@ -139,14 +139,14 @@ 
      * @param mixed ...$args
      * @return mixed
      */
-    public function factory (string $class, ...$args) {
+    public function factory(string $class, ...$args) {
         return new $class($this, ...$args);
     }
 
     /**
      * @return string
      */
-    final public function getDriver (): string {
+    final public function getDriver(): string {
         return $this->driver;
     }
 
@@ -156,14 +156,14 @@ 
      * @param string $interface
      * @return Junction
      */
-    public function getJunction ($interface) {
+    public function getJunction($interface) {
         return $this->junctions[$interface] ??= Junction::fromInterface($this, $interface);
     }
 
     /**
      * @return Closure
      */
-    public function getLogger () {
+    public function getLogger() {
         return $this->logger;
     }
 
@@ -173,7 +173,7 @@ 
      * @param string|EntityInterface $class
      * @return Record
      */
-    public function getRecord ($class) {
+    public function getRecord($class) {
         if (is_object($class)) {
             $class = get_class($class);
         }
@@ -184,7 +184,7 @@ 
      * @param string $name
      * @return null|Table
      */
-    public function getTable (string $name) {
+    public function getTable(string $name) {
         if (!isset($this->tables[$name])) {
             if ($this->isSQLite()) {
                 $info = $this->query("PRAGMA table_info({$this->quote($name)})")->fetchAll();
@@ -206,21 +206,21 @@ 
     /**
      * @return bool
      */
-    final public function isMySQL (): bool {
+    final public function isMySQL(): bool {
         return $this->driver === 'mysql';
     }
 
     /**
      * @return bool
      */
-    final public function isPostgreSQL (): bool {
+    final public function isPostgreSQL(): bool {
         return $this->driver === 'pgsql';
     }
 
     /**
      * @return bool
      */
-    final public function isSQLite (): bool {
+    final public function isSQLite(): bool {
         return $this->driver === 'sqlite';
     }
 
@@ -241,7 +241,7 @@ 
      * @param mixed $b
      * @return Predicate
      */
-    public function match ($a, $b) {
+    public function match($a, $b) {
         if ($b instanceof Closure) {
             return $b->__invoke($a, $this);
         }
@@ -263,7 +263,7 @@ 
      * @param string $table
      * @return bool
      */
-    final public function offsetExists ($table): bool {
+    final public function offsetExists($table): bool {
         return (bool)$this->getTable($table);
     }
 
@@ -273,7 +273,7 @@ 
      * @param string $table
      * @return null|Table
      */
-    final public function offsetGet ($table) {
+    final public function offsetGet($table) {
         return $this->getTable($table);
     }
 
@@ -282,7 +282,7 @@ 
      * @param $value
      * @throws LogicException
      */
-    final public function offsetSet ($offset, $value) {
+    final public function offsetSet($offset, $value) {
         throw new LogicException('Raw table access is immutable.');
     }
 
@@ -290,7 +290,7 @@ 
      * @param $offset
      * @throws LogicException
      */
-    final public function offsetUnset ($offset) {
+    final public function offsetUnset($offset) {
         throw new LogicException('Raw table access is immutable.');
     }
 
@@ -299,7 +299,7 @@ 
      *
      * @return Num
      */
-    public function pi () {
+    public function pi() {
         return Num::factory($this, "PI()");
     }
 
@@ -310,7 +310,7 @@ 
      * @param array $options
      * @return Statement
      */
-    public function prepare ($sql, $options = []) {
+    public function prepare($sql, $options = []) {
         $this->logger->__invoke($sql);
         /** @var Statement $statement */
         $statement = parent::prepare($sql, $options);
@@ -326,7 +326,7 @@ 
      * @param array $ctorargs Optional.
      * @return Statement
      */
-    public function query ($sql, $mode = PDO::ATTR_DEFAULT_FETCH_MODE, $arg3 = null, array $ctorargs = []) {
+    public function query($sql, $mode = PDO::ATTR_DEFAULT_FETCH_MODE, $arg3 = null, array $ctorargs = []) {
         $this->logger->__invoke($sql);
         /** @var Statement $statement */
         $statement = parent::query(...func_get_args());
@@ -344,7 +344,7 @@ 
      * @param int $type Ignored.
      * @return string|ExpressionInterface
      */
-    public function quote ($value, $type = self::PARAM_STR) {
+    public function quote($value, $type = self::PARAM_STR) {
         if ($value instanceof ExpressionInterface) {
             return $value;
         }
@@ -364,7 +364,7 @@ 
      * @param array $values
      * @return string[]
      */
-    public function quoteArray (array $values) {
+    public function quoteArray(array $values) {
         return array_map([$this, 'quote'], $values);
     }
 
@@ -374,7 +374,7 @@ 
      * @param array $values
      * @return string
      */
-    public function quoteList (array $values): string {
+    public function quoteList(array $values): string {
         return implode(',', $this->quoteArray($values));
     }
 
@@ -383,7 +383,7 @@ 
      *
      * @return Num
      */
-    public function rand () {
+    public function rand() {
         return Num::factory($this, "RAND()");
     }
 
@@ -393,7 +393,7 @@ 
      * @param EntityInterface $entity
      * @return int ID
      */
-    public function save (EntityInterface $entity): int {
+    public function save(EntityInterface $entity): int {
         return $this->getRecord($entity)->save($entity);
     }
 
@@ -402,7 +402,7 @@ 
      * @param Junction $junction
      * @return $this
      */
-    public function setJunction (string $interface, Junction $junction) {
+    public function setJunction(string $interface, Junction $junction) {
         $this->junctions[$interface] = $junction;
         return $this;
     }
@@ -411,7 +411,7 @@ 
      * @param Closure $logger
      * @return $this
      */
-    public function setLogger (Closure $logger) {
+    public function setLogger(Closure $logger) {
         $this->logger = $logger;
         return $this;
     }
@@ -421,7 +421,7 @@ 
      * @param Record $record
      * @return $this
      */
-    public function setRecord (string $class, Record $record) {
+    public function setRecord(string $class, Record $record) {
         $this->records[$class] = $record;
         return $this;
     }
@@ -430,7 +430,7 @@ 
      * @param callable[] $callbacks Keyed by function name.
      * @param bool $deterministic Whether the callbacks aren't random / are without side-effects.
      */
-    public function sqliteCreateFunctions (array $callbacks, bool $deterministic = true): void {
+    public function sqliteCreateFunctions(array $callbacks, bool $deterministic = true): void {
         $deterministic = $deterministic ? self::SQLITE_DETERMINISTIC : 0;
         foreach ($callbacks as $name => $callback) {
             $argc = (new ReflectionFunction($callback))->getNumberOfRequiredParameters();

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