hfw / db

src/DB/Schema.php

Spacing +30 added lines, -30 removed lines

@@ -124,15 +124,15 @@ 
      */
     const T_CONST_NAMES = [
         'bool' => 'T_BOOL',
-        'boolean' => 'T_BOOL',      // gettype()
+        'boolean' => 'T_BOOL', // gettype()
         'DateTime' => 'T_DATETIME', // dehydrated (see Record)
-        'double' => 'T_BLOB',       // gettype()
+        'double' => 'T_BLOB', // gettype()
         'float' => 'T_FLOAT',
         'int' => 'T_INT',
-        'integer' => 'T_INT',       // gettype()
+        'integer' => 'T_INT', // gettype()
         'string' => 'T_STRING',
-        'String' => 'T_TEXT',       // @var String
-        'STRING' => 'T_BLOB',       // @var STRING
+        'String' => 'T_TEXT', // @var String
+        'STRING' => 'T_BLOB', // @var STRING
     ];
 
     /**
@@ -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/Record.php

Spacing +26 added lines, -26 removed lines

@@ -117,7 +117,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 = [];
@@ -146,7 +146,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;
         $this->utc = new DateTimeZone('UTC');
@@ -206,7 +206,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));
     }
 
@@ -217,7 +217,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++) {
@@ -239,7 +239,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));
@@ -258,21 +258,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;
     }
 
@@ -281,14 +281,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;
     }
 
@@ -300,7 +300,7 @@ 
      * @param string $property
      * @return string
      */
-    final public function getType (string $property): string {
+    final public function getType(string $property): string {
         return $this->types[$property];
     }
 
@@ -311,7 +311,7 @@ 
      *
      * @return string[]
      */
-    final public function getTypes (): array {
+    final public function getTypes(): array {
         return $this->types;
     }
 
@@ -319,7 +319,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);
@@ -343,7 +343,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':
@@ -358,7 +358,7 @@ 
      * @param string $property
      * @return bool
      */
-    final public function isNullable (string $property): bool {
+    final public function isNullable(string $property): bool {
         return $this->nullable[$property];
     }
 
@@ -368,7 +368,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();
         });
@@ -388,7 +388,7 @@ 
      *
      * @return Select|EntityInterface[]
      */
-    public function loadAll () {
+    public function loadAll() {
         return $this->select()->setFetcher(function(Statement $statement) {
             yield from $this->fetchEach($statement);
         });
@@ -399,7 +399,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) {
@@ -414,7 +414,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);
         }
@@ -428,7 +428,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
@@ -444,7 +444,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']);
@@ -463,7 +463,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']);
@@ -478,7 +478,7 @@ 
      * @param EntityInterface $proto
      * @return $this
      */
-    public function setProto (EntityInterface $proto) {
+    public function setProto(EntityInterface $proto) {
         $this->proto = $proto;
         return $this;
     }
@@ -490,7 +490,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])) {
@@ -514,7 +514,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':
                 /**
@@ -537,7 +537,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));