hfw / db

src/DB.php

Spacing +31 added lines, -31 removed lines

@@ -62,7 +62,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]]
         ];
@@ -76,7 +76,7 @@ 
 
         if ($this->isSQLite()) {
             // polyfill sqlite functions
-            $this->sqliteCreateFunctions([ // deterministic functions
+            $this->sqliteCreateFunctions([// deterministic functions
                 // https://www.sqlite.org/lang_mathfunc.html
                 'ACOS' => 'acos',
                 'ASIN' => 'asin',
@@ -102,7 +102,7 @@ 
                 'SIGN' => fn($x) => ($x > 0) - ($x < 0),
             ]);
 
-            $this->sqliteCreateFunctions([ // non-deterministic
+            $this->sqliteCreateFunctions([// non-deterministic
                 'RAND' => fn() => mt_rand(0, 1),
             ], false);
         }
@@ -113,7 +113,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->driver;
     }
 
@@ -123,7 +123,7 @@ 
      * @param string $sql
      * @return int
      */
-    public function exec ($sql): int {
+    public function exec($sql): int {
         $this->logger->__invoke($sql);
         return parent::exec($sql);
     }
@@ -139,14 +139,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;
     }
 
@@ -156,14 +156,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;
     }
 
@@ -173,7 +173,7 @@ 
      * @param string|EntityInterface $class
      * @return Record
      */
-    public function getRecord ($class) {
+    public function getRecord($class) {
         if (is_object($class)) {
             $class = get_class($class);
         }
@@ -184,7 +184,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();
@@ -206,21 +206,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';
     }
 
@@ -241,7 +241,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);
         }
@@ -263,7 +263,7 @@ 
      * @param string $table
      * @return bool
      */
-    final public function offsetExists ($table): bool {
+    final public function offsetExists($table): bool {
         return (bool)$this->getTable($table);
     }
 
@@ -273,7 +273,7 @@ 
      * @param string $table
      * @return null|Table
      */
-    final public function offsetGet ($table) {
+    final public function offsetGet($table) {
         return $this->getTable($table);
     }
 
@@ -282,7 +282,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.');
     }
 
@@ -290,7 +290,7 @@ 
      * @param $offset
      * @throws LogicException
      */
-    final public function offsetUnset ($offset) {
+    final public function offsetUnset($offset) {
         throw new LogicException('Raw table access is immutable.');
     }
 
@@ -299,7 +299,7 @@ 
      *
      * @return Num
      */
-    public function pi () {
+    public function pi() {
         return Num::factory($this, "PI()");
     }
 
@@ -310,7 +310,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);
@@ -326,7 +326,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());
@@ -344,7 +344,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;
         }
@@ -364,7 +364,7 @@ 
      * @param array $values
      * @return string[]
      */
-    public function quoteArray (array $values) {
+    public function quoteArray(array $values) {
         return array_map([$this, 'quote'], $values);
     }
 
@@ -374,7 +374,7 @@ 
      * @param array $values
      * @return string
      */
-    public function quoteList (array $values): string {
+    public function quoteList(array $values): string {
         return implode(',', $this->quoteArray($values));
     }
 
@@ -383,7 +383,7 @@ 
      *
      * @return Num
      */
-    public function rand () {
+    public function rand() {
         return Num::factory($this, "RAND()");
     }
 
@@ -393,7 +393,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);
     }
 
@@ -402,7 +402,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;
     }
@@ -411,7 +411,7 @@ 
      * @param Closure $logger
      * @return $this
      */
-    public function setLogger (Closure $logger) {
+    public function setLogger(Closure $logger) {
         $this->logger = $logger;
         return $this;
     }
@@ -421,7 +421,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;
     }
@@ -430,7 +430,7 @@ 
      * @param callable[] $callbacks Keyed by function name.
      * @param bool $deterministic Whether the callbacks aren't random / are without side-effects.
      */
-    public function sqliteCreateFunctions (array $callbacks, bool $deterministic = true): void {
+    public function sqliteCreateFunctions(array $callbacks, bool $deterministic = true): void {
         $deterministic = $deterministic ? self::SQLITE_DETERMINISTIC : 0;
         foreach ($callbacks as $name => $callback) {
             $argc = (new ReflectionFunction($callback))->getNumberOfRequiredParameters();

src/DB/Select.php

Spacing +27 added lines, -27 removed lines

@@ -116,7 +116,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();
@@ -136,7 +136,7 @@ 
      * @param array $args
      * @return Statement
      */
-    public function __invoke (array $args = []) {
+    public function __invoke(array $args = []) {
         return $this->execute($args);
     }
 
@@ -145,7 +145,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->alias;
     }
 
@@ -155,7 +155,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 = '';
@@ -168,7 +168,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());
         }
@@ -183,7 +183,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)));
     }
 
