hfw / db

src/DB/Table.php

Spacing +13 added lines, -13 removed lines

@@ -42,7 +42,7 @@ 
      * @param string $name
      * @param string[] $columns
      */
-    public function __construct (DB $db, string $name, array $columns) {
+    public function __construct(DB $db, string $name, array $columns) {
         parent::__construct($db);
         $this->name = $name;
         foreach ($columns as $column) {
@@ -55,7 +55,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->name;
     }
 
@@ -65,7 +65,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);
         if ($this->db->isSQLite()) {
@@ -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] ??= $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 int|string $column
      * @return Column
      */
-    public function offsetGet ($column) {
+    public function offsetGet($column) {
         if (is_int($column)) {
             return current(array_slice($this->columns, $column, 1)) ?: null;
         }
@@ -160,7 +160,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;
         }
@@ -173,7 +173,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) {
@@ -191,7 +191,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/EAV.php

Spacing +6 added lines, -6 removed lines

@@ -15,7 +15,7 @@ 
      * @param DB $db
      * @param string $name
      */
-    public function __construct (DB $db, string $name) {
+    public function __construct(DB $db, string $name) {
         parent::__construct($db, $name, ['entity', 'attribute', 'value']);
     }
 
@@ -26,7 +26,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();
         });
@@ -44,7 +44,7 @@ 
      * @param array $match `[attribute => value]`. If empty, selects all IDs for entities having at least one attribute.
      * @return Select
      */
-    public function find (array $match) {
+    public function find(array $match) {
         $select = $this->select([$this['entity']]);
         $prior = $this;
         foreach ($match as $attribute => $value) {
@@ -66,7 +66,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 = ?');
@@ -82,7 +82,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 [];
         }
@@ -107,7 +107,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))

src/DB.php

Braces +1 added lines, -2 removed lines

@@ -157,8 +157,7 @@
             if ($this->isSQLite()) {
                 $info = $this->query("PRAGMA table_info({$this->quote($name)})")->fetchAll();
                 $cols = array_column($info, 'name');
-            }
-            else {
+            } else {
                 $cols = $this->query(
                     "SELECT column_name FROM information_schema.tables WHERE table_name = {$this->quote($name)}"
                 )->fetchAll(self::FETCH_COLUMN);

Spacing +26 added lines, -26 removed lines

@@ -60,7 +60,7 @@ 
      * @param string $password
      * @param array $options
      */
-    public function __construct ($dsn, $username = null, $password = null, array $options = []) {
+    public function __construct($dsn, $username = null, $password = null, array $options = []) {
         $options += [
             self::ATTR_STATEMENT_CLASS => [Statement::class, [$this]]
         ];
@@ -83,7 +83,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->driver;
     }
 
@@ -93,7 +93,7 @@ 
      * @param string $sql
      * @return int
      */
-    public function exec ($sql): int {
+    public function exec($sql): int {
         $this->logger->__invoke($sql);
         return parent::exec($sql);
     }
@@ -109,14 +109,14 @@ 
      * @param mixed ...$args
      * @return mixed
      */
-    public function factory (string $class, ...$args) {
+    public function factory(string $class, ...$args) {
         return new $class($this, ...$args);
     }
 
     /**
      * @return string
      */
-    final public function getDriver (): string {
+    final public function getDriver(): string {
         return $this->driver;
     }
 
@@ -126,14 +126,14 @@ 
      * @param string $interface
      * @return Junction
      */
-    public function getJunction ($interface) {
+    public function getJunction($interface) {
         return $this->junctions[$interface] ??= Junction::fromInterface($this, $interface);
     }
 
     /**
      * @return Closure
      */
-    public function getLogger () {
+    public function getLogger() {
         return $this->logger;
     }
 
@@ -143,7 +143,7 @@ 
      * @param string|EntityInterface $class
      * @return Record
      */
-    public function getRecord ($class) {
+    public function getRecord($class) {
         if (is_object($class)) {
             $class = get_class($class);
         }
@@ -154,7 +154,7 @@ 
      * @param string $name
      * @return null|Table
      */
-    public function getTable (string $name) {
+    public function getTable(string $name) {
         if (!isset($this->tables[$name])) {
             if ($this->isSQLite()) {
                 $info = $this->query("PRAGMA table_info({$this->quote($name)})")->fetchAll();
@@ -176,21 +176,21 @@ 
     /**
      * @return bool
      */
-    final public function isMySQL (): bool {
+    final public function isMySQL(): bool {
         return $this->driver === 'mysql';
     }
 
     /**
      * @return bool
      */
-    final public function isPostgreSQL (): bool {
+    final public function isPostgreSQL(): bool {
         return $this->driver === 'pgsql';
     }
 
     /**
      * @return bool
      */
-    final public function isSQLite (): bool {
+    final public function isSQLite(): bool {
         return $this->driver === 'sqlite';
     }
 
@@ -211,7 +211,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);
         }
@@ -233,7 +233,7 @@ 
      * @param string $table
      * @return bool
      */
-    final public function offsetExists ($table): bool {
+    final public function offsetExists($table): bool {
         return (bool)$this->getTable($table);
     }
 
@@ -243,7 +243,7 @@ 
      * @param string $table
      * @return null|Table
      */
-    final public function offsetGet ($table) {
+    final public function offsetGet($table) {
         return $this->getTable($table);
     }
 
@@ -252,7 +252,7 @@ 
      * @param $value
      * @throws LogicException
      */
-    final public function offsetSet ($offset, $value) {
+    final public function offsetSet($offset, $value) {
         throw new LogicException('Raw table access is immutable.');
     }
 
@@ -260,7 +260,7 @@ 
      * @param $offset
      * @throws LogicException
      */
-    final public function offsetUnset ($offset) {
+    final public function offsetUnset($offset) {
         throw new LogicException('Raw table access is immutable.');
     }
 
@@ -271,7 +271,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);
@@ -287,7 +287,7 @@ 
      * @param array $ctorargs Optional.
      * @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());
@@ -305,7 +305,7 @@ 
      * @param int $type Ignored.
      * @return string|ExpressionInterface
      */
-    public function quote ($value, $type = self::PARAM_STR) {
+    public function quote($value, $type = self::PARAM_STR) {
         if ($value instanceof ExpressionInterface) {
             return $value;
         }
@@ -325,7 +325,7 @@ 
      * @param array $values
      * @return string[]
      */
-    public function quoteArray (array $values) {
+    public function quoteArray(array $values) {
         return array_map([$this, 'quote'], $values);
     }
 
@@ -335,7 +335,7 @@ 
      * @param array $values
      * @return string
      */
-    public function quoteList (array $values): string {
+    public function quoteList(array $values): string {
         return implode(',', $this->quoteArray($values));
     }
 
@@ -345,7 +345,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);
     }
 
@@ -354,7 +354,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;
     }
@@ -363,7 +363,7 @@ 
      * @param Closure $logger
      * @return $this
      */
-    public function setLogger (Closure $logger) {
+    public function setLogger(Closure $logger) {
         $this->logger = $logger;
         return $this;
     }
@@ -373,7 +373,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/SQL/DateTimeTrait.php

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
  */
 trait DateTimeTrait {
 
-    abstract public function __toString ();
+    abstract public function __toString();
 
     /**
      * @var DB
@@ -24,7 +24,7 @@ 
      *
      * @return Text
      */
-    public function getDate () {
+    public function getDate() {
         return Text::factory($this->db, $this->getDateTimeFormat('%Y-%m-%d'));
     }
 
@@ -33,7 +33,7 @@ 
      *
      * @return Text
      */
-    public function getDateTime () {
+    public function getDateTime() {
         return Text::factory($this->db, $this->getDateTimeFormat([
             'mysql' => '%Y-%m-%d %H:%i:%S',
             'sqlite' => '%Y-%m-%d %H:%M:%S'
@@ -46,7 +46,7 @@ 
      * @param string|string[] $format Format, or formats keyed by driver name.
      * @return Text
      */
-    public function getDateTimeFormat ($format) {
+    public function getDateTimeFormat($format) {
         if (is_array($format)) {
             $format = $format[$this->db->getDriver()];
         }
@@ -62,7 +62,7 @@ 
      *
      * @return Numeric
      */
-    public function getDay () {
+    public function getDay() {
         return Numeric::factory($this->db, $this->getDateTimeFormat('%d'));
     }
 
@@ -71,7 +71,7 @@ 
      *
      * @return Numeric
      */
-    public function getDayOfWeek () {
+    public function getDayOfWeek() {
         return Numeric::factory($this->db, $this->getDateTimeFormat('%w'));
     }
 
@@ -80,7 +80,7 @@ 
      *
      * @return Numeric
      */
-    public function getDayOfYear () {
+    public function getDayOfYear() {
         return Numeric::factory($this->db, $this->getDateTimeFormat('%j'));
     }
 
@@ -89,7 +89,7 @@ 
      *
      * @return Numeric
      */
-    public function getHours () {
+    public function getHours() {
         return Numeric::factory($this->db, $this->getDateTimeFormat('%H'));
     }
 
@@ -98,7 +98,7 @@ 
      *
      * @return Numeric
      */
-    public function getMinutes () {
+    public function getMinutes() {
         return Numeric::factory($this->db, $this->getDateTimeFormat([
             'mysql' => '%i',
             'sqlite' => '%M'
@@ -110,7 +110,7 @@ 
      *
      * @return Numeric
      */
-    public function getMonth () {
+    public function getMonth() {
         return Numeric::factory($this->db, $this->getDateTimeFormat('%m'));
     }
 
@@ -119,7 +119,7 @@ 
      *
      * @return Numeric
      */
-    public function getSeconds () {
+    public function getSeconds() {
         return Numeric::factory($this->db, $this->getDateTimeFormat('%S'));
     }
 
@@ -128,7 +128,7 @@ 
      *
      * @return Text
      */
-    public function getTime () {
+    public function getTime() {
         return Text::factory($this->db, $this->getDateTimeFormat([
             'mysql' => '%H:%i:%S',
             'sqlite' => '%H:%M:%S'
@@ -140,7 +140,7 @@ 
      *
      * @return Numeric
      */
-    public function getTimestamp () {
+    public function getTimestamp() {
         if ($this->db->isSQLite()) {
             return Numeric::factory($this->db, "STRFTIME('%s',{$this})");
         }
@@ -152,7 +152,7 @@ 
      *
      * @return Numeric
      */
-    public function getWeekOfYear () {
+    public function getWeekOfYear() {
         return Numeric::factory($this->db, $this->getDateTimeFormat([
             'mysql' => '%U',
             'sqlite' => '%W'
@@ -164,7 +164,7 @@ 
      *
      * @return Numeric
      */
-    public function getYear () {
+    public function getYear() {
         return Numeric::factory($this->db, $this->getDateTimeFormat('%Y'));
     }
 }
\ No newline at end of file