hfw / db

src/DB/Schema.php

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);

Spacing +21 added lines, -21 removed lines

@@ -196,7 +196,7 @@ 
     /**
      * @param DB $db
      */
-    public function __construct (DB $db) {
+    public function __construct(DB $db) {
         $this->db = $db;
         $this->colDefs ??= self::COLUMN_DEFINITIONS[$db->getDriver()];
     }
@@ -209,7 +209,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]);
@@ -235,7 +235,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 */
@@ -271,7 +271,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;
@@ -282,7 +282,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]);
     }
@@ -290,7 +290,7 @@ 
     /**
      * @return DB
      */
-    public function getDb () {
+    public function getDb() {
         return $this->db;
     }
 
@@ -298,7 +298,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();
@@ -323,7 +323,7 @@ 
      * @param string $table
      * @return bool
      */
-    final public function offsetExists ($table): bool {
+    final public function offsetExists($table): bool {
         return (bool)$this->offsetGet($table);
     }
 
@@ -333,7 +333,7 @@ 
      * @param string $table
      * @return null|Table
      */
-    public function offsetGet ($table) {
+    public function offsetGet($table) {
         return $this->getTable($table);
     }
 
@@ -342,7 +342,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.');
     }
 
@@ -350,7 +350,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.');
     }
 
@@ -362,7 +362,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;
@@ -375,7 +375,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;
@@ -387,7 +387,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;
@@ -399,7 +399,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 = [];
@@ -424,7 +424,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),
@@ -441,7 +441,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;
     }
 
@@ -450,7 +450,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),
@@ -465,7 +465,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);
     }
@@ -475,7 +475,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),
@@ -490,7 +490,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/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

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);

Spacing +9 added lines, -9 removed lines

@@ -34,7 +34,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();
@@ -49,7 +49,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;
     }
@@ -63,7 +63,7 @@ 
      * @param array $match Keyed by junction column.
      * @return Select|EntityInterface[]
      */
-    public function findAll (string $key, array $match = []) {
+    public function findAll(string $key, array $match = []) {
         $record = $this->getRecord($key);
         $select = $record->loadAll();
         $select->join($this, $this[$key]->isEqual($record['id']));
@@ -77,14 +77,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;
     }
 
@@ -92,14 +92,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);
     }
 
@@ -109,7 +109,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)));
@@ -132,7 +132,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

src/DB/Migrator.php

