hfw / db

bin/helix.db.migrate.php

Indentation +1 added lines, -1 removed lines

@@ -99,4 +99,4 @@
 }
 
 $current = $current ?: 'NONE';
-$stdout("Current Migration State: \"{$current}\"");
+$stdout("Current Migration State: \"{$current}
\ No newline at end of file

Switch Indentation +1 added lines, -1 removed lines

@@ -99,4 +99,4 @@
 }
 
 $current = $current ?: 'NONE';
-$stdout("Current Migration State: \"{$current}\"");
+$stdout("Current Migration State: \"{$current}
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -99,4 +99,4 @@
 }
 
 $current = $current ?: 'NONE';
-$stdout("Current Migration State: \"{$current}\"");
+$stdout("Current Migration State: \"{$current}
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -99,4 +99,4 @@
 }
 
 $current = $current ?: 'NONE';
-$stdout("Current Migration State: \"{$current}\"");
+$stdout("Current Migration State: \"{$current}
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -99,4 +99,4 @@
 }
 
 $current = $current ?: 'NONE';
-$stdout("Current Migration State: \"{$current}\"");
+$stdout("Current Migration State: \"{$current}
\ No newline at end of file

src/DB.php

Spacing +42 added lines, -42 removed lines

@@ -83,7 +83,7 @@ 
      * @param string $file
      * @return static
      */
-    public static function fromConfig (string $connection = 'default', string $file = 'db.config.php') {
+    public static function fromConfig(string $connection = 'default', string $file = 'db.config.php') {
         $config = (include "{$file}")[$connection];
         $args = [
             $config['dsn'],
@@ -103,11 +103,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 '?';
             }
         };
@@ -125,7 +125,7 @@ 
      * @param string[] $columns
      * @return string[] `["column" => ":column"]`
      */
-    public static function slots (array $columns): array {
+    public static function slots(array $columns): array {
         return array_combine($columns, array_map(function(string $column) {
             return ':' . str_replace('.', '__', $column);
         }, $columns));
@@ -135,7 +135,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}";
@@ -153,7 +153,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]];
         parent::__construct($dsn, $username, $password, $options);
         $this->setAttribute(self::ATTR_DEFAULT_FETCH_MODE, self::FETCH_ASSOC);
@@ -166,7 +166,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',
@@ -192,7 +192,7 @@ 
                 'SIGN' => fn($x) => ($x > 0) - ($x < 0),
             ]);
 
-            $this->sqliteCreateFunctions([ // non-deterministic
+            $this->sqliteCreateFunctions([// non-deterministic
                 'RAND' => fn() => mt_rand() / mt_getrandmax(),
             ], false);
         }
@@ -203,7 +203,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->driver;
     }
 
@@ -214,7 +214,7 @@ 
      *
      * @return true
      */
