hfw / db

src/DB/Junction.php

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

bin/helix.db.migrate.php

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