hfw / db

bin/helix.db.migrate.php

Indentation +1 added lines, -10 removed lines

@@ -301,13 +301,4 @@
              */
             public function down (\$schema)
             {
-        {$down}
-            }
-
-        };
-
-        MIGRATION
-        );
-    }
-
-})->_exec();
+        {$down}
\ No newline at end of file

Switch Indentation +1 added lines, -10 removed lines

@@ -301,13 +301,4 @@
              */
             public function down (\$schema)
             {
-        {$down}
-            }
-
-        };
-
-        MIGRATION
-        );
-    }
-
-})->_exec();
+        {$down}
\ No newline at end of file

Braces +1 added lines, -10 removed lines

@@ -301,13 +301,4 @@
              */
             public function down (\$schema)
             {
-        {$down}
-            }
-
-        };
-
-        MIGRATION
-        );
-    }
-
-})->_exec();
+        {$down}
\ No newline at end of file

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

@@ -301,13 +301,4 @@
              */
             public function down (\$schema)
             {
-        {$down}
-            }
-
-        };
-
-        MIGRATION
-        );
-    }
-
-})->_exec();
+        {$down}
\ No newline at end of file

Spacing +5 added lines, -14 removed lines

@@ -28,7 +28,7 @@ 
 
     private Schema $schema;
 