Spacing +7 added lines, -7 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;
         $this->table ??= $db['__migrations__'] ?? $db->getSchema()->createTable('__migrations__', [
@@ -48,7 +48,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
@@ -75,14 +75,14 @@ 
      *
      * @return null|string
      */
-    public function getCurrent (): ?string {
+    public function getCurrent(): ?string {
         return $this->table->select([$this->table['sequence']->max()])->getResult();
     }
 
     /**
      * @return string
      */
-    final public function getDir (): string {
+    final public function getDir(): string {
         return $this->dir;
     }
 
@@ -90,7 +90,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;
@@ -101,7 +101,7 @@ 
      *
      * @return string[] [ sequence => file ]
      */
-    protected function glob () {
+    protected function glob() {
         $files = [];
         foreach (glob("{$this->dir}/*.php") as $file) {
             $files[basename($file, '.php')] = $file;
@@ -115,7 +115,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/MigrationInterface.php

Spacing +2 added lines, -2 removed lines

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

bin/helix.db.migrate.php

Indentation +1 added lines, -3 removed lines

@@ -271,6 +271,4 @@
         return;
 
     default:
-        $usage();
-        exit(1);
-}
\ No newline at end of file
+        $usage
\ No newline at end of file

Switch Indentation +1 added lines, -3 removed lines

@@ -271,6 +271,4 @@
         return;
 
     default:
-        $usage();
-        exit(1);
-}
\ No newline at end of file
+        $usage
\ No newline at end of file

Braces +1 added lines, -3 removed lines

@@ -271,6 +271,4 @@
         return;
 
     default:
-        $usage();
-        exit(1);
-}
\ No newline at end of file
+        $usage
\ No newline at end of file

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

@@ -271,6 +271,4 @@
         return;
 
     default:
-        $usage();
-        exit(1);
-}
\ No newline at end of file
+        $usage
\ No newline at end of file

Spacing +4 added lines, -6 removed lines

@@ -145,7 +145,7 @@ 
         };
         if ($access instanceof Record) {
             // create table
-            if (!$db[$access->getName()]) {
+            if (!$db[$access - >getName()]) {
                 $columns = [];
                 foreach ($access->getTypes() as $property => $type) {
                     $T_CONST = Schema::PHP_TYPE_NAMES[$type];
@@ -163,7 +163,7 @@ 
             // check each eav
             foreach ($access->getEav() as $eav) {
                 // create table
-                if (!$db[$eav->getName()]) {
+                if (!$db[$eav - >getName()]) {
                     $T_CONST = Schema::PHP_TYPE_NAMES[$eav->getType()];
                     $columns = [
                         "'entity' => Schema::T_INT_STRICT",
@@ -183,7 +183,7 @@ 
         }
         elseif ($access instanceof Junction) {
             // create table
-            if (!$db[$access->getName()]) {
+            if (!$db[$access - >getName()]) {
                 $records = $access->getRecords();
                 $columns = array_map(
                     fn(string $column) => "'{$column}' => Schema::T_INT_STRICT",
@@ -271,6 +271,4 @@ 
         return;
 
     default:
-        $usage();
-        exit(1);
-}
\ No newline at end of file
+        $usage
\ No newline at end of file

src/DB/Record.php

Spacing +23 added lines, -23 removed lines

@@ -87,7 +87,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 = [];
@@ -116,7 +116,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);
@@ -165,7 +165,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));
     }
 
@@ -176,7 +176,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++) {
@@ -198,7 +198,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));
@@ -217,21 +217,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;
     }
 
@@ -240,14 +240,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;
     }
 
@@ -258,7 +258,7 @@ 
      *
      * @return string[]
      */
-    final public function getTypes (): array {
+    final public function getTypes(): array {
         return $this->types;
     }
 
@@ -266,7 +266,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);
@@ -278,7 +278,7 @@ 
      * @param string $property
      * @return bool
      */
-    final public function isNullable (string $property): bool {
+    final public function isNullable(string $property): bool {
         return $this->nullable[$property];
     }
 
@@ -288,7 +288,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();
         });
@@ -308,7 +308,7 @@ 
      *
      * @return Select|EntityInterface[]
      */
-    public function loadAll () {
+    public function loadAll() {
         return $this->select()->setFetcher(function(Statement $statement) {
             yield from $this->fetchEach($statement);
         });
@@ -319,7 +319,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) {
@@ -334,7 +334,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);
         }
@@ -348,7 +348,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
@@ -364,7 +364,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']);
@@ -383,7 +383,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']);
@@ -398,7 +398,7 @@ 
      * @param EntityInterface $proto
      * @return $this
      */
-    public function setProto (EntityInterface $proto) {
+    public function setProto(EntityInterface $proto) {
         $this->proto = $proto;
         return $this;
     }
@@ -410,7 +410,7 @@ 
      * @param mixed $value
      * @return mixed
      */
-    protected function setType (string $property, $value) {
+    protected function setType(string $property, $value) {
         if (isset($value)) {
             // doesn't care about the type's letter case
             settype($value, $this->types[$property]);
@@ -422,7 +422,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

@@ -96,8 +96,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);
                 $EAV[$rProp->getName()] = EAV::factory($db, $eav['table'], $var['type'] ?? 'string');
             }
@@ -337,8 +336,7 @@ 
     public function save (EntityInterface $entity): int {
         if (!$entity->getId()) {
             $this->saveInsert($entity);
-        }
-        else {
+        } else {
             $this->saveUpdate($entity);
         }
         $this->saveEav($entity);
@@ -426,8 +424,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 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 = ?');
@@ -98,7 +98,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 [];
         }
@@ -123,7 +123,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))
@@ -151,7 +151,7 @@ 
      * @param mixed $value
      * @return null|scalar
      */
-    protected function setType ($value) {
+    protected function setType($value) {
         if (isset($value)) {
             settype($value, $this->type);
         }