hfw / db

src/DB/SQL/TextTrait.php

Spacing +8 added lines, -8 removed lines

@@ -16,7 +16,7 @@ 
      *
      * @return Text
      */
-    public function hex () {
+    public function hex() {
         return Text::factory($this->db, "HEX({$this})");
     }
 
@@ -27,7 +27,7 @@ 
      *
      * @return Num
      */
-    public function length () {
+    public function length() {
         if ($this->db->isSQLite()) {
             return Num::factory($this->db, "LENGTH(CAST({$this} AS TEXT))");
         }
@@ -41,7 +41,7 @@ 
      *
      * @return Text
      */
-    public function lower () {
+    public function lower() {
         return Text::factory($this->db, "LOWER({$this})");
     }
 
@@ -53,7 +53,7 @@ 
      * @param string $substring
      * @return Num
      */
-    public function position (string $substring) {
+    public function position(string $substring) {
         $substring = $this->db->quote($substring);
         if ($this->db->isSQLite()) {
             return Num::factory($this->db, "INSTR({$this},{$substring})");
@@ -70,7 +70,7 @@ 
      * @param string $replace
      * @return Text
      */
-    public function replace (string $search, string $replace) {
+    public function replace(string $search, string $replace) {
         $search = $this->db->quote($search);
         $replace = $this->db->quote($replace);
         return Text::factory($this->db, "REPLACE({$this},{$search},{$replace})");
@@ -81,7 +81,7 @@ 
      *
      * @return Num
      */
-    public function size () {
+    public function size() {
         if ($this->db->isSQLite()) {
             return Num::factory($this->db, "LENGTH(CAST({$this} AS BLOB))");
         }
@@ -97,7 +97,7 @@ 
      * @param null|int $length
      * @return Text
      */
-    public function substr (int $start, int $length = null) {
+    public function substr(int $start, int $length = null) {
         if (isset($length)) {
             return Text::factory($this->db, "SUBSTR({$this},{$start},{$length})");
         }
@@ -111,7 +111,7 @@ 
      *
      * @return Text
      */
-    public function upper () {
+    public function upper() {
         return Text::factory($this->db, "UPPER({$this})");
     }
 }
\ No newline at end of file

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

src/DB.php

Spacing +36 added lines, -36 removed lines

@@ -70,7 +70,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]]
         ];
@@ -84,7 +84,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',
@@ -110,7 +110,7 @@ 
                 'SIGN' => fn($x) => ($x > 0) - ($x < 0),
             ]);
 
-            $this->sqliteCreateFunctions([ // non-deterministic
+            $this->sqliteCreateFunctions([// non-deterministic
                 'RAND' => fn() => mt_rand(0, 1),
             ], false);
         }
@@ -121,7 +121,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->driver;
     }
 
@@ -132,7 +132,7 @@ 
      *
      * @return true
      */
-    public function beginTransaction () {
+    public function beginTransaction() {
         assert($this->transactions >= 0);
         if ($this->transactions === 0) {
             $this->logger->__invoke("BEGIN TRANSACTION");
@@ -152,7 +152,7 @@ 
      *
      * @return true
      */
-    public function commit () {
+    public function commit() {
         assert($this->transactions > 0);
         if ($this->transactions === 1) {
             $this->logger->__invoke("COMMIT TRANSACTION");
@@ -172,7 +172,7 @@ 
      * @param string $sql
      * @return int
      */
-    public function exec ($sql): int {
+    public function exec($sql): int {
         $this->logger->__invoke($sql);
         return parent::exec($sql);
     }
@@ -188,14 +188,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;
     }
 
@@ -205,14 +205,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;
     }
 
@@ -222,7 +222,7 @@ 
      * @param string|EntityInterface $class
      * @return Record
      */
-    public function getRecord ($class) {
+    public function getRecord($class) {
         if (is_object($class)) {
             $class = get_class($class);
         }
@@ -233,7 +233,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();
@@ -255,21 +255,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';
     }
 
@@ -290,7 +290,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);
         }
@@ -311,7 +311,7 @@ 
      *
      * @return Transaction
      */
-    public function newTransaction () {
+    public function newTransaction() {
         return Transaction::factory($this);
     }
 
@@ -321,7 +321,7 @@ 
      * @param string $table
      * @return bool
      */
-    final public function offsetExists ($table): bool {
+    final public function offsetExists($table): bool {
         return (bool)$this->getTable($table);
     }
 
@@ -331,7 +331,7 @@ 
      * @param string $table
      * @return null|Table
      */
-    final public function offsetGet ($table) {
+    final public function offsetGet($table) {
         return $this->getTable($table);
     }
 
@@ -340,7 +340,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.');
     }
 
@@ -348,7 +348,7 @@ 
      * @param $offset
      * @throws LogicException
      */
-    final public function offsetUnset ($offset) {
+    final public function offsetUnset($offset) {
         throw new LogicException('Raw table access is immutable.');
     }
 
@@ -357,7 +357,7 @@ 
      *
      * @return Num
      */
-    public function pi () {
+    public function pi() {
         return Num::factory($this, "PI()");
     }
 
@@ -368,7 +368,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);
@@ -384,7 +384,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());
@@ -402,7 +402,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;
         }
@@ -422,7 +422,7 @@ 
      * @param array $values
      * @return string[]
      */
-    public function quoteArray (array $values) {
+    public function quoteArray(array $values) {
         return array_map([$this, 'quote'], $values);
     }
 
@@ -432,7 +432,7 @@ 
      * @param array $values
      * @return string
      */
-    public function quoteList (array $values): string {
+    public function quoteList(array $values): string {
         return implode(',', $this->quoteArray($values));
     }
 
@@ -441,7 +441,7 @@ 
      *
      * @return Num
      */
-    public function rand () {
+    public function rand() {
         return Num::factory($this, "RAND()");
     }
 
@@ -452,7 +452,7 @@ 
      *
      * @return true
      */
-    public function rollBack () {
+    public function rollBack() {
         assert($this->transactions > 0);
         if ($this->transactions === 1) {
             $this->logger->__invoke("ROLLBACK TRANSACTION");
@@ -472,7 +472,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);
     }
 
@@ -481,7 +481,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;
     }
@@ -490,7 +490,7 @@ 
      * @param Closure $logger
      * @return $this
      */
-    public function setLogger (Closure $logger) {
+    public function setLogger(Closure $logger) {
         $this->logger = $logger;
         return $this;
     }
@@ -500,7 +500,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;
     }
@@ -509,7 +509,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();
@@ -525,7 +525,7 @@ 
      * @param callable $work
      * @return mixed The return value of `$work`
      */
-    public function transact (callable $work) {
+    public function transact(callable $work) {
         $transaction = $this->newTransaction();
         $return = call_user_func($work);
         $transaction->commit();

Braces +4 added lines, -8 removed lines

@@ -137,8 +137,7 @@ 
         if ($this->transactions === 0) {
             $this->logger->__invoke("BEGIN TRANSACTION");
             parent::beginTransaction();
-        }
-        else {
+        } else {
             $this->exec("SAVEPOINT SAVEPOINT_{$this->transactions}");
         }
         $this->transactions++;
@@ -157,8 +156,7 @@ 
         if ($this->transactions === 1) {
             $this->logger->__invoke("COMMIT TRANSACTION");
             parent::commit();
-        }
-        else {
+        } else {
             $savepoint = $this->transactions - 1;
             $this->exec("RELEASE SAVEPOINT SAVEPOINT_{$savepoint}");
         }
@@ -238,8 +236,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);
@@ -457,8 +454,7 @@ 
         if ($this->transactions === 1) {
             $this->logger->__invoke("ROLLBACK TRANSACTION");
             parent::rollBack();
-        }
-        else {
+        } else {
             $savepoint = $this->transactions - 1;
             $this->exec("ROLLBACK TO SAVEPOINT SAVEPOINT_{$savepoint}");
         }

src/DB/Transaction.php

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
      *
      * @param DB $db
      */
-    public function __construct (DB $db) {
+    public function __construct(DB $db) {
         $this->db = $db;
         $db->beginTransaction();
     }
@@ -41,7 +41,7 @@ 
     /**
      * Rolls back if the instance wasn't committed.
      */
-    public function __destruct () {
+    public function __destruct() {
         if (!$this->committed) {
             $this->db->rollBack();
         }
@@ -54,14 +54,14 @@ 
      *
      * @return true
      */
-    public function commit (): bool {
+    public function commit(): bool {
         return $this->committed or $this->committed = $this->db->commit();
     }
 
     /**
      * @return bool
      */
-    final public function wasCommitted (): bool {
+    final public function wasCommitted(): bool {
         return $this->committed;
     }
 }
\ No newline at end of file