@@ -196,7 +196,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));
     }
 
@@ -208,7 +208,7 @@ 
      * @param array $args
      * @return mixed
      */
-    public function getFirst (array $args = []) {
+    public function getFirst(array $args = []) {
         return $this->getEach($args)->current();
     }
 
@@ -219,7 +219,7 @@ 
      *
      * @return Generator
      */
-    public function getIterator () {
+    public function getIterator() {
         yield from $this->getEach();
     }
 
@@ -229,7 +229,7 @@ 
      *
      * @return mixed
      */
-    public function getResult (array $args = []) {
+    public function getResult(array $args = []) {
         return $this->execute($args)->fetchColumn();
     }
 
@@ -239,7 +239,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}";
         }
@@ -255,7 +255,7 @@ 
      * @param string $condition
      * @return $this
      */
-    public function having (string $condition) {
+    public function having(string $condition) {
         if (!strlen($this->_having)) {
             $this->_having = " HAVING {$condition}";
         }
@@ -272,7 +272,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 = '';
@@ -290,7 +290,7 @@ 
      *
      * @return Predicate
      */
-    public function isEmpty () {
+    public function isEmpty() {
         return Predicate::factory($this->db, "NOT EXISTS ({$this->toSql()})");
     }
 
@@ -299,7 +299,7 @@ 
      *
      * @return Predicate
      */
-    public function isNotEmpty () {
+    public function isNotEmpty() {
         return Predicate::factory($this->db, "EXISTS ({$this->toSql()})");
     }
 
@@ -311,7 +311,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();
         }
@@ -326,7 +326,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 = '';
         }
@@ -345,7 +345,7 @@ 
      * @param int|string $ref Ordinal or reference name.
      * @return null|Column
      */
-    public function offsetGet ($ref) {
+    public function offsetGet($ref) {
         if (is_int($ref)) {
             return current(array_slice($this->refs, $ref, 1)) ?: null;
         }
@@ -358,7 +358,7 @@ 
      * @param string $order
      * @return $this
      */
-    public function order (string $order) {
+    public function order(string $order) {
         if (strlen($order)) {
             $order = " ORDER BY {$order}";
         }
@@ -369,7 +369,7 @@ 
     /**
      * @return Statement
      */
-    public function prepare () {
+    public function prepare() {
         return $this->db->prepare($this->toSql());
     }
 
@@ -377,7 +377,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);
@@ -395,7 +395,7 @@ 
      * @param string[] $expressions Keyed by alias if applicable.
      * @return $this
      */
-    public function setColumns (array $expressions) {
+    public function setColumns(array $expressions) {
         $this->refs = [];
         $_columns = [];
         foreach ($expressions as $alias => $expr) {
@@ -420,7 +420,7 @@ 
      * @param Closure $fetcher
      * @return $this
      */
-    public function setFetcher (Closure $fetcher) {
+    public function setFetcher(Closure $fetcher) {
         $this->fetcher = $fetcher;
         return $this;
     }
@@ -430,7 +430,7 @@ 
      *
      * @return string
      */
-    public function toSql (): string {
+    public function toSql(): string {
         $sql = "SELECT {$this->_columns} FROM {$this->table}";
         $sql .= $this->_join;
         $sql .= $this->_where;
@@ -447,7 +447,7 @@ 
      *
      * @return string
      */
-    public function toSubquery (): string {
+    public function toSubquery(): string {
         return "({$this->toSql()}) AS {$this->alias}";
     }
 
@@ -458,7 +458,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 = '';
@@ -477,7 +477,7 @@ 
      * @param string $condition
      * @return $this
      */
-    public function where (string $condition) {
+    public function where(string $condition) {
         if (!strlen($this->_where)) {
             $this->_where = " WHERE {$condition}";
         }

src/DB/SQL/NumTrait.php

Spacing +29 added lines, -29 removed lines

@@ -14,7 +14,7 @@ 
      *
      * @return Num
      */
-    public function abs () {
+    public function abs() {
         return Num::factory($this->db, "ABS({$this})");
     }
 
@@ -23,7 +23,7 @@ 
      *
      * @return Num
      */
-    public function acos () {
+    public function acos() {
         return Num::factory($this->db, "ACOS({$this})");
     }
 
@@ -33,7 +33,7 @@ 
      * @param number|ValueInterface $arg
      * @return Num
      */
-    public function add ($arg) {
+    public function add($arg) {
         $arg = $this->db->quote($arg);
         return Num::factory($this->db, "({$this} + {$arg})");
     }
@@ -43,7 +43,7 @@ 
      *
      * @return Num
      */
-    public function asin () {
+    public function asin() {
         return Num::factory($this->db, "ASIN({$this})");
     }
 
@@ -52,7 +52,7 @@ 
      *
      * @return Num
      */
-    public function atan () {
+    public function atan() {
         return Num::factory($this->db, "ATAN({$this})");
     }
 
@@ -61,7 +61,7 @@ 
      *
      * @return Num
      */
-    public function ceil () {
+    public function ceil() {
         return Num::factory($this->db, "CEIL({$this})");
     }
 
@@ -70,7 +70,7 @@ 
      *
      * @return Num
      */
-    public function cos () {
+    public function cos() {
         return Num::factory($this->db, "COS({$this})");
     }
 
@@ -81,7 +81,7 @@ 
      *
      * @return Num
      */
-    public function degrees () {
+    public function degrees() {
         return Num::factory($this->db, "DEGREES({$this})");
     }
 
@@ -91,7 +91,7 @@ 
      * @param number|ValueInterface $arg
      * @return Num
      */
-    public function div ($arg) {
+    public function div($arg) {
         $arg = $this->db->quote($arg);
         return Num::factory($this->db, "({$this} / {$arg})");
     }
@@ -103,7 +103,7 @@ 
      *
      * @return Num
      */
-    public function exp () {
+    public function exp() {
         return Num::factory($this->db, "EXP({$this})");
     }
 
@@ -112,7 +112,7 @@ 
      *
      * @return Num
      */
-    public function floor () {
+    public function floor() {
         return Num::factory($this->db, "FLOOR({$this})");
     }
 
@@ -121,7 +121,7 @@ 
      *
      * @return Predicate
      */
-    public function isEven () {
+    public function isEven() {
         return Predicate::factory($this->db, "({$this} % 2) = 0");
     }
 
@@ -130,7 +130,7 @@ 
      *
      * @return Predicate
      */
-    public function isNegative () {
+    public function isNegative() {
         return Predicate::factory($this->db, "{$this} < 0");
     }
 
@@ -139,7 +139,7 @@ 
      *
      * @return Predicate
      */
-    public function isOdd () {
+    public function isOdd() {
         return Predicate::factory($this->db, "({$this} % 2) <> 0");
     }
 
@@ -148,7 +148,7 @@ 
      *
      * @return Predicate
      */
-    public function isPositive () {
+    public function isPositive() {
         return Predicate::factory($this->db, "{$this} > 0");
     }
 
@@ -157,7 +157,7 @@ 
      *
      * @return Num
      */
-    public function ln () {
+    public function ln() {
         return Num::factory($this->db, "LN({$this})");
     }
 
@@ -169,7 +169,7 @@ 
      * @param float $base
      * @return Num
      */
-    public function log (float $base) {
+    public function log(float $base) {
         return Num::factory($this->db, "LOG({$base},{$this})");
     }
 
@@ -178,7 +178,7 @@ 
      *
      * @return Num
      */
-    public function log10 () {
+    public function log10() {
         return Num::factory($this->db, "LOG10({$this})");
     }
 
@@ -187,7 +187,7 @@ 
      *
      * @return Num
      */
-    public function log2 () {
+    public function log2() {
         return Num::factory($this->db, "LOG2({$this})");
     }
 
@@ -197,7 +197,7 @@ 
      * @param float $divisor
      * @return Num
      */
-    public function mod (float $divisor) {
+    public function mod(float $divisor) {
         return Num::factory($this->db, "({$this} % {$divisor})");
     }
 
@@ -207,7 +207,7 @@ 
      * @param number|ValueInterface $arg
      * @return Num
      */
-    public function mul ($arg) {
+    public function mul($arg) {
         $arg = $this->db->quote($arg);
         return Num::factory($this->db, "({$this} * {$arg})");
     }
@@ -218,7 +218,7 @@ 
      * @param float $exponent
      * @return Num
      */
-    public function pow (float $exponent) {
+    public function pow(float $exponent) {
         return Num::factory($this->db, "POW({$this},{$exponent})");
     }
 
@@ -229,7 +229,7 @@ 
      *
      * @return Num
      */
-    public function radians () {
+    public function radians() {
         return Num::factory($this->db, "RADIANS({$this})");
     }
 
@@ -239,7 +239,7 @@ 
      * @param int $decimals
      * @return Num
      */
-    public function round (int $decimals = 0) {
+    public function round(int $decimals = 0) {
         return Num::factory($this->db, "ROUND({$this},{$decimals})");
     }
 
@@ -248,7 +248,7 @@ 
      *
      * @return Num `-1`, `0`, `1`
      */
-    public function sign () {
+    public function sign() {
         return Num::factory($this->db, "SIGN({$this})");
     }
 
@@ -257,7 +257,7 @@ 
      *
      * @return Num
      */
-    public function sin () {
+    public function sin() {
         return Num::factory($this->db, "SIN({$this})");
     }
 
@@ -266,7 +266,7 @@ 
      *
      * @return Num
      */
-    public function sqrt () {
+    public function sqrt() {
         return Num::factory($this->db, "SQRT({$this})");
     }
 
@@ -276,7 +276,7 @@ 
      * @param number|ValueInterface $arg
      * @return Num
      */
-    public function sub ($arg) {
+    public function sub($arg) {
         $arg = $this->db->quote($arg);
         return Num::factory($this->db, "({$this} - {$arg})");
     }
@@ -286,7 +286,7 @@ 
      *
      * @return Num
      */
-    public function tan () {
+    public function tan() {
         return Num::factory($this->db, "TAN({$this})");
     }
 }
\ No newline at end of file

src/DB/SQL/CastTrait.php

Spacing +9 added lines, -9 removed lines

@@ -12,7 +12,7 @@ 
      * @param scalar[] $values
      * @return Value
      */
-    public function coalesce (array $values) {
+    public function coalesce(array $values) {
         array_unshift($values, $this);
         $values = $this->db->quoteList($values);
         return Value::factory($this->db, "COALESCE({$values})");
@@ -25,7 +25,7 @@ 
      * @param int $to
      * @return Text
      */
-    public function toBase (int $from, int $to) {
+    public function toBase(int $from, int $to) {
         return Text::factory($this->db, "CONV({$this},{$from},{$to})");
     }
 
@@ -35,7 +35,7 @@ 
      * @param int $from
      * @return Num
      */
-    public function toBase10 (int $from) {
+    public function toBase10(int $from) {
         return Num::factory($this->db, "CONV({$this},{$from},10)");
     }
 
@@ -47,7 +47,7 @@ 
      * @param int $from
      * @return Text
      */
-    public function toBase16 (int $from) {
+    public function toBase16(int $from) {
         return $this->toBase($from, 16);
     }
 
@@ -57,7 +57,7 @@ 
      * @param int $from
      * @return Text
      */
-    public function toBase2 (int $from) {
+    public function toBase2(int $from) {
         return $this->toBase($from, 2);
     }
 
@@ -67,7 +67,7 @@ 
      * @param int $from
      * @return Text
      */
-    public function toBase8 (int $from) {
+    public function toBase8(int $from) {
         return $this->toBase($from, 8);
     }
 
@@ -76,7 +76,7 @@ 
      *
      * @return Num
      */
-    public function toFloat () {
+    public function toFloat() {
         if ($this->db->isSQLite()) {
             return Num::factory($this->db, "CAST({$this} AS REAL)");
         }
@@ -88,7 +88,7 @@ 
      *
      * @return Num
      */
-    public function toInt () {
+    public function toInt() {
         if ($this->db->isSQLite()) {
             return Num::factory($this->db, "CAST({$this} AS INTEGER)");
         }
@@ -100,7 +100,7 @@ 
      *
      * @return Text
      */
-    public function toText () {
+    public function toText() {
         if ($this->db->isSQLite()) {
             return Text::factory($this->db, "CAST({$this} AS TEXT)");
         }