hfw / db

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/SQL/PredicateTrait.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
      *
      * @return Predicate
      */
-    public function isFalse () {
+    public function isFalse() {
         return $this->db->factory(Predicate::class, "{$this} IS FALSE");
     }
 
@@ -21,7 +21,7 @@ 
      *
      * @return Predicate
      */
-    public function isNotNull () {
+    public function isNotNull() {
         return $this->db->factory(Predicate::class, "{$this} IS NOT NULL");
     }
 
@@ -30,7 +30,7 @@ 
      *
      * @return Predicate
      */
-    public function isNull () {
+    public function isNull() {
         return $this->db->factory(Predicate::class, "{$this} IS NULL");
     }
 }
\ No newline at end of file

src/DB/SQL/Text.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
      *
      * @return Numeric
      */
-    public function toFloat () {
+    public function toFloat() {
         switch ($this->db) {
             case 'sqlite':
                 return $this->db->factory(Numeric::class, $this->db, "CAST({$this} AS REAL)");
@@ -28,7 +28,7 @@ 
      *
      * @return Numeric
      */
-    public function toInt () {
+    public function toInt() {
         switch ($this->db) {
             case 'sqlite':
                 return $this->db->factory(Numeric::class, $this->db, "CAST({$this} AS INTEGER)");

src/DB/SQL/AggregateTrait.php

Spacing +6 added lines, -6 removed lines

@@ -20,7 +20,7 @@ 
      * @param string $aggregate `ALL|DISTINCT`
      * @return Numeric
      */
-    public function getAvg ($aggregate = 'ALL') {
+    public function getAvg($aggregate = 'ALL') {
         return $this->db->factory(Numeric::class, $this->db, "AVG({$aggregate} {$this})");
     }
 
@@ -30,7 +30,7 @@ 
      * @param string $delimiter
      * @return Text
      */
-    public function getConcat (string $delimiter = ',') {
+    public function getConcat(string $delimiter = ',') {
         $delimiter = $this->db->quote($delimiter);
         switch ($this->db) {
             case 'sqlite':
@@ -46,7 +46,7 @@ 
      * @param string $aggregate `ALL|DISTINCT`
      * @return Numeric
      */
-    public function getCount (string $aggregate = 'ALL') {
+    public function getCount(string $aggregate = 'ALL') {
         return $this->db->factory(Numeric::class, $this->db, "COUNT({$aggregate} {$this})");
     }
 
@@ -55,7 +55,7 @@ 
      *
      * @return Numeric
      */
-    public function getMax () {
+    public function getMax() {
         return $this->db->factory(Numeric::class, $this->db, "MAX({$this})");
     }
 
@@ -64,7 +64,7 @@ 
      *
      * @return Numeric
      */
-    public function getMin () {
+    public function getMin() {
         return $this->db->factory(Numeric::class, $this->db, "MIN({$this})");
     }
 
@@ -74,7 +74,7 @@ 
      * @param string $aggregate `ALL|DISTINCT`
      * @return Numeric
      */
-    public function getSum (string $aggregate = 'ALL') {
+    public function getSum(string $aggregate = 'ALL') {
         return $this->db->factory(Numeric::class, $this->db, "SUM({$aggregate} {$this})");
     }
 }
\ No newline at end of file

src/DB/SQL/TextTrait.php

Spacing +8 added lines, -8 removed lines

@@ -17,7 +17,7 @@ 
     /**
      * @return Text
      */
-    public function getHex () {
+    public function getHex() {
         return $this->db->factory(Text::class, $this->db, "HEX({$this})");
     }
 
@@ -28,7 +28,7 @@ 
      *
      * @return Numeric
      */
-    public function getLength () {
+    public function getLength() {
         switch ($this->db) {
             case 'sqlite':
                 return $this->db->factory(Numeric::class, $this->db, "LENGTH(CAST({$this} AS TEXT))");
@@ -42,7 +42,7 @@ 
      *
      * @return Text
      */
-    public function getLower () {
+    public function getLower() {
         return $this->db->factory(Text::class, $this->db, "LOWER({$this})");
     }
 
@@ -54,7 +54,7 @@ 
      * @param string $substring
      * @return Numeric
      */
-    public function getPosition (string $substring) {
+    public function getPosition(string $substring) {
         $substring = $this->db->quote($substring);
         switch ($this->db) {
             case 'sqlite':
@@ -71,7 +71,7 @@ 
      * @param string $replace
      * @return Text
      */
-    public function getReplacement (string $search, string $replace) {
+    public function getReplacement(string $search, string $replace) {
         $search = $this->db->quote($search);
         $replace = $this->db->quote($replace);
         return $this->db->factory(Text::class, $this->db, "REPLACE({$this},{$search},{$replace})");
@@ -82,7 +82,7 @@ 
      *
      * @return Numeric
      */
-    public function getSize () {
+    public function getSize() {
         switch ($this->db) {
             case 'sqlite':
                 return $this->db->factory(Numeric::class, $this->db, "LENGTH(CAST({$this} AS BLOB))");
@@ -98,7 +98,7 @@ 
      * @param int $length
      * @return Text
      */
-    public function getSubstring (int $start, int $length = null) {
+    public function getSubstring(int $start, int $length = null) {
         if (isset($length)) {
             return $this->db->factory(Text::class, $this->db, "SUBSTR({$this},{$start},{$length})");
         }
@@ -110,7 +110,7 @@ 
      *
      * @return Text
      */
-    public function getUpper () {
+    public function getUpper() {
         return $this->db->factory(Text::class, $this->db, "UPPER({$this})");
     }
 }
\ No newline at end of file

src/DB/SQL/DateTimeTrait.php

Spacing +13 added lines, -13 removed lines

@@ -19,7 +19,7 @@ 
      *
      * @return Text
      */
-    public function getDate () {
+    public function getDate() {
         return $this->db->factory(Text::class, $this->db, $this->getDateTimeFormat('%Y-%m-%d'));
     }
 
@@ -29,7 +29,7 @@ 
      * @param string|array $format Format, or formats keyed by driver name.
      * @return Text
      */
-    public function getDateTimeFormat ($format) {
+    public function getDateTimeFormat($format) {
         $driver = $this->db->getDriver();
         if (is_array($format)) {
             $format = $format[$driver];
@@ -48,7 +48,7 @@ 
      *
      * @return Numeric
      */
-    public function getDay () {
+    public function getDay() {
         return $this->db->factory(Numeric::class, $this->db, $this->getDateTimeFormat('%d'));
     }
 
@@ -57,7 +57,7 @@ 
      *
      * @return Numeric
      */
-    public function getDayOfWeek () {
+    public function getDayOfWeek() {
         return $this->db->factory(Numeric::class, $this->db, $this->getDateTimeFormat('%w'));
     }
 
@@ -66,7 +66,7 @@ 
      *
      * @return Numeric
      */
-    public function getDayOfYear () {
+    public function getDayOfYear() {
         return $this->db->factory(Numeric::class, $this->db, $this->getDateTimeFormat('%j'));
     }
 
@@ -75,7 +75,7 @@ 
      *
      * @return Numeric
      */
-    public function getHours () {
+    public function getHours() {
         return $this->db->factory(Numeric::class, $this->db, $this->getDateTimeFormat('%H'));
     }
 
@@ -84,7 +84,7 @@ 
      *
      * @return Numeric
      */
-    public function getMinutes () {
+    public function getMinutes() {
         return $this->db->factory(Numeric::class, $this->db, $this->getDateTimeFormat([
             'mysql' => '%i',
             'sqlite' => '%M'
@@ -96,7 +96,7 @@ 
      *
      * @return Numeric
      */
-    public function getMonth () {
+    public function getMonth() {
         return $this->db->factory(Numeric::class, $this->db, $this->getDateTimeFormat('%m'));
     }
 
@@ -105,7 +105,7 @@ 
      *
      * @return Numeric
      */
-    public function getSeconds () {
+    public function getSeconds() {
         return $this->db->factory(Numeric::class, $this->db, $this->getDateTimeFormat('%S'));
     }
 
@@ -114,7 +114,7 @@ 
      *
      * @return Text
      */
-    public function getTime () {
+    public function getTime() {
         return $this->db->factory(Text::class, $this->db, $this->getDateTimeFormat([
             'mysql' => '%H:%i:%S',
             'sqlite' => '%H:%M:%S'
@@ -126,7 +126,7 @@ 
      *
      * @return Numeric
      */
-    public function getTimestamp () {
+    public function getTimestamp() {
         switch ($this->db) {
             case 'sqlite':
                 return $this->db->factory(Numeric::class, $this->db, "STRFTIME('%s',{$this})");
@@ -140,7 +140,7 @@ 
      *
      * @return Numeric
      */
-    public function getWeekOfYear () {
+    public function getWeekOfYear() {
         return $this->db->factory(Numeric::class, $this->db, $this->getDateTimeFormat([
             'mysql' => '%U',
             'sqlite' => '%W'
@@ -152,7 +152,7 @@ 
      *
      * @return Numeric
      */
-    public function getYear () {
+    public function getYear() {
         return $this->db->factory(Numeric::class, $this->db, $this->getDateTimeFormat('%Y'));
     }
 }
\ No newline at end of file

src/DB/SQL/NumericTrait.php

Spacing +14 added lines, -14 removed lines

@@ -19,7 +19,7 @@ 
      *
      * @return Numeric
      */
-    public function abs () {
+    public function abs() {
         return $this->db->factory(Numeric::class, $this->db, "ABS({$this})");
     }
 
@@ -29,7 +29,7 @@ 
      * @param number|ValueInterface $arg
      * @return Numeric
      */
-    public function add ($arg) {
+    public function add($arg) {
         return $this->db->factory(Numeric::class, $this->db, "({$this} + {$arg})");
     }
 
@@ -38,7 +38,7 @@ 
      *
      * @return Numeric
      */
-    public function ceil () {
+    public function ceil() {
         return $this->db->factory(Numeric::class, $this->db, "CEIL({$this})");
     }
 
@@ -48,7 +48,7 @@ 
      * @param number|ValueInterface $arg
      * @return Numeric
      */
-    public function divide ($arg) {
+    public function divide($arg) {
         return $this->db->factory(Numeric::class, $this->db, "({$this} / {$arg})");
     }
 
@@ -57,7 +57,7 @@ 
      *
      * @return Numeric
      */
-    public function floor () {
+    public function floor() {
         return $this->db->factory(Numeric::class, $this->db, "FLOOR({$this})");
     }
 
@@ -66,7 +66,7 @@ 
      *
      * @return Predicate
      */
-    public function isEven () {
+    public function isEven() {
         return $this->db->factory(Predicate::class, "({$this} % 2) = 0");
     }
 
@@ -75,7 +75,7 @@ 
      *
      * @return Predicate
      */
-    public function isNegative () {
+    public function isNegative() {
         return $this->db->factory(Predicate::class, "{$this} < 0");
     }
 
@@ -84,7 +84,7 @@ 
      *
      * @return Predicate
      */
-    public function isOdd () {
+    public function isOdd() {
         return $this->db->factory(Predicate::class, "({$this} % 2) <> 0");
     }
 
@@ -93,7 +93,7 @@ 
      *
      * @return Predicate
      */
-    public function isPositive () {
+    public function isPositive() {
         return $this->db->factory(Predicate::class, "{$this} > 0");
     }
 
@@ -103,7 +103,7 @@ 
      * @param number|ValueInterface $arg
      * @return Numeric
      */
-    public function modulo ($arg) {
+    public function modulo($arg) {
         return $this->db->factory(Numeric::class, $this->db, "({$this} % {$arg})");
     }
 
@@ -113,7 +113,7 @@ 
      * @param number|ValueInterface $arg
      * @return Numeric
      */
-    public function multiply ($arg) {
+    public function multiply($arg) {
         return $this->db->factory(Numeric::class, $this->db, "({$this} * {$arg})");
     }
 
@@ -123,7 +123,7 @@ 
      * @param number|ValueInterface $exponent
      * @return Numeric
      */
-    public function pow ($exponent) {
+    public function pow($exponent) {
         return $this->db->factory(Numeric::class, $this->db, "POW({$this},{$exponent})");
     }
 
@@ -133,7 +133,7 @@ 
      * @param int $decimals
      * @return Numeric
      */
-    public function round (int $decimals = 0) {
+    public function round(int $decimals = 0) {
         return $this->db->factory(Numeric::class, $this->db, "ROUND({$this},{$decimals})");
     }
 
@@ -143,7 +143,7 @@ 
      * @param number|ValueInterface $arg
      * @return Numeric
      */
-    public function subtract ($arg) {
+    public function subtract($arg) {
         return $this->db->factory(Numeric::class, $this->db, "({$this} - {$arg})");
     }
 }
\ No newline at end of file

src/DB/SQL/Numeric.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
      *
      * @return Text
      */
-    public function toText () {
+    public function toText() {
         if ($this->db == 'sqlite') {
             return $this->db->factory(Text::class, $this->db, "CAST({$this} AS TEXT)");
         }

src/DB.php

Spacing +27 added lines, -27 removed lines

@@ -59,7 +59,7 @@ 
      * @param string $password
      * @param array $options
      */
-    public function __construct ($dsn, $username = null, $password = null, $options = null) {
+    public function __construct($dsn, $username = null, $password = null, $options = null) {
         parent::__construct($dsn, $username, $password, $options);
         $this->driver = $this->getAttribute(self::ATTR_DRIVER_NAME);
         $this->setAttribute(self::ATTR_DEFAULT_FETCH_MODE, self::FETCH_ASSOC);
@@ -81,7 +81,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->driver;
     }
 
@@ -91,7 +91,7 @@ 
      * @param string $sql
      * @return int
      */
-    public function exec ($sql): int {
+    public function exec($sql): int {
         $this->logger->__invoke($sql);
         return parent::exec($sql);
     }
@@ -105,14 +105,14 @@ 
      * @param mixed ...$args
      * @return mixed
      */
-    public function factory (string $class, ...$args) {
+    public function factory(string $class, ...$args) {
         return new $class(...$args);
     }
 
     /**
      * @return string
      */
-    final public function getDriver (): string {
+    final public function getDriver(): string {
         return $this->driver;
     }
 
@@ -122,7 +122,7 @@ 
      * @param string $interface
      * @return Junction
      */
-    public function getJunction ($interface) {
+    public function getJunction($interface) {
         return $this->junctions[$interface]
             ?? $this->junctions[$interface] = Junction::fromInterface($this, $interface);
     }
@@ -130,7 +130,7 @@ 
     /**
      * @return Closure
      */
-    public function getLogger () {
+    public function getLogger() {
         return $this->logger;
     }
 
@@ -140,7 +140,7 @@ 
      * @param string|EntityInterface $class
      * @return Record
      */
-    public function getRecord ($class) {
+    public function getRecord($class) {
         if (is_object($class)) {
             $class = get_class($class);
         }
@@ -152,7 +152,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();
@@ -163,7 +163,7 @@ 
                     "SELECT column_name FROM information_schema.tables WHERE table_name = {$this->quote($name)}"
                 )->fetchAll(self::FETCH_COLUMN);
             }
-            if (!$cols){
+            if (!$cols) {
                 return null;
             }
             $this->tables[$name] = $this->factory(Table::class, $this, $name, $cols);
@@ -174,21 +174,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';
     }
 
@@ -209,7 +209,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);
         }
@@ -229,7 +229,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);
     }
 
@@ -237,7 +237,7 @@ 
      * @param string $class Class or interface name.
      * @return null|Table|Record|Junction
      */
-    public function offsetGet ($class) {
+    public function offsetGet($class) {
         if (is_a($class, EntityInterface::class, true)) {
             return $this->getRecord($class);
         }
@@ -253,7 +253,7 @@ 
      * @param mixed $class Class or interface name.
      * @param Table|Record|Junction $access
      */
-    public function offsetSet ($class, $access) {
+    public function offsetSet($class, $access) {
         if ($access instanceof Record) {
             $this->setRecord($class, $access);
         }
@@ -268,7 +268,7 @@ 
     /**
      * @param string $class Class or interface name.
      */
-    public function offsetUnset ($class) {
+    public function offsetUnset($class) {
         unset($this->records[$class]);
         unset($this->junctions[$class]);
     }
@@ -280,7 +280,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);
@@ -296,7 +296,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());
@@ -314,7 +314,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;
         }
@@ -334,7 +334,7 @@ 
      * @param array $values
      * @return string[]
      */
-    public function quoteArray (array $values) {
+    public function quoteArray(array $values) {
         return array_map([$this, 'quote'], $values);
     }
 
@@ -344,7 +344,7 @@ 
      * @param array $values
      * @return string
      */
-    public function quoteList (array $values): string {
+    public function quoteList(array $values): string {
         return implode(',', $this->quoteArray($values));
     }
 
@@ -354,7 +354,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);
     }
 
@@ -363,7 +363,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;
     }
@@ -372,7 +372,7 @@ 
      * @param Closure $logger
      * @return $this
      */
-    public function setLogger (Closure $logger) {
+    public function setLogger(Closure $logger) {
         $this->logger = $logger;
         return $this;
     }
@@ -382,7 +382,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;
     }

Braces +5 added lines, -10 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);
@@ -240,11 +239,9 @@ 
     public function offsetGet ($class) {
         if (is_a($class, EntityInterface::class, true)) {
             return $this->getRecord($class);
-        }
-        elseif (interface_exists($class)) {
+        } elseif (interface_exists($class)) {
             return $this->getJunction($class);
-        }
-        else {
+        } else {
             return $this->getTable($class);
         }
     }
@@ -256,11 +253,9 @@ 
     public function offsetSet ($class, $access) {
         if ($access instanceof Record) {
             $this->setRecord($class, $access);
-        }
-        elseif ($access instanceof Junction) {
+        } elseif ($access instanceof Junction) {
             $this->setJunction($class, $access);
-        }
-        else {
+        } else {
             throw new LogicException('Raw table access is immutable.');
         }
     }