-    public function __construct (array $argv, array $opt) {
+    public function __construct(array $argv, array $opt) {
         $this->argv = $argv;
         $opt['connection'] ??= 'default';
         $opt['config'] ??= 'db.config.php';
@@ -39,15 +39,15 @@ 
         $this->schema = $this->db->getSchema();
     }
 
-    private function _stderr (string $text): void {
+    private function _stderr(string $text): void {
         fputs(STDERR, "{$text}\n\n");
     }
 
-    private function _stdout (string $text): void {
+    private function _stdout(string $text): void {
         echo "{$text}\n\n";
     }
 
-    private function _usage_exit (): void {
+    private function _usage_exit(): void {
         $this->_stderr(<<< USAGE
         
         $ php {$this->argv[0]} [OPTIONS] ACTION
@@ -337,13 +337,4 @@ 
              */
             public function down (\$schema)
             {
-        {$down}
-            }
-
-        };
-
-        MIGRATION
-        );
-    }
-
-})->_exec();
+        {$down}
\ No newline at end of file

src/DB/Schema.php

Braces +1 added lines, -2 removed lines

@@ -356,8 +356,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);
             }
             if (!$cols) {

Spacing +25 added lines, -25 removed lines

@@ -143,16 +143,16 @@ 
         // bool
         'BOOLEAN' => 'bool',
         // int
-        'BIGINT' => 'int',  // mysql
+        'BIGINT' => 'int', // mysql
         'INTEGER' => 'int', // sqlite (must be this type to allow AUTOINCREMENT)
         // float
         'DOUBLE PRECISION' => 'float',
         // string <= 255
         'VARCHAR(255)' => 'string',
         // string <= 64k
-        'TEXT' => 'String',     // @var String
+        'TEXT' => 'String', // @var String
         // string > 64k
-        'BLOB' => 'STRING',     // @var STRING (sqlite)
+        'BLOB' => 'STRING', // @var STRING (sqlite)
         'LONGBLOB' => 'STRING', // @var STRING (mysql)
         // DateTime
         'DATETIME' => 'DateTime',
@@ -220,7 +220,7 @@ 
     /**
      * @param DB $db
      */
-    public function __construct (DB $db) {
+    public function __construct(DB $db) {
         $this->db = $db;
         $this->colDefs ??= self::COLUMN_DEFINITIONS[$db->getDriver()];
     }
@@ -233,7 +233,7 @@ 
      * @param int $type
      * @return $this
      */
-    public function addColumn (string $table, string $column, int $type = self::T_STRING_NULL) {
+    public function addColumn(string $table, string $column, int $type = self::T_STRING_NULL) {
         $type = $this->colDefs[$type & self::T_MASK];
         $this->db->exec("ALTER TABLE {$table} ADD COLUMN {$column} {$type}");
         unset($this->tables[$table]);
@@ -259,7 +259,7 @@ 
      * @param array[] $constraints `[ <TABLE_CONST> => 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 */
@@ -295,7 +295,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;
@@ -306,7 +306,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 $column
      * @return array[] Keyed by name.
      */
-    public function getColumnInfo (string $table): array {
+    public function getColumnInfo(string $table): array {
         if ($this->db->isSQLite()) {
             $info = $this->db->query("PRAGMA table_info({$table})")->fetchAll();
             return array_combine(array_column($info, 'name'), array_map(fn(array $each) => [
@@ -345,7 +345,7 @@ 
     /**
      * @return DB
      */
-    public function getDb () {
+    public function getDb() {
         return $this->db;
     }
 
@@ -353,7 +353,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();
@@ -376,7 +376,7 @@ 
      * @param string $table
      * @return bool
      */
-    final public function offsetExists ($table): bool {
+    final public function offsetExists($table): bool {
         return (bool)$this->offsetGet($table);
     }
 
@@ -386,7 +386,7 @@ 
      * @param string $table
      * @return null|Table
      */
-    public function offsetGet ($table) {
+    public function offsetGet($table) {
         return $this->getTable($table);
     }
 
@@ -395,7 +395,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.');
     }
 
@@ -403,7 +403,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.');
     }
 
@@ -415,7 +415,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;
@@ -428,7 +428,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;
@@ -440,7 +440,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 type constant, ascending name
             return $types[$b] <=> $types[$a] ?: $a <=> $b;
@@ -452,7 +452,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 = [];
@@ -478,7 +478,7 @@ 
      * @param Column $foreign
      * @return string
      */
-    protected function toForeignKeyConstraint (string $table, string $local, int $type, Column $foreign): string {
+    protected function toForeignKeyConstraint(string $table, string $local, int $type, Column $foreign): string {
         return sprintf(
             'CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s) ON UPDATE CASCADE ON DELETE %s',
             $this->toForeignKeyConstraint_name($table, $local),
@@ -496,7 +496,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;
     }
 
@@ -505,7 +505,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),
@@ -520,7 +520,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);
     }
@@ -530,7 +530,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),
@@ -545,7 +545,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);
     }

src/DB/Migrator.php

Spacing +8 added lines, -8 removed lines

@@ -34,7 +34,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;
     }
@@ -45,7 +45,7 @@ 
      * @param string $to Migration sequence identifier, or `null` to step down once.
      * @return null|string The resulting current sequence identifier.
      */
-    public function down (string $to = null): ?string {
+    public function down(string $to = null): ?string {
         return $this->db->transact(function() use ($to) {
             $current = $this->getCurrent();
             // walk newest to oldest
@@ -72,14 +72,14 @@ 
      *
      * @return null|string
      */
-    public function getCurrent (): ?string {
+    public function getCurrent(): ?string {
         return $this->getTable()['sequence']['max'];
     }
 
     /**
      * @return string
      */
-    final public function getDir (): string {
+    final public function getDir(): string {
         return $this->dir;
     }
 
@@ -87,7 +87,7 @@ 
      * @param array $spec
      * @return MigrationInterface
      */
-    protected function getMigration (string $file) {
+    protected function getMigration(string $file) {
         $migration = include "{$file}";
         assert($migration instanceof MigrationInterface);
         return $migration;
@@ -98,7 +98,7 @@ 
      *
      * @return Table
      */
-    public function getTable () {
+    public function getTable() {
         return $this->table ??= ($this->db['__migrations__'] ??
             $this->db->getSchema()->createTable('__migrations__', [
                 'sequence' => Schema::T_STRING | Schema::I_PRIMARY
@@ -111,7 +111,7 @@ 
      *
      * @return string[] [ sequence => file ]
      */
-    protected function glob () {
+    protected function glob() {
         $files = [];
         foreach (glob("{$this->dir}/*.php") as $file) {
             $files[basename($file, '.php')] = $file;
@@ -125,7 +125,7 @@ 
      * @param null|string $to Migration sequence identifier, or `null` for all upgrades.
      * @return null|string The resulting current sequence identifier.
      */
-    public function up (string $to = null): ?string {
+    public function up(string $to = null): ?string {
         return $this->db->transact(function() use ($to) {
             $current = $this->getCurrent();
             // walk oldest to newest

src/DB/AttributesTrait.php

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
     /**
      * @return scalar[]
      */
-    public function getAttributes (): array {
+    public function getAttributes(): array {
         return $this->attributes ?? [];
     }
 
@@ -42,7 +42,7 @@ 
      * @param mixed $attr
      * @return bool
      */
-    public function offsetExists ($attr): bool {
+    public function offsetExists($attr): bool {
         return isset($this->attributes[$attr]);
     }
 
@@ -50,7 +50,7 @@ 
      * @param mixed $attr
      * @return null|scalar
      */
-    public function offsetGet ($attr) {
+    public function offsetGet($attr) {
         return $this->attributes[$attr] ?? null;
     }
 
@@ -58,7 +58,7 @@ 
      * @param mixed $attr
      * @param null|scalar $value
      */
-    public function offsetSet ($attr, $value): void {
+    public function offsetSet($attr, $value): void {
         if (isset($attr)) {
             if (isset($value)) {
                 assert(is_scalar($value));
@@ -80,7 +80,7 @@ 
     /**
      * @param mixed $attr
      */
-    public function offsetUnset ($attr): void {
+    public function offsetUnset($attr): void {
         unset($this->attributes[$attr]);
     }
 
@@ -88,7 +88,7 @@ 
      * @param scalar[] $attributes
      * @return $this
      */
-    public function setAttributes (array $attributes) {
+    public function setAttributes(array $attributes) {
         $this->attributes = array_filter($attributes, 'is_scalar');
         return $this;
     }

Braces +2 added lines, -4 removed lines

@@ -63,12 +63,10 @@
             if (isset($value)) {
                 assert(is_scalar($value));
                 $this->attributes[$attr] = $value;
-            }
-            else {
+            } else {
                 $this->offsetUnset($attr);
             }
-        }
-        else {
+        } else {
             // appending must not be null.
             // even though missing numeric offsets would yield null when fetched individually,
             // getAttributes() would not have them.

src/DB/Record.php

Spacing +32 added lines, -32 removed lines

@@ -138,7 +138,7 @@ 
      * @param string|EntityInterface $class Class or prototype instance.
      * @return Record
      */
-    public static function fromClass (DB $db, $class) {
+    public static function fromClass(DB $db, $class) {
         $rClass = new ReflectionClass($class);
         assert($rClass->isInstantiable());
         $columns = [];
@@ -169,7 +169,7 @@ 
      * @param string[] $properties Property names.
      * @param EAV[] $eav Keyed by property name.
      */
-    public function __construct (DB $db, EntityInterface $proto, string $table, array $properties, array $eav = []) {
+    public function __construct(DB $db, EntityInterface $proto, string $table, array $properties, array $eav = []) {
         parent::__construct($db, $table, $properties);
         $this->proto = $proto;
         $this->utc = new DateTimeZone('UTC');
@@ -208,7 +208,7 @@ 
      * @param ReflectionProperty $rProp
      * @return null|string Storage type, or `null` for unknown.
      */
-    protected function __construct_getType (string $prop, ReflectionProperty $rProp): ?string {
+    protected function __construct_getType(string $prop, ReflectionProperty $rProp): ?string {
         return $this->__construct_getType_fromReflection($prop, $rProp)
             ?? $this->__construct_getType_fromVar($prop, $rProp);
     }
@@ -220,7 +220,7 @@ 
      * @param ReflectionProperty $rProp
      * @return null|string
      */
-    protected function __construct_getType_fromReflection (string $prop, ReflectionProperty $rProp): ?string {
+    protected function __construct_getType_fromReflection(string $prop, ReflectionProperty $rProp): ?string {
         if ($rType = $rProp->getType() and $rType instanceof ReflectionNamedType) {
             $type = $rType->getName();
             if (isset(static::SCALARS[$type])) {
@@ -240,7 +240,7 @@ 
      * @param ReflectionProperty $rProp
      * @return null|string
      */
-    protected function __construct_getType_fromVar (string $prop, ReflectionProperty $rProp): ?string {
+    protected function __construct_getType_fromVar(string $prop, ReflectionProperty $rProp): ?string {
         if (preg_match(static::RX_VAR, $rProp->getDocComment(), $var)) {
             $type = preg_replace(static::RX_NULL, '', $var['type']); // remove null
             if (isset(static::SCALARS[$type])) {
@@ -266,7 +266,7 @@ 
      * @param ReflectionProperty $rProp
      * @return null|bool
      */
-    protected function __construct_isNullable (string $prop, ReflectionProperty $rProp): ?bool {
+    protected function __construct_isNullable(string $prop, ReflectionProperty $rProp): ?bool {
         return $this->__construct_isNullable_fromReflection($prop, $rProp)
             ?? $this->__construct_isNullable_fromVar($prop, $rProp);
     }
@@ -276,7 +276,7 @@ 
      * @param ReflectionProperty $rProp
      * @return null|bool
      */
-    protected function __construct_isNullable_fromReflection (string $prop, ReflectionProperty $rProp): ?bool {
+    protected function __construct_isNullable_fromReflection(string $prop, ReflectionProperty $rProp): ?bool {
         if ($rType = $rProp->getType()) {
             return $rType->allowsNull();
         }
@@ -288,7 +288,7 @@ 
      * @param ReflectionProperty $rProp
      * @return null|bool
      */
-    protected function __construct_isNullable_fromVar (string $prop, ReflectionProperty $rProp): ?bool {
+    protected function __construct_isNullable_fromVar(string $prop, ReflectionProperty $rProp): ?bool {
         if (preg_match(static::RX_VAR, $rProp->getDocComment(), $var)) {
             preg_replace(static::RX_NULL, '', $var['type'], -1, $nullable);
             return (bool)$nullable;
@@ -302,7 +302,7 @@ 
      * @param Statement $statement
      * @return EntityInterface[] Keyed by ID
      */
-    public function fetchAll (Statement $statement): array {
+    public function fetchAll(Statement $statement): array {
         return iterator_to_array($this->fetchEach($statement));
     }
 
@@ -313,7 +313,7 @@ 
      * @param Statement $statement
      * @return Generator|EntityInterface[] Keyed by ID
      */
-    public function fetchEach (Statement $statement) {
+    public function fetchEach(Statement $statement) {
         do {
             $entities = [];
             for ($i = 0; $i < 256 and false !== $row = $statement->fetch(); $i++) {
@@ -335,7 +335,7 @@ 
      * @param array[] $eavMatch `[eav property => attribute => value]`
      * @return Select|EntityInterface[]
      */
-    public function findAll (array $match, array $eavMatch = []) {
+    public function findAll(array $match, array $eavMatch = []) {
         $select = $this->loadAll();
         foreach ($match as $a => $b) {
             $select->where($this->db->match($this[$a] ?? $a, $b));
@@ -354,21 +354,21 @@ 
      * @param array $eavMatch `[eav property => attribute => value]`
      * @return null|EntityInterface
      */
-    public function findFirst (array $match, array $eavMatch = []) {
+    public function findFirst(array $match, array $eavMatch = []) {
         return $this->findAll($match, $eavMatch)->limit(1)->getFirst();
     }
 
     /**
      * @return string
      */
-    final public function getClass (): string {
+    final public function getClass(): string {
         return get_class($this->proto);
     }
 
     /**
      * @return EAV[]
      */
-    public function getEav () {
+    public function getEav() {
         return $this->eav;
     }
 
@@ -377,14 +377,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;
     }
 
@@ -396,7 +396,7 @@ 
      * @param string $property
      * @return string
      */
-    final public function getType (string $property): string {
+    final public function getType(string $property): string {
         return $this->types[$property];
     }
 
@@ -407,7 +407,7 @@ 
      *
      * @return string[]
      */
-    final public function getTypes (): array {
+    final public function getTypes(): array {
         return $this->types;
     }
 
@@ -415,7 +415,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) {
             $value = $this->properties[$name]->getValue($entity);
@@ -439,7 +439,7 @@ 
      * @param array|object $hydrated
      * @return scalar
      */
-    protected function getValues_dehydrate (string $to, string $from, $hydrated) {
+    protected function getValues_dehydrate(string $to, string $from, $hydrated) {
         unset($from); // we don't need it here but it's given for posterity
         switch ($to) {
             case 'DateTime':
@@ -454,7 +454,7 @@ 
      * @param string $property
      * @return bool
      */
-    final public function isNullable (string $property): bool {
+    final public function isNullable(string $property): bool {
         return $this->nullable[$property];
     }
 
@@ -464,7 +464,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();
         });
@@ -484,7 +484,7 @@ 
      *
      * @return Select|EntityInterface[]
      */
-    public function loadAll () {
+    public function loadAll() {
         return $this->select()->setFetcher(function(Statement $statement) {
             yield from $this->fetchEach($statement);
         });
@@ -495,7 +495,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) {
@@ -510,7 +510,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);
         }
@@ -524,7 +524,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
@@ -540,7 +540,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']);
@@ -559,7 +559,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']);
@@ -574,7 +574,7 @@ 
      * @param EntityInterface $proto
      * @return $this
      */
-    public function setProto (EntityInterface $proto) {
+    public function setProto(EntityInterface $proto) {
         $this->proto = $proto;
         return $this;
     }
@@ -586,7 +586,7 @@ 
      * @param mixed $value
      * @return mixed
      */
-    protected function setType (string $property, $value) {
+    protected function setType(string $property, $value) {
         if (isset($value)) {
             // complex?
             if (isset($this->hydration[$property])) {
@@ -610,7 +610,7 @@ 
      * @param scalar $dehydrated
      * @return array|object
      */
-    protected function setType_hydrate (string $to, string $from, $dehydrated) {
+    protected function setType_hydrate(string $to, string $from, $dehydrated) {
         switch ($from) {
             case 'DateTime':
                 /**
@@ -633,7 +633,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])) {
                 $this->properties[$name]->setValue($entity, $this->setType($name, $value));

Braces +3 added lines, -6 removed lines

@@ -147,8 +147,7 @@ 
             $doc = $rProp->getDocComment();
             if (preg_match(static::RX_IS_COLUMN, $doc)) {
                 $columns[] = $rProp->getName();
-            }
-            elseif (preg_match(static::RX_EAV, $doc, $eav)) {
+            } elseif (preg_match(static::RX_EAV, $doc, $eav)) {
                 preg_match(static::RX_EAV_VAR, $doc, $var);
                 $type = $var['type'] ?? 'string';
                 $type = static::SCALARS[$type] ?? 'string';
@@ -513,8 +512,7 @@ 
     public function save (EntityInterface $entity): int {
         if (!$entity->getId()) {
             $this->saveInsert($entity);
-        }
-        else {
+        } else {
             $this->saveUpdate($entity);
         }
         $this->saveEav($entity);
@@ -637,8 +635,7 @@ 
         foreach ($values as $name => $value) {
             if (isset($this->properties[$name])) {
                 $this->properties[$name]->setValue($entity, $this->setType($name, $value));
-            }
-            else {
+            } else {
                 // attempt to set unknown fields directly on the instance.
                 $entity->{$name} = $value;
             }

src/DB/EAV.php

Spacing +8 added lines, -8 removed lines

@@ -23,7 +23,7 @@ 
      * @param string $name
      * @param string $type
      */
-    public function __construct (DB $db, string $name, string $type = 'string') {
+    public function __construct(DB $db, string $name, string $type = 'string') {
         parent::__construct($db, $name, ['entity', 'attribute', 'value']);
         $this->type = $type;
     }
@@ -35,7 +35,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();
         });
@@ -53,7 +53,7 @@ 
      * @param array $match `[attribute => value]`. If empty, selects all IDs for entities having at least one attribute.
      * @return Select
      */
-    public function findAll (array $match) {
+    public function findAll(array $match) {
         $select = $this->select([$this['entity']]);
         $prior = $this;
         foreach ($match as $attribute => $value) {
@@ -72,7 +72,7 @@ 
     /**
      * @return string
      */
-    final public function getType (): string {
+    final public function getType(): string {
         return $this->type;
     }
 
@@ -82,7 +82,7 @@ 
      * @param int $id
      * @return scalar[] `[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 = ?');
@@ -98,7 +98,7 @@ 
      * @param int[] $ids
      * @return scalar[][] `[id => attribute => value]
      */
-    public function loadAll (array $ids): array {
+    public function loadAll(array $ids): array {
         if (empty($ids)) {
             return [];
         }
@@ -126,7 +126,7 @@ 
      * @param array $values `[attribute => value]`
      * @return $this
      */
-    public function save (int $id, array $values) {
+    public function save(int $id, array $values) {
         // delete stale
         $this->delete([
             $this['entity']->isEqual($id),
@@ -166,7 +166,7 @@ 
      * @param scalar $value
      * @return scalar
      */
-    protected function setType ($value) {
+    protected function setType($value) {
         settype($value, $this->type);
         return $value;
     }

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);
@@ -169,7 +169,7 @@ 
         }
         elseif ($this->isSQLite()) {
             // polyfill sqlite functions
-            $this->sqliteCreateFunctions([ // deterministic functions
+            $this->sqliteCreateFunctions([// deterministic functions
                 // https://www.sqlite.org/lang_mathfunc.html
                 'ACOS' => 'acos',
                 'ASIN' => 'asin',
@@ -195,7 +195,7 @@ 
                 'SIGN' => fn($x) => ($x > 0) - ($x < 0),
             ]);
 
-            $this->sqliteCreateFunctions([ // non-deterministic
+            $this->sqliteCreateFunctions([// non-deterministic
                 'RAND' => fn() => mt_rand() / mt_getrandmax(),
             ], false);
         }
@@ -206,7 +206,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->driver;
     }
 
@@ -217,7 +217,7 @@ 
      *
      * @return true
      */
-    public function beginTransaction () {
+    public function beginTransaction() {
         assert($this->transactions >= 0);
         if ($this->transactions === 0) {
             $this->logger->__invoke("BEGIN TRANSACTION");
@@ -237,7 +237,7 @@ 
      *
      * @return true
      */
-    public function commit () {
+    public function commit() {
         assert($this->transactions > 0);
         if ($this->transactions === 1) {
             $this->logger->__invoke("COMMIT TRANSACTION");
@@ -257,7 +257,7 @@ 
      * @param string $sql
      * @return int
      */
-    public function exec ($sql): int {
+    public function exec($sql): int {
         $this->logger->__invoke($sql);
         return parent::exec($sql);
     }
@@ -273,14 +273,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;
     }
 
@@ -290,14 +290,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;
     }
 
@@ -305,7 +305,7 @@ 
      * @param string $dir
      * @return Migrator
      */
-    public function getMigrator () {
+    public function getMigrator() {
         return Migrator::factory($this, $this->migrations);
     }
 
@@ -315,7 +315,7 @@ 
      * @param string|EntityInterface $class
      * @return Record
      */
-    public function getRecord ($class) {
+    public function getRecord($class) {
         if (is_object($class)) {
             $class = get_class($class);
         }
@@ -325,28 +325,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';
     }
 
@@ -369,7 +369,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);
         }
@@ -390,7 +390,7 @@ 
      *
      * @return Transaction
      */
-    public function newTransaction () {
+    public function newTransaction() {
         return Transaction::factory($this);
     }
 
@@ -400,7 +400,7 @@ 
      * @param string $table
      * @return bool
      */
-    final public function offsetExists ($table): bool {
+    final public function offsetExists($table): bool {
         return (bool)$this->offsetGet($table);
     }
 
@@ -410,7 +410,7 @@ 
      * @param string $table
      * @return null|Table
      */
-    public function offsetGet ($table) {
+    public function offsetGet($table) {
         return $this->schema->getTable($table);
     }
 
@@ -419,7 +419,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.');
     }
 
@@ -427,7 +427,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.');
     }
 
@@ -436,7 +436,7 @@ 
      *
      * @return Num
      */
-    public function pi () {
+    public function pi() {
         return Num::factory($this, "PI()");
     }
 
@@ -447,7 +447,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);
@@ -463,7 +463,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());
@@ -481,7 +481,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;
         }
@@ -501,7 +501,7 @@ 
      * @param array $values
      * @return string[]
      */
-    public function quoteArray (array $values) {
+    public function quoteArray(array $values) {
         return array_map([$this, 'quote'], $values);
     }
 
@@ -511,7 +511,7 @@ 
      * @param array $values
      * @return string
      */
-    public function quoteList (array $values): string {
+    public function quoteList(array $values): string {
         return implode(',', $this->quoteArray($values));
     }
 
@@ -520,7 +520,7 @@ 
      *
      * @return Num
      */
-    public function rand () {
+    public function rand() {
         return Num::factory($this, "RAND()");
     }
 
@@ -531,7 +531,7 @@ 
      *
      * @return true
      */
-    public function rollBack () {
+    public function rollBack() {
         assert($this->transactions > 0);
         if ($this->transactions === 1) {
             $this->logger->__invoke("ROLLBACK TRANSACTION");
@@ -551,7 +551,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);
     }
 
@@ -560,7 +560,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;
     }
@@ -569,7 +569,7 @@ 
      * @param Closure $logger
      * @return $this
      */
-    public function setLogger (Closure $logger) {
+    public function setLogger(Closure $logger) {
         $this->logger = $logger;
         return $this;
     }
@@ -579,7 +579,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;
     }
@@ -588,7 +588,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();
@@ -604,7 +604,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 +4 added lines, -8 removed lines

@@ -166,8 +166,7 @@ 
 
         if ($this->isMySQL()) {
             $this->exec("SET time_zone = 'UTC'");
-        }
-        elseif ($this->isSQLite()) {
+        } elseif ($this->isSQLite()) {
             // polyfill sqlite functions
             $this->sqliteCreateFunctions([ // deterministic functions
                 // https://www.sqlite.org/lang_mathfunc.html
@@ -222,8 +221,7 @@ 
         if ($this->transactions === 0) {
             $this->logger->__invoke("BEGIN TRANSACTION");
             parent::beginTransaction();
-        }
-        else {
+        } else {
             $this->exec("SAVEPOINT SAVEPOINT_{$this->transactions}");
         }
         $this->transactions++;
@@ -242,8 +240,7 @@ 
         if ($this->transactions === 1) {
             $this->logger->__invoke("COMMIT TRANSACTION");
             parent::commit();
-        }
-        else {
+        } else {
             $savepoint = $this->transactions - 1;
             $this->exec("RELEASE SAVEPOINT SAVEPOINT_{$savepoint}");
         }
@@ -536,8 +533,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/Fluent/AbstractTrait.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     /**
      * @return string
      */
-    abstract public function __toString ();
+    abstract public function __toString();
 
     /**
      * @var DB

src/DB/Fluent/Value/ComparisonTrait.php

Spacing +22 added lines, -22 removed lines

@@ -25,7 +25,7 @@ 
      * @return Predicate
      * @internal
      */
-    protected function _isRelational ($arg, string $oper, string $multi) {
+    protected function _isRelational($arg, string $oper, string $multi) {
         static $inverse = [
             '<' => '>=',
             '<=' => '>',
@@ -54,7 +54,7 @@ 
      * @param null|scalar|Select $arg
      * @return Predicate
      */
-    public function is ($arg): Predicate {
+    public function is($arg): Predicate {
         if ($arg instanceof Select) {
             if ($this->db->isSQLite()) {
                 return Select::factory($this->db, $arg, [$arg[0]])
@@ -82,7 +82,7 @@ 
      * @param number $max
      * @return Predicate
      */
-    public function isBetween ($min, $max) {
+    public function isBetween($min, $max) {
         $min = $this->db->quote($min);
         $max = $this->db->quote($max);
         return Predicate::factory($this->db, "{$this} BETWEEN {$min} AND {$max}");
@@ -94,7 +94,7 @@ 
      * @param scalar|array|Select $arg
      * @return Predicate
      */
-    public function isEqual ($arg) {
+    public function isEqual($arg) {
         return $this->db->match($this, $arg);
     }
 
@@ -103,7 +103,7 @@ 
      *
      * @return Predicate
      */
-    public function isFalse () {
+    public function isFalse() {
         return Predicate::factory($this->db, "{$this} IS FALSE");
     }
 
@@ -113,7 +113,7 @@ 
      * @param number|string|Select $arg
      * @return Predicate
      */
-    public function isGt ($arg) {
+    public function isGt($arg) {
         return $this->_isRelational($arg, '>', 'ALL');
     }
 
@@ -123,7 +123,7 @@ 
      * @param Select $select
      * @return Predicate
      */
-    public function isGtAny (Select $select) {
+    public function isGtAny(Select $select) {
         return $this->_isRelational($select, '>', 'ANY');
     }
 
@@ -133,7 +133,7 @@ 
      * @param number|string|Select $arg
      * @return Predicate
      */
-    public function isGte ($arg) {
+    public function isGte($arg) {
         return $this->_isRelational($arg, '>=', 'ALL');
     }
 
@@ -143,7 +143,7 @@ 
      * @param Select $select
      * @return Predicate
      */
-    public function isGteAny (Select $select) {
+    public function isGteAny(Select $select) {
         return $this->_isRelational($select, '>=', 'ANY');
     }
 
@@ -153,7 +153,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isLike (string $pattern) {
+    public function isLike(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return Predicate::factory($this->db, "{$this} LIKE {$pattern}");
     }
@@ -164,7 +164,7 @@ 
      * @param number|string|Select $arg
      * @return Predicate
      */
-    public function isLt ($arg) {
+    public function isLt($arg) {
         return $this->_isRelational($arg, '<', 'ALL');
     }
 
@@ -174,7 +174,7 @@ 
      * @param Select $select
      * @return Predicate
      */
-    public function isLtAny (Select $select) {
+    public function isLtAny(Select $select) {
         return $this->_isRelational($select, '<', 'ANY');
     }
 
@@ -184,7 +184,7 @@ 
      * @param number|string|Select $arg
      * @return Predicate
      */
-    public function isLte ($arg) {
+    public function isLte($arg) {
         return $this->_isRelational($arg, '<=', 'ALL');
     }
 
@@ -194,7 +194,7 @@ 
      * @param Select $select
      * @return Predicate
      */
-    public function isLteAny (Select $select) {
+    public function isLteAny(Select $select) {
         return $this->_isRelational($select, '<=', 'ANY');
     }
 
@@ -204,7 +204,7 @@ 
      * @param null|scalar|Select $arg
      * @return Predicate
      */
-    public function isNot ($arg) {
+    public function isNot($arg) {
         return $this->is($arg)->not();
     }
 
@@ -215,7 +215,7 @@ 
      * @param number $max
      * @return Predicate
      */
-    public function isNotBetween ($min, $max) {
+    public function isNotBetween($min, $max) {
         $min = $this->db->quote($min);
         $max = $this->db->quote($max);
         return Predicate::factory($this->db, "{$this} NOT BETWEEN {$min} AND {$max}");
@@ -227,7 +227,7 @@ 
      * @param scalar|array|Select $arg
      * @return Predicate
      */
-    public function isNotEqual ($arg) {
+    public function isNotEqual($arg) {
         if ($arg instanceof Select) {
             return Predicate::factory($this->db, "{$this} NOT IN ({$arg->toSql()})");
         }
@@ -243,7 +243,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isNotLike (string $pattern) {
+    public function isNotLike(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return Predicate::factory($this->db, "{$this} NOT LIKE {$pattern}");
     }
@@ -253,7 +253,7 @@ 
      *
      * @return Predicate
      */
-    public function isNotNull () {
+    public function isNotNull() {
         return Predicate::factory($this->db, "{$this} IS NOT NULL");
     }
 
@@ -263,7 +263,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isNotRegExp (string $pattern) {
+    public function isNotRegExp(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return Predicate::factory($this->db, "{$this} NOT REGEXP {$pattern}");
     }
@@ -273,7 +273,7 @@ 
      *
      * @return Predicate
      */
-    public function isNull () {
+    public function isNull() {
         return Predicate::factory($this->db, "{$this} IS NULL");
     }
 
@@ -283,7 +283,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isRegExp (string $pattern) {
+    public function isRegExp(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return Predicate::factory($this->db, "{$this} REGEXP {$pattern}");
     }

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()) {