-    public function beginTransaction () {
+    public function beginTransaction() {
         assert($this->transactions >= 0);
         if ($this->transactions === 0) {
             $this->logger->__invoke("BEGIN TRANSACTION");
@@ -234,7 +234,7 @@ 
      *
      * @return true
      */
-    public function commit () {
+    public function commit() {
         assert($this->transactions > 0);
         if ($this->transactions === 1) {
             $this->logger->__invoke("COMMIT TRANSACTION");
@@ -254,7 +254,7 @@ 
      * @param string $sql
      * @return int
      */
-    public function exec ($sql): int {
+    public function exec($sql): int {
         $this->logger->__invoke($sql);
         return parent::exec($sql);
     }
@@ -270,14 +270,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;
     }
 
@@ -287,14 +287,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;
     }
 
@@ -302,7 +302,7 @@ 
      * @param string $dir
      * @return Migrator
      */
-    public function getMigrator () {
+    public function getMigrator() {
         return Migrator::factory($this, $this->migrations);
     }
 
@@ -312,7 +312,7 @@ 
      * @param string|EntityInterface $class
      * @return Record
      */
-    public function getRecord ($class) {
+    public function getRecord($class) {
         if (is_object($class)) {
             $class = get_class($class);
         }
@@ -322,28 +322,28 @@ 
     /**
      * @return Schema
      */
-    public function getSchema () {
+    public function getSchema() {
         return $this->schema;
     }
 
     /**
      * @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';
     }
 
@@ -366,7 +366,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);
         }
@@ -387,7 +387,7 @@ 
      *
      * @return Transaction
      */
-    public function newTransaction () {
+    public function newTransaction() {
         return Transaction::factory($this);
     }
 
@@ -397,7 +397,7 @@ 
      * @param string $table
      * @return bool
      */
-    final public function offsetExists ($table): bool {
+    final public function offsetExists($table): bool {
         return (bool)$this->offsetGet($table);
     }
 
@@ -407,7 +407,7 @@ 
      * @param string $table
      * @return null|Table
      */
-    public function offsetGet ($table) {
+    public function offsetGet($table) {
         return $this->schema->getTable($table);
     }
 
@@ -416,7 +416,7 @@ 
      * @param $value
      * @throws LogicException
      */
-    final public function offsetSet ($offset, $value) {
+    final public function offsetSet($offset, $value) {
         throw new LogicException('The schema cannot be altered this way.');
     }
 
@@ -424,7 +424,7 @@ 
      * @param $offset
      * @throws LogicException
      */
-    final public function offsetUnset ($offset) {
+    final public function offsetUnset($offset) {
         throw new LogicException('The schema cannot be altered this way.');
     }
 
@@ -433,7 +433,7 @@ 
      *
      * @return Num
      */
-    public function pi () {
+    public function pi() {
         return Num::factory($this, "PI()");
     }
 
@@ -444,7 +444,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);
@@ -460,7 +460,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());
@@ -478,7 +478,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;
         }
@@ -498,7 +498,7 @@ 
      * @param array $values
      * @return string[]
      */
-    public function quoteArray (array $values) {
+    public function quoteArray(array $values) {
         return array_map([$this, 'quote'], $values);
     }
 
@@ -508,7 +508,7 @@ 
      * @param array $values
      * @return string
      */
-    public function quoteList (array $values): string {
+    public function quoteList(array $values): string {
         return implode(',', $this->quoteArray($values));
     }
 
@@ -517,7 +517,7 @@ 
      *
      * @return Num
      */
-    public function rand () {
+    public function rand() {
         return Num::factory($this, "RAND()");
     }
 
@@ -528,7 +528,7 @@ 
      *
      * @return true
      */
-    public function rollBack () {
+    public function rollBack() {
         assert($this->transactions > 0);
         if ($this->transactions === 1) {
             $this->logger->__invoke("ROLLBACK TRANSACTION");
@@ -548,7 +548,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);
     }
 
@@ -557,7 +557,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;
     }
@@ -566,7 +566,7 @@ 
      * @param Closure $logger
      * @return $this
      */
-    public function setLogger (Closure $logger) {
+    public function setLogger(Closure $logger) {
         $this->logger = $logger;
         return $this;
     }
@@ -576,7 +576,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;
     }
@@ -585,7 +585,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();
@@ -601,7 +601,7 @@ 
      * @param callable $work
      * @return mixed The return value of `$work`
      */
-    public function transact (callable $work) {
+    public function transact(callable $work) {
         $transaction = $this->newTransaction();
         $return = call_user_func($work);
         $transaction->commit();

Braces +3 added lines, -6 removed lines

@@ -219,8 +219,7 @@ 
         if ($this->transactions === 0) {
             $this->logger->__invoke("BEGIN TRANSACTION");
             parent::beginTransaction();
-        }
-        else {
+        } else {
             $this->exec("SAVEPOINT SAVEPOINT_{$this->transactions}");
         }
         $this->transactions++;
@@ -239,8 +238,7 @@ 
         if ($this->transactions === 1) {
             $this->logger->__invoke("COMMIT TRANSACTION");
             parent::commit();
-        }
-        else {
+        } else {
             $savepoint = $this->transactions - 1;
             $this->exec("RELEASE SAVEPOINT SAVEPOINT_{$savepoint}");
         }
@@ -533,8 +531,7 @@ 
         if ($this->transactions === 1) {
             $this->logger->__invoke("ROLLBACK TRANSACTION");
             parent::rollBack();
-        }
-        else {
+        } else {
             $savepoint = $this->transactions - 1;
             $this->exec("ROLLBACK TO SAVEPOINT SAVEPOINT_{$savepoint}");
         }

src/DB/Migrator.php

Spacing +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
      * @param DB $db
      * @param string $dir
      */
-    public function __construct (DB $db, string $dir) {
+    public function __construct(DB $db, string $dir) {
         $this->db = $db;
         $this->dir = $dir;
         $this->table ??= $db['__migrations__'] ?? $db->getSchema()->createTable('__migrations__', [
@@ -44,7 +44,7 @@ 
      * @param string $to Migration sequence identifier, or `null` to step down once.
      * @return false|string The resulting current sequence identifier.
      */
-    public function down (string $to = null) {
+    public function down(string $to = null) {
         return $this->db->transact(function() use ($to) {
             $current = $this->getCurrent();
             // walk newest to oldest
@@ -73,7 +73,7 @@ 
      *
      * @return null|string
      */
-    public function getCurrent (): ?string {
+    public function getCurrent(): ?string {
         return $this->table->select([$this->table['sequence']->max()])->getResult();
     }
 
@@ -81,7 +81,7 @@ 
      * @param array $spec
      * @return MigrationInterface
      */
-    protected function getMigration (array $spec) {
+    protected function getMigration(array $spec) {
         include_once "{$spec['file']}";
         $migration = new $spec['class'];
         assert($migration instanceof MigrationInterface);
@@ -93,7 +93,7 @@ 
      *
      * @return array[] [ file => spec array ]
      */
-    protected function glob () {
+    protected function glob() {
         $specs = [];
         $files = glob("{$this->dir}/?*_?*.php");
         foreach ($files as $file) {
@@ -112,7 +112,7 @@ 
      * @param null|string $to Migration sequence identifier, or `null` for all upgrades.
      * @return false|string The resulting current sequence identifier.
      */
-    public function up (string $to = null) {
+    public function up(string $to = null) {
         return $this->db->transact(function() use ($to) {
             $current = $this->getCurrent();
             // walk oldest to newest

src/DB/EAV.php

Spacing +8 added lines, -8 removed lines

@@ -21,7 +21,7 @@ 
      * @param string $name
      * @param string $valueType PHP-native scalar type (implied nullable).
      */
-    public function __construct (DB $db, string $name, string $valueType = 'string') {
+    public function __construct(DB $db, string $name, string $valueType = 'string') {
         parent::__construct($db, $name, ['entity', 'attribute', 'value']);
         $this->valueType = $valueType;
     }
@@ -33,7 +33,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();
         });
@@ -51,7 +51,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) {
@@ -70,7 +70,7 @@ 
     /**
      * @return string
      */
-    final public function getValueType (): string {
+    final public function getValueType(): string {
         return $this->valueType;
     }
 
@@ -80,7 +80,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 = ?');
@@ -96,7 +96,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 [];
         }
@@ -121,7 +121,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))
@@ -149,7 +149,7 @@ 
      * @param mixed $value
      * @return null|scalar
      */
-    protected function setType ($value) {
+    protected function setType($value) {
         if (isset($value)) {
             settype($value, $this->valueType);
         }

src/DB/MigrationInterface.php

Spacing +2 added lines, -2 removed lines

@@ -33,11 +33,11 @@
      * @param DB $db
      * @return void
      */
-    public function down ($db);
+    public function down($db);
 
     /**
      * @param DB $db
      * @return void
      */
-    public function up ($db);
+    public function up($db);
 }
\ No newline at end of file

src/DB/Record.php

Spacing +21 added lines, -21 removed lines

@@ -77,7 +77,7 @@ 
      * @param string|EntityInterface $class
      * @return Record
      */
-    public static function fromClass (DB $db, $class) {
+    public static function fromClass(DB $db, $class) {
         $rClass = new ReflectionClass($class);
         assert($rClass->isInstantiable());
         $columns = [];
@@ -105,7 +105,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;
         $rClass = new ReflectionClass($proto);
@@ -158,7 +158,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));
@@ -176,14 +176,14 @@ 
      * @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));
     }
 
     /**
      * @return string
      */
-    final public function getClass (): string {
+    final public function getClass(): string {
         return get_class($this->proto);
     }
 
@@ -194,7 +194,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++) {
@@ -211,7 +211,7 @@ 
      * @param string $property
      * @return EAV
      */
-    final public function getEav (string $property) {
+    final public function getEav(string $property) {
         return $this->eav[$property];
     }
 
@@ -220,14 +220,14 @@ 
      *
      * @return string[]
      */
-    final public function getProperties (): array {
+    final public function getProperties(): array {
         return array_keys($this->properties);
     }
 
     /**
      * @return EntityInterface
      */
-    public function getProto () {
+    public function getProto() {
         return $this->proto;
     }
 
@@ -238,7 +238,7 @@ 
      *
      * @return string[]
      */
-    final public function getTypes (): array {
+    final public function getTypes(): array {
         return $this->types;
     }
 
@@ -246,7 +246,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);
@@ -258,7 +258,7 @@ 
      * @param string $property
      * @return bool
      */
-    final public function isNullable (string $property): bool {
+    final public function isNullable(string $property): bool {
         return $this->nullable[$property];
     }
 
@@ -268,7 +268,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();
         });
@@ -288,7 +288,7 @@ 
      *
      * @return Select|EntityInterface[]
      */
-    public function loadAll () {
+    public function loadAll() {
         return $this->select()->setFetcher(function(Statement $statement) {
             yield from $this->getEach($statement);
         });
@@ -299,7 +299,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) {
@@ -314,7 +314,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);
         }
@@ -328,7 +328,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
@@ -344,7 +344,7 @@ 
      *
      * @param EntityInterface $entity
      */
-    protected function saveInsert (EntityInterface $entity): void {
+    protected function saveInsert(EntityInterface $entity): void {
         $statement = $this->cache(__FUNCTION__, function() {
             $slots = $this->db->slots(array_keys($this->columns));
             unset($slots['id']);
@@ -363,7 +363,7 @@ 
      *
      * @param EntityInterface $entity
      */
-    protected function saveUpdate (EntityInterface $entity): void {
+    protected function saveUpdate(EntityInterface $entity): void {
         $statement = $this->cache(__FUNCTION__, function() {
             $slots = $this->db->slotsEqual(array_keys($this->columns));
             unset($slots['id']);
@@ -378,7 +378,7 @@ 
      * @param EntityInterface $proto
      * @return $this
      */
-    public function setProto (EntityInterface $proto) {
+    public function setProto(EntityInterface $proto) {
         $this->proto = $proto;
         return $this;
     }
@@ -387,7 +387,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]); // doesn't care about letter case

Braces +3 added lines, -6 removed lines

@@ -86,8 +86,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']);
             }
         }
@@ -317,8 +316,7 @@ 
     public function save (EntityInterface $entity): int {
         if (!$entity->getId()) {
             $this->saveInsert($entity);
-        }
-        else {
+        } else {
             $this->saveUpdate($entity);
         }
         $this->saveEav($entity);
@@ -392,8 +390,7 @@ 
             if (isset($this->properties[$name])) {
                 settype($value, $this->types[$name]); // doesn't care about letter case
                 $this->properties[$name]->setValue($entity, $value);
-            }
-            else {
+            } else {
                 $entity->{$name} = $value;
             }
         }

src/DB/Schema.php

Spacing +23 added lines, -23 removed lines

@@ -181,7 +181,7 @@ 
     /**
      * @param DB $db
      */
-    public function __construct (DB $db) {
+    public function __construct(DB $db) {
         $this->db = $db;
         $this->colDefs ??= self::COLUMN_DEFINITIONS[$db->getDriver()];
     }
@@ -194,7 +194,7 @@ 
      * @param int $type
      * @return $this
      */
-    public function addColumn (string $table, string $column, int $type = self::T_STRING) {
+    public function addColumn(string $table, string $column, int $type = self::T_STRING) {
         $type = $this->colDefs[$type & self::T_MASK];
         $this->db->exec("ALTER TABLE {$table} ADD COLUMN {$column} {$type}");
         unset($this->tables[$table]);
@@ -208,7 +208,7 @@ 
      * @param string $property The EAV property name in the record.
      * @return $this
      */
-    public function createEavTable (Record $record, string $property) {
+    public function createEavTable(Record $record, string $property) {
         $eav = $record->getEav($property);
         return $this->createTable($eav, [
             'entity' => self::T_INT_STRICT,
@@ -226,7 +226,7 @@ 
      * @param Junction $junction From {@link DB::getJunction()}
      * @return $this
      */
-    public function createJunctionTable (Junction $junction) {
+    public function createJunctionTable(Junction $junction) {
         $records = $junction->getRecords();
         return $this->createTable($junction, array_map(fn() => self::T_INT_STRICT, $records), [
             self::TABLE_PRIMARY => array_keys($records),
@@ -241,7 +241,7 @@ 
      * @param array[] $constraints See {@link Schema::createTable()}
      * @return $this
      */
-    public function createRecordTable (Record $record, array $constraints = []) {
+    public function createRecordTable(Record $record, array $constraints = []) {
         $columns = $record->getTypes();
         array_walk($columns, function(string &$type, string $property) use ($record) {
             $type = self::PHP_TYPES[$type] | ($record->isNullable($property) ? 0 : self::T_STRICT);
@@ -269,7 +269,7 @@ 
      * @param array[] $constraints `[ <TABLE_CONST> => table constraint spec ]`
      * @return $this
      */
-    public function createTable (string $table, array $columns, array $constraints = []) {
+    public function createTable(string $table, array $columns, array $constraints = []) {
         $defs = $this->toColumnDefinitions($columns);
 
         /** @var string[] $pk */
@@ -305,7 +305,7 @@ 
      * @param string $column
      * @return $this
      */
-    public function dropColumn (string $table, string $column) {
+    public function dropColumn(string $table, string $column) {
         $this->db->exec("ALTER TABLE {$table} DROP COLUMN {$column}");
         unset($this->tables[$table]);
         return $this;
@@ -316,7 +316,7 @@ 
      *
      * @param string $table
      */
-    public function dropTable (string $table): void {
+    public function dropTable(string $table): void {
         $this->db->exec("DROP TABLE IF EXISTS {$table}");
         unset($this->tables[$table]);
     }
@@ -325,7 +325,7 @@ 
      * @param string $name
      * @return null|Table
      */
-    public function getTable (string $name) {
+    public function getTable(string $name) {
         if (!isset($this->tables[$name])) {
             if ($this->db->isSQLite()) {
                 $info = $this->db->query("PRAGMA table_info({$name})")->fetchAll();
@@ -350,7 +350,7 @@ 
      * @param string $table
      * @return bool
      */
-    final public function offsetExists ($table): bool {
+    final public function offsetExists($table): bool {
         return (bool)$this->offsetGet($table);
     }
 
@@ -360,7 +360,7 @@ 
      * @param string $table
      * @return null|Table
      */
-    public function offsetGet ($table) {
+    public function offsetGet($table) {
         return $this->getTable($table);
     }
 
@@ -369,7 +369,7 @@ 
      * @param $value
      * @throws LogicException
      */
-    final public function offsetSet ($offset, $value) {
+    final public function offsetSet($offset, $value) {
         throw new LogicException('The schema cannot be altered this way.');
     }
 
@@ -377,7 +377,7 @@ 
      * @param $offset
      * @throws LogicException
      */
-    final public function offsetUnset ($offset) {
+    final public function offsetUnset($offset) {
         throw new LogicException('The schema cannot be altered this way.');
     }
 
@@ -389,7 +389,7 @@ 
      * @param string $newName
      * @return $this
      */
-    public function renameColumn (string $table, string $oldName, string $newName) {
+    public function renameColumn(string $table, string $oldName, string $newName) {
         $this->db->exec("ALTER TABLE {$table} RENAME COLUMN {$oldName} TO {$newName}");
         unset($this->tables[$table]);
         return $this;
@@ -402,7 +402,7 @@ 
      * @param string $newName
      * @return $this
      */
-    public function renameTable (string $oldName, string $newName) {
+    public function renameTable(string $oldName, string $newName) {
         $this->db->exec("ALTER TABLE {$oldName} RENAME TO {$newName}");
         unset($this->tables[$oldName]);
         return $this;
@@ -414,7 +414,7 @@ 
      * @param int[] $types
      * @return int[]
      */
-    protected function sortColumns (array $types): array {
+    protected function sortColumns(array $types): array {
         uksort($types, function(string $a, string $b) use ($types) {
             // descending index priority, increasing size, name
             return $types[$b] <=> $types[$a] ?: $a <=> $b;
@@ -426,7 +426,7 @@ 
      * @param int[] $columns `[ name => <I_CONST> | <T_CONST> ]`
      * @return string[]
      */
-    protected function toColumnDefinitions (array $columns): array {
+    protected function toColumnDefinitions(array $columns): array {
         assert(count($columns) > 0);
         $columns = $this->sortColumns($columns);
         $defs = [];
@@ -451,7 +451,7 @@ 
      * @param Column $foreign
      * @return string
      */
-    protected function toForeignKeyConstraint (string $table, string $local, Column $foreign): string {
+    protected function toForeignKeyConstraint(string $table, string $local, Column $foreign): string {
         return sprintf(
             'CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s) ON DELETE CASCADE',
             $this->toForeignKeyConstraint_name($table, $local),
@@ -468,7 +468,7 @@ 
      * @param string $column
      * @return string
      */
-    protected function toForeignKeyConstraint_name (string $table, string $column): string {
+    protected function toForeignKeyConstraint_name(string $table, string $column): string {
         return 'FK_' . $table . '__' . $column;
     }
 
@@ -477,7 +477,7 @@ 
      * @param string[] $columns
      * @return string
      */
-    protected function toPrimaryKeyConstraint (string $table, array $columns): string {
+    protected function toPrimaryKeyConstraint(string $table, array $columns): string {
         return sprintf(
             'CONSTRAINT %s PRIMARY KEY (%s)',
             $this->toPrimaryKeyConstraint_name($table, $columns),
@@ -492,7 +492,7 @@ 
      * @param string[] $columns
      * @return string
      */
-    protected function toPrimaryKeyConstraint_name (string $table, array $columns): string {
+    protected function toPrimaryKeyConstraint_name(string $table, array $columns): string {
         sort($columns, SORT_STRING);
         return 'PK_' . $table . '__' . implode('__', $columns);
     }
@@ -502,7 +502,7 @@ 
      * @param string[] $columns
      * @return string
      */
-    protected function toUniqueKeyConstraint (string $table, array $columns): string {
+    protected function toUniqueKeyConstraint(string $table, array $columns): string {
         return sprintf(
             'CONSTRAINT %s UNIQUE (%s)',
             $this->toUniqueKeyConstraint_name($table, $columns),
@@ -517,7 +517,7 @@ 
      * @param string[] $columns
      * @return string
      */
-    protected function toUniqueKeyConstraint_name (string $table, array $columns): string {
+    protected function toUniqueKeyConstraint_name(string $table, array $columns): string {
         sort($columns, SORT_STRING);
         return 'UQ_' . $table . '__' . implode('__', $columns);
     }

Braces +1 added lines, -2 removed lines

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

src/DB/Select.php

Spacing +30 added lines, -30 removed lines

@@ -125,7 +125,7 @@ 
      * @param string|AbstractTable $table
      * @param string[] $columns
      */
-    public function __construct (DB $db, $table, array $columns = ['*']) {
+    public function __construct(DB $db, $table, array $columns = ['*']) {
         static $autoAlias = 0;
         $autoAlias++;
         parent::__construct($db);
@@ -152,7 +152,7 @@ 
      * @param array $args
      * @return Statement
      */
-    public function __invoke (array $args = []) {
+    public function __invoke(array $args = []) {
         return $this->execute($args);
     }
 
@@ -161,7 +161,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->alias;
     }
 
@@ -171,7 +171,7 @@ 
      * @param array $args Execution arguments.
      * @return int
      */
-    public function count (array $args = []): int {
+    public function count(array $args = []): int {
         $clone = clone $this;
         $clone->_columns = 'COUNT(*)';
         $clone->_order = '';
@@ -184,7 +184,7 @@ 
      * @param array $args
      * @return Statement
      */
-    public function execute (array $args = []) {
+    public function execute(array $args = []) {
         if (empty($args)) {
             return $this->db->query($this->toSql());
         }
@@ -199,14 +199,14 @@ 
      * @param array $args Execution arguments.
      * @return array
      */
-    public function getAll (array $args = []): array {
+    public function getAll(array $args = []): array {
         return iterator_to_array($this->fetcher->__invoke($this->execute($args)));
     }
 
     /**
      * @return Column[]
      */
-    public function getColumns () {
+    public function getColumns() {
         return $this->refs;
     }
 
@@ -219,7 +219,7 @@ 
      * @param array $args Execution arguments.
      * @return Generator
      */
-    public function getEach (array $args = []) {
+    public function getEach(array $args = []) {
         yield from $this->fetcher->__invoke($this->execute($args));
     }
 
@@ -231,7 +231,7 @@ 
      * @param array $args
      * @return mixed
      */
-    public function getFirst (array $args = []) {
+    public function getFirst(array $args = []) {
         return $this->getEach($args)->current();
     }
 
@@ -242,7 +242,7 @@ 
      *
      * @return Generator
      */
-    public function getIterator () {
+    public function getIterator() {
         yield from $this->getEach();
     }
 
@@ -252,7 +252,7 @@ 
      *
      * @return null|mixed
      */
-    public function getResult (array $args = []) {
+    public function getResult(array $args = []) {
         return $this->execute($args)->fetchColumn();
     }
 
@@ -262,7 +262,7 @@ 
      * @param string $column
      * @return $this
      */
-    public function group (string $column) {
+    public function group(string $column) {
         if (!strlen($this->_group)) {
             $this->_group = " GROUP BY {$column}";
         }
@@ -278,7 +278,7 @@ 
      * @param string ...$conditions
      * @return $this
      */
-    public function having (string ...$conditions) {
+    public function having(string ...$conditions) {
         assert(count($conditions) > 0);
         $conditions = implode(' AND ', $conditions);
         if (!strlen($this->_having)) {
@@ -298,7 +298,7 @@ 
      * @param Select $select
      * @return $this
      */
-    public function intersect (Select $select) {
+    public function intersect(Select $select) {
         if ($this->db->isMySQL()) {
             // to be standards compliant, this hack must fail if they don't have the same cols.
             assert(count($this->refs) === count($select->refs) and !array_diff_key($this->refs, $select->refs));
@@ -319,7 +319,7 @@ 
      *
      * @return Predicate
      */
-    public function isEmpty () {
+    public function isEmpty() {
         return Predicate::factory($this->db, "NOT EXISTS ({$this->toSql()})");
     }
 
@@ -328,7 +328,7 @@ 
      *
      * @return Predicate
      */
-    public function isNotEmpty () {
+    public function isNotEmpty() {
         return Predicate::factory($this->db, "EXISTS ({$this->toSql()})");
     }
 
@@ -339,7 +339,7 @@ 
      * @param string ...$conditions
      * @return $this
      */
-    public function join ($table, string ...$conditions) {
+    public function join($table, string ...$conditions) {
         assert(count($conditions) > 0);
         if ($table instanceof Select) {
             $table = $table->toSubquery();
@@ -356,7 +356,7 @@ 
      * @param string ...$conditions
      * @return $this
      */
-    public function joinLeft ($table, string ...$conditions) {
+    public function joinLeft($table, string ...$conditions) {
         assert(count($conditions) > 0);
         if ($table instanceof Select) {
             $table = $table->toSubquery();
@@ -373,7 +373,7 @@ 
      * @param int $offset
      * @return $this
      */
-    public function limit (int $limit, int $offset = 0) {
+    public function limit(int $limit, int $offset = 0) {
         if ($limit == 0) {
             $this->_limit = '';
         }
@@ -392,7 +392,7 @@ 
      * @param int|string $ref Ordinal or reference name.
      * @return null|Column
      */
-    public function offsetGet ($ref) {
+    public function offsetGet($ref) {
         if (is_int($ref)) {
             return current(array_slice($this->refs, $ref, 1)) ?: null;
         }
@@ -405,7 +405,7 @@ 
      * @param string $order
      * @return $this
      */
-    public function order (string $order) {
+    public function order(string $order) {
         if (strlen($order)) {
             $order = " ORDER BY {$order}";
         }
@@ -416,7 +416,7 @@ 
     /**
      * @return Statement
      */
-    public function prepare () {
+    public function prepare() {
         return $this->db->prepare($this->toSql());
     }
 
@@ -424,7 +424,7 @@ 
      * @param string $alias
      * @return $this
      */
-    public function setAlias (string $alias) {
+    public function setAlias(string $alias) {
         $this->alias = $alias;
         foreach ($this->refs as $k => $column) {
             $this->refs[$k] = $column->setQualifier($alias);
@@ -441,7 +441,7 @@ 
      * @param string[] $expressions Keyed by alias if applicable.
      * @return $this
      */
-    public function setColumns (array $expressions = ['*']) {
+    public function setColumns(array $expressions = ['*']) {
         if ($expressions === ['*']) {
             $expressions = array_keys($this->table->getColumns());
         }
@@ -469,7 +469,7 @@ 
      * @param Closure $fetcher
      * @return $this
      */
-    public function setFetcher (Closure $fetcher) {
+    public function setFetcher(Closure $fetcher) {
         $this->fetcher = $fetcher;
         return $this;
     }
@@ -479,7 +479,7 @@ 
      *
      * @return string
      */
-    public function toSql (): string {
+    public function toSql(): string {
         $sql = "SELECT {$this->_columns} FROM {$this->_table}";
         $sql .= $this->_join;
         $sql .= $this->_where;
@@ -496,7 +496,7 @@ 
      *
      * @return string
      */
-    public function toSubquery (): string {
+    public function toSubquery(): string {
         return "({$this->toSql()}) AS {$this->alias}";
     }
 
@@ -506,7 +506,7 @@ 
      * @param Select $select
      * @return $this
      */
-    public function union (Select $select) {
+    public function union(Select $select) {
         $select = clone $select;
         $select->_order = '';
         $select->_limit = '';
@@ -520,7 +520,7 @@ 
      * @param Select $select
      * @return $this
      */
-    public function unionAll (Select $select) {
+    public function unionAll(Select $select) {
         $select = clone $select;
         $select->_order = '';
         $select->_limit = '';
@@ -534,7 +534,7 @@ 
      * @param string ...$conditions
      * @return $this
      */
-    public function where (string ...$conditions) {
+    public function where(string ...$conditions) {
         assert(count($conditions) > 0);
         $conditions = implode(' AND ', $conditions);
         if (!strlen($this->_where)) {

Braces +6 added lines, -12 removed lines

@@ -132,8 +132,7 @@ 
         if ($table instanceof Select) {
             $this->_table = $table->toSubquery();
             $this->alias = "_anon{$autoAlias}_{$table->alias}";
-        }
-        else {
+        } else {
             if (is_string($table)) {
                 $table = $db[$table];
                 assert(isset($table));
@@ -265,8 +264,7 @@ 
     public function group (string $column) {
         if (!strlen($this->_group)) {
             $this->_group = " GROUP BY {$column}";
-        }
-        else {
+        } else {
             $this->_group .= ", {$column}";
         }
         return $this;
@@ -283,8 +281,7 @@ 
         $conditions = implode(' AND ', $conditions);
         if (!strlen($this->_having)) {
             $this->_having = " HAVING {$conditions}";
-        }
-        else {
+        } else {
             $this->_having .= " AND {$conditions}";
         }
         return $this;
@@ -376,8 +373,7 @@ 
     public function limit (int $limit, int $offset = 0) {
         if ($limit == 0) {
             $this->_limit = '';
-        }
-        else {
+        } else {
             $this->_limit = " LIMIT {$limit}";
             if ($offset > 1) {
                 $this->_limit .= " OFFSET {$offset}";
@@ -452,8 +448,7 @@ 
             $name = $match['name'] ?? null;
             if (is_int($alias)) {
                 $alias = $name;
-            }
-            elseif ($alias !== $name) {
+            } elseif ($alias !== $name) {
                 $expr .= " AS {$alias}";
             }
             if (isset($alias)) {
@@ -539,8 +534,7 @@ 
         $conditions = implode(' AND ', $conditions);
         if (!strlen($this->_where)) {
             $this->_where = " WHERE {$conditions}";
-        }
-        else {
+        } else {
             $this->_where .= " AND {$conditions}";
         }
         return $this;

src/DB/Junction.php

Spacing +9 added lines, -9 removed lines

@@ -29,7 +29,7 @@ 
      * @param string $interface
      * @return Junction
      */
-    public static function fromInterface (DB $db, string $interface) {
+    public static function fromInterface(DB $db, string $interface) {
         $ref = new ReflectionClass($interface);
         assert($ref->isInterface());
         $doc = $ref->getDocComment();
@@ -48,7 +48,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;
     }
@@ -62,7 +62,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->getRecord($key);
         $select = $record->loadAll();
         $select->join($this, $this[$key]->isEqual($record['id']));
@@ -76,14 +76,14 @@ 
      * @param string $column
      * @return string
      */
-    final public function getClass (string $column): string {
+    final public function getClass(string $column): string {
         return $this->classes[$column];
     }
 
     /**
      * @return string[]
      */
-    final public function getClasses () {
+    final public function getClasses() {
         return $this->classes;
     }
 
@@ -91,14 +91,14 @@ 
      * @param string $column
      * @return Record
      */
-    public function getRecord (string $column) {
+    public function getRecord(string $column) {
         return $this->db->getRecord($this->classes[$column]);
     }
 
     /**
      * @return Record[]
      */
-    public function getRecords () {
+    public function getRecords() {
         return array_map(fn($class) => $this->db->getRecord($class), $this->classes);
     }
 
@@ -108,7 +108,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(',', $this->db->slots(array_keys($this->columns)));
@@ -131,7 +131,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

Braces +1 added lines, -2 removed lines

@@ -114,8 +114,7 @@
             $slots = implode(',', $this->db->slots(array_keys($this->columns)));
             if ($this->db->isSQLite()) {
                 $sql = "INSERT OR IGNORE INTO {$this} ({$columns}) VALUES ({$slots})";
-            }
-            else {
+            } else {
                 $sql = "INSERT IGNORE INTO {$this} ({$columns}) VALUES ({$slots})";
             }
             return $this->db->prepare($sql);