hfw / db

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

src/DB/Record.php

Spacing +21 added lines, -21 removed lines

@@ -76,7 +76,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 = [];
@@ -104,7 +104,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);
@@ -157,7 +157,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));
@@ -175,14 +175,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);
     }
 
@@ -193,7 +193,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++) {
@@ -209,7 +209,7 @@ 
     /**
      * @return EAV[]
      */
-    public function getEav () {
+    public function getEav() {
         return $this->eav;
     }
 
@@ -218,14 +218,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;
     }
 
@@ -236,7 +236,7 @@ 
      *
      * @return string[]
      */
-    final public function getTypes (): array {
+    final public function getTypes(): array {
         return $this->types;
     }
 
@@ -244,7 +244,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);
@@ -256,7 +256,7 @@ 
      * @param string $property
      * @return bool
      */
-    final public function isNullable (string $property): bool {
+    final public function isNullable(string $property): bool {
         return $this->nullable[$property];
     }
 
@@ -266,7 +266,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();
         });
@@ -286,7 +286,7 @@ 
      *
      * @return Select|EntityInterface[]
      */
-    public function loadAll () {
+    public function loadAll() {
         return $this->select()->setFetcher(function(Statement $statement) {
             yield from $this->getEach($statement);
         });
@@ -297,7 +297,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) {
@@ -312,7 +312,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);
         }
@@ -326,7 +326,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
@@ -342,7 +342,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']);
@@ -361,7 +361,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']);
@@ -376,7 +376,7 @@ 
      * @param EntityInterface $proto
      * @return $this
      */
-    public function setProto (EntityInterface $proto) {
+    public function setProto(EntityInterface $proto) {
         $this->proto = $proto;
         return $this;
     }
@@ -385,7 +385,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

src/DB/Schema.php

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

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

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->getValueType()];
                     $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

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