hfw / db

src/DB/Record.php

Spacing +17 added lines, -17 removed lines

@@ -59,7 +59,7 @@ 
      * @param string|EntityInterface $class
      * @return Record
      */
-    public static function fromClass (DB $db, $class) {
+    public static function fromClass(DB $db, $class) {
         try {
             $rClass = new ReflectionClass($class);
         }
@@ -92,7 +92,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;
         try {
@@ -128,7 +128,7 @@ 
      * @param array[] $eavMatch `[eav property => attribute => mixed]`
      * @return Select
      */
-    public function find (array $match, array $eavMatch = []) {
+    public function find(array $match, array $eavMatch = []) {
         $select = $this->select();
         foreach ($match as $a => $b) {
             $select->where($this->db->match($this[$a] ?? $a, $b));
@@ -146,7 +146,7 @@ 
      * @param Statement $statement
      * @return EntityInterface[] Enumerated
      */
-    public function getAll (Statement $statement): array {
+    public function getAll(Statement $statement): array {
         return iterator_to_array($this->getEach($statement));
     }
 
@@ -157,7 +157,7 @@ 
      * @param Statement $statement
      * @return Generator
      */
-    public function getEach (Statement $statement) {
+    public function getEach(Statement $statement) {
         do {
             $entities = [];
             for ($i = 0; $i < 256 and false !== $row = $statement->fetch(); $i++) {
@@ -175,14 +175,14 @@ 
      * @param string $property
      * @return EAV
      */
-    final public function getEav (string $property) {
+    final public function getEav(string $property) {
         return $this->eav[$property];
     }
 
     /**
      * @return EntityInterface
      */
-    public function getProto () {
+    public function getProto() {
         return $this->proto;
     }
 
@@ -190,7 +190,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);
@@ -204,7 +204,7 @@ 
      * @param int $id
      * @return null|EntityInterface
      */
-    public function load (int $id) {
+    public function load(int $id) {
         $load = $this->cache(__FUNCTION__, function() {
             return $this->select(array_keys($this->columns))->where('id = ?')->prepare();
         });
@@ -222,7 +222,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) {
@@ -239,7 +239,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);
         }
@@ -253,7 +253,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) {
             $values = $this->properties[$name]->getValue($entity);
@@ -268,7 +268,7 @@ 
      *
      * @param EntityInterface $entity
      */
-    protected function saveInsert (EntityInterface $entity): void {
+    protected function saveInsert(EntityInterface $entity): void {
         $insert = $this->cache(__FUNCTION__, function() {
             $slots = SQL::slots(array_keys($this->columns));
             unset($slots['id']);
@@ -286,7 +286,7 @@ 
      *
      * @param EntityInterface $entity
      */
-    protected function saveUpdate (EntityInterface $entity): void {
+    protected function saveUpdate(EntityInterface $entity): void {
         $this->cache(__FUNCTION__, function() {
             $slots = SQL::slotsEqual(array_keys($this->columns));
             unset($slots['id']);
@@ -301,7 +301,7 @@ 
      * @param array $columns Defaults to all columns.
      * @return Select
      */
-    public function select (array $columns = []) {
+    public function select(array $columns = []) {
         $select = parent::select($columns);
         if (empty($columns)) {
             $select->setFetcher(function(Statement $statement) {
@@ -315,7 +315,7 @@ 
      * @param EntityInterface $proto
      * @return $this
      */
-    public function setProto (EntityInterface $proto) {
+    public function setProto(EntityInterface $proto) {
         $this->proto = $proto;
         return $this;
     }
@@ -324,7 +324,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) {
             settype($value, $this->types[$name]);
             $this->properties[$name]->setValue($entity, $value);

src/DB.php

Spacing +21 added lines, -21 removed lines

@@ -52,7 +52,7 @@ 
      * @param string $passwd
      * @param array $options
      */
-    public function __construct ($dsn, $username = null, $passwd = null, $options = null) {
+    public function __construct($dsn, $username = null, $passwd = null, $options = null) {
         parent::__construct($dsn, $username, $passwd, $options);
         $this->driver = $this->getAttribute(self::ATTR_DRIVER_NAME);
         $this->setAttribute(self::ATTR_DEFAULT_FETCH_MODE, self::FETCH_ASSOC);
@@ -73,7 +73,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->driver;
     }
 
@@ -83,7 +83,7 @@ 
      * @param string $sql
      * @return int
      */
-    public function exec ($sql): int {
+    public function exec($sql): int {
         $this->logger->__invoke($sql);
         return parent::exec($sql);
     }
@@ -91,7 +91,7 @@ 
     /**
      * @return string
      */
-    final public function getDriver (): string {
+    final public function getDriver(): string {
         return $this->driver;
     }
 
@@ -101,7 +101,7 @@ 
      * @param string $interface
      * @return Junction
      */
-    public function getJunction ($interface) {
+    public function getJunction($interface) {
         if (!isset($this->junctions[$interface])) {
             $this->junctions[$interface] = Junction::fromInterface($this, $interface);
         }
@@ -111,7 +111,7 @@ 
     /**
      * @return Closure
      */
-    public function getLogger () {
+    public function getLogger() {
         return $this->logger;
     }
 
@@ -121,7 +121,7 @@ 
      * @param string|EntityInterface $class
      * @return Record
      */
-    public function getRecord ($class) {
+    public function getRecord($class) {
         if (is_object($class)) {
             $class = get_class($class);
         }
@@ -148,7 +148,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);
         }
@@ -168,7 +168,7 @@ 
      * @param string $class Class or interface name.
      * @return bool
      */
-    public function offsetExists ($class): bool {
+    public function offsetExists($class): bool {
         return (bool)$this->offsetGet($class);
     }
 
@@ -176,7 +176,7 @@ 
      * @param string $class Class or interface name.
      * @return null|Record|Junction
      */
-    public function offsetGet ($class) {
+    public function offsetGet($class) {
         if (class_exists($class)) {
             return $this->getRecord($class);
         }
@@ -190,7 +190,7 @@ 
      * @param string $class Class or interface name.
      * @param Record|Junction $access
      */
-    public function offsetSet ($class, $access) {
+    public function offsetSet($class, $access) {
         if ($access instanceof Record) {
             $this->setRecord($class, $access);
         }
@@ -202,7 +202,7 @@ 
     /**
      * @param string $class Class or interface name.
      */
-    public function offsetUnset ($class) {
+    public function offsetUnset($class) {
         unset($this->records[$class]);
         unset($this->junctions[$class]);
     }
@@ -214,7 +214,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);
@@ -230,7 +230,7 @@ 
      * @param array $ctorargs
      * @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());
@@ -249,7 +249,7 @@ 
      * @param int $type Ignored.
      * @return string
      */
-    public function quote ($value, $type = self::PARAM_STR) {
+    public function quote($value, $type = self::PARAM_STR) {
         if ($value instanceof ExpressionInterface) {
             return $value;
         }
@@ -269,7 +269,7 @@ 
      * @param array $values
      * @return string[]
      */
-    public function quoteArray (array $values): array {
+    public function quoteArray(array $values): array {
         return array_map([$this, 'quote'], $values);
     }
 
@@ -279,7 +279,7 @@ 
      * @param array $values
      * @return string
      */
-    public function quoteList (array $values): string {
+    public function quoteList(array $values): string {
         return implode(',', $this->quoteArray($values));
     }
 
@@ -289,7 +289,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);
     }
 
@@ -298,7 +298,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;
     }
@@ -307,7 +307,7 @@ 
      * @param Closure $logger
      * @return $this
      */
-    public function setLogger (Closure $logger) {
+    public function setLogger(Closure $logger) {
         $this->logger = $logger;
         return $this;
     }
@@ -317,7 +317,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;
     }

src/DB/Table.php

Spacing +14 added lines, -14 removed lines

@@ -39,7 +39,7 @@ 
      * @param string $name
      * @param string[] $columns
      */
-    public function __construct (DB $db, $name, array $columns) {
+    public function __construct(DB $db, $name, array $columns) {
         parent::__construct($db);
         $this->name = $name;
         asort($columns);
@@ -53,7 +53,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->name;
     }
 
@@ -63,7 +63,7 @@ 
      * @param array $values
      * @return int Rows affected.
      */
-    public function apply (array $values): int {
+    public function apply(array $values): int {
         $columns = implode(',', array_keys($values));
         $values = $this->db->quoteList($values);
         switch ($this->db) {
@@ -85,7 +85,7 @@ 
      * @param Closure $prepare `():Statement`
      * @return Statement
      */
-    protected function cache (string $key, Closure $prepare) {
+    protected function cache(string $key, Closure $prepare) {
         return $this->_cache[$key] ?? $this->_cache[$key] = $prepare->__invoke();
     }
 
@@ -93,7 +93,7 @@ 
      * @param array $match `[a => b]`
      * @return int
      */
-    public function count (array $match = []) {
+    public function count(array $match = []) {
         $select = $this->select(['COUNT(*)']);
         foreach ($match as $a => $b) {
             $select->where($this->db->match($this[$a] ?? $a, $b));
@@ -109,7 +109,7 @@ 
      * @param array $match
      * @return int Rows affected.
      */
-    public function delete (array $match): int {
+    public function delete(array $match): int {
         foreach ($match as $a => $b) {
             $match[$a] = $this->db->match($this[$a] ?? $a, $b);
         }
@@ -120,14 +120,14 @@ 
     /**
      * @return Column[]
      */
-    final public function getColumns (): array {
+    final public function getColumns(): array {
         return $this->columns;
     }
 
     /**
      * @return string
      */
-    final public function getName (): string {
+    final public function getName(): string {
         return $this->name;
     }
 
@@ -137,7 +137,7 @@ 
      * @param array $values
      * @return Statement
      */
-    public function insert (array $values) {
+    public function insert(array $values) {
         $columns = implode(',', array_keys($values));
         $values = $this->db->quoteList($values);
         return $this->db->query("INSERT INTO {$this} ($columns) VALUES ($values)");
@@ -147,7 +147,7 @@ 
      * @param string $name
      * @return bool
      */
-    public function offsetExists ($name): bool {
+    public function offsetExists($name): bool {
         return isset($this->columns[$name]);
     }
 
@@ -155,7 +155,7 @@ 
      * @param string $name
      * @return Column
      */
-    public function offsetGet ($name) {
+    public function offsetGet($name) {
         return $this->columns[$name];
     }
 
@@ -165,7 +165,7 @@ 
      * @param string[] $columns Defaults to all columns.
      * @return Select
      */
-    public function select (array $columns = []) {
+    public function select(array $columns = []) {
         if (empty($columns)) {
             $columns = $this->columns;
         }
@@ -178,7 +178,7 @@ 
      * @param string $name
      * @return Table
      */
-    public function setName (string $name) {
+    public function setName(string $name) {
         $clone = clone $this;
         $clone->name = $name;
         foreach ($this->columns as $name => $column) {
@@ -196,7 +196,7 @@ 
      * @param array $match
      * @return int Rows affected.
      */
-    public function update (array $values, array $match): int {
+    public function update(array $values, array $match): int {
         foreach ($this->db->quoteArray($values) as $key => $value) {
             $values[$key] = "{$key} = {$value}";
         }

src/DB/SQL/Predicate.php

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
      * @param string[] $conditions
      * @return Predicate
      */
-    public static function all (array $conditions) {
+    public static function all(array $conditions) {
         if (count($conditions) === 1) {
             return new static(reset($conditions));
         }
@@ -30,7 +30,7 @@ 
      * @param string[] $conditions
      * @return Predicate
      */
-    public static function any (array $conditions) {
+    public static function any(array $conditions) {
         if (count($conditions) === 1) {
             return new static(reset($conditions));
         }
@@ -42,7 +42,7 @@ 
      *
      * @return Predicate
      */
-    public function invert () {
+    public function invert() {
         return new static("NOT({$this})");
     }
 }
\ No newline at end of file

src/DB/Select.php

Spacing +27 added lines, -27 removed lines

@@ -112,7 +112,7 @@ 
      * @param string|Select $table
      * @param string[] $columns
      */
-    public function __construct (DB $db, $table, array $columns) {
+    public function __construct(DB $db, $table, array $columns) {
         parent::__construct($db);
         if ($table instanceof Select) {
             $this->table = $table->toSubquery();
@@ -132,7 +132,7 @@ 
      * @param array $args
      * @return Statement
      */
-    public function __invoke (array $args = []) {
+    public function __invoke(array $args = []) {
         return $this->execute($args);
     }
 
@@ -141,7 +141,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->alias;
     }
 
@@ -151,7 +151,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 = '';
@@ -164,7 +164,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());
         }
@@ -179,7 +179,7 @@ 
      * @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)));
     }
 
@@ -192,7 +192,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));
     }
 
@@ -204,7 +204,7 @@ 
      * @param array $args
      * @return mixed
      */
-    public function getFirst (array $args = []) {
+    public function getFirst(array $args = []) {
         return $this->getEach($args)->current();
     }
 
@@ -215,7 +215,7 @@ 
      *
      * @return Generator
      */
-    public function getIterator () {
+    public function getIterator() {
         yield from $this->getEach();
     }
 
@@ -225,7 +225,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}";
         }
@@ -241,7 +241,7 @@ 
      * @param string $condition
      * @return $this
      */
-    public function having (string $condition) {
+    public function having(string $condition) {
         if (!strlen($this->_having)) {
             $this->_having = " HAVING {$condition}";
         }
@@ -258,7 +258,7 @@ 
      * @param bool $all
      * @return $this
      */
-    public function intersect (Select $select, $all = false) {
+    public function intersect(Select $select, $all = false) {
         $select = clone $select;
         $select->_order = '';
         $select->_limit = '';
@@ -276,7 +276,7 @@ 
      *
      * @return Predicate
      */
-    public function isEmpty () {
+    public function isEmpty() {
         return new Predicate("NOT EXISTS ({$this->toSql()})");
     }
 
@@ -285,7 +285,7 @@ 
      *
      * @return Predicate
      */
-    public function isNotEmpty () {
+    public function isNotEmpty() {
         return new Predicate("EXISTS ({$this->toSql()})");
     }
 
@@ -297,7 +297,7 @@ 
      * @param string $type
      * @return $this
      */
-    public function join ($table, string $condition, string $type = 'INNER') {
+    public function join($table, string $condition, string $type = 'INNER') {
         if ($table instanceof Select) {
             $table = $table->toSubquery();
         }
@@ -312,7 +312,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 = '';
         }
@@ -331,7 +331,7 @@ 
      * @param mixed $offset Ordinal or reference name.
      * @return bool
      */
-    public function offsetExists ($offset): bool {
+    public function offsetExists($offset): bool {
         return isset($this->refs[$offset]);
     }
 
@@ -341,7 +341,7 @@ 
      * @param mixed $offset Ordinal or reference name.
      * @return Column
      */
-    public function offsetGet ($offset) {
+    public function offsetGet($offset) {
         return $this->refs[$offset];
     }
 
@@ -351,7 +351,7 @@ 
      * @param string $order
      * @return $this
      */
-    public function order (string $order) {
+    public function order(string $order) {
         if (strlen($order)) {
             $order = " ORDER BY {$order}";
         }
@@ -362,7 +362,7 @@ 
     /**
      * @return Statement
      */
-    public function prepare () {
+    public function prepare() {
         return $this->db->prepare($this->toSql());
     }
 
@@ -370,7 +370,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);
@@ -384,7 +384,7 @@ 
      * @param string[] $columns
      * @return $this
      */
-    public function setColumns (array $columns) {
+    public function setColumns(array $columns) {
         $this->refs = [];
         $_columns = [];
         $i = 0;
@@ -413,7 +413,7 @@ 
      * @param Closure $fetcher
      * @return $this
      */
-    public function setFetcher (Closure $fetcher) {
+    public function setFetcher(Closure $fetcher) {
         $this->fetcher = $fetcher;
         return $this;
     }
@@ -423,7 +423,7 @@ 
      *
      * @return string
      */
-    public function toSql (): string {
+    public function toSql(): string {
         $sql = "SELECT {$this->_columns} FROM {$this->table}";
         $sql .= $this->_join;
         $sql .= $this->_where;
@@ -440,7 +440,7 @@ 
      *
      * @return string
      */
-    public function toSubquery (): string {
+    public function toSubquery(): string {
         return "({$this->toSql()}) AS {$this->alias}";
     }
 
@@ -451,7 +451,7 @@ 
      * @param bool $all
      * @return $this
      */
-    public function union (Select $select, $all = false) {
+    public function union(Select $select, $all = false) {
         $select = clone $select;
         $select->_order = '';
         $select->_limit = '';
@@ -470,7 +470,7 @@ 
      * @param string $condition
      * @return $this
      */
-    public function where (string $condition) {
+    public function where(string $condition) {
         if (!strlen($this->_where)) {
             $this->_where = " WHERE {$condition}";
         }