hfw / db

src/DB/SQL/DateTimeTrait.php

Spacing +16 added lines, -16 removed lines

@@ -19,7 +19,7 @@ 
      *
      * @return Text
      */
-    public function date () {
+    public function date() {
         return Text::factory($this->db, $this->dateFormat('%Y-%m-%d'));
     }
 
@@ -29,7 +29,7 @@ 
      * @param string|string[] $format Format, or formats keyed by driver name.
      * @return Text
      */
-    public function dateFormat ($format) {
+    public function dateFormat($format) {
         if (is_array($format)) {
             $format = $format[$this->db->getDriver()];
         }
@@ -45,7 +45,7 @@ 
      *
      * @return Text
      */
-    public function datetime () {
+    public function datetime() {
         return Text::factory($this->db, $this->dateFormat([
             'mysql' => '%Y-%m-%d %H:%i:%S',
             'sqlite' => '%Y-%m-%d %H:%M:%S'
@@ -57,7 +57,7 @@ 
      *
      * @return Num
      */
-    public function day () {
+    public function day() {
         return Num::factory($this->db, $this->dateFormat('%d'));
     }
 
@@ -66,7 +66,7 @@ 
      *
      * @return Num
      */
-    public function dayOfWeek () {
+    public function dayOfWeek() {
         return Num::factory($this->db, $this->dateFormat('%w'));
     }
 
@@ -75,7 +75,7 @@ 
      *
      * @return Num
      */
-    public function dayOfYear () {
+    public function dayOfYear() {
         return Num::factory($this->db, $this->dateFormat('%j'));
     }
 
@@ -84,7 +84,7 @@ 
      *
      * @return Num
      */
-    public function hours () {
+    public function hours() {
         return Num::factory($this->db, $this->dateFormat('%H'));
     }
 
@@ -93,7 +93,7 @@ 
      *
      * @return Num
      */
-    public function minutes () {
+    public function minutes() {
         return Num::factory($this->db, $this->dateFormat([
             'mysql' => '%i',
             'sqlite' => '%M'
@@ -105,7 +105,7 @@ 
      *
      * @return Num
      */
-    public function month () {
+    public function month() {
         return Num::factory($this->db, $this->dateFormat('%m'));
     }
 
@@ -114,7 +114,7 @@ 
      *
      * @return Num
      */
-    public function seconds () {
+    public function seconds() {
         return Num::factory($this->db, $this->dateFormat('%S'));
     }
 
@@ -123,7 +123,7 @@ 
      *
      * @return Text
      */
-    public function time () {
+    public function time() {
         return Text::factory($this->db, $this->dateFormat([
             'mysql' => '%H:%i:%S',
             'sqlite' => '%H:%M:%S'
@@ -135,7 +135,7 @@ 
      *
      * @return Num
      */
-    public function timestamp () {
+    public function timestamp() {
         if ($this->db->isSQLite()) {
             return Num::factory($this->db, "STRFTIME('%s',{$this})");
         }
@@ -152,7 +152,7 @@ 
      *
      * @return DateTime
      */
-    public function toLocalTz () {
+    public function toLocalTz() {
         if ($this->db->isSQLite()) {
             // docs:
             // > The "localtime" modifier (12) assumes the time value to its left is in
@@ -174,7 +174,7 @@ 
      *
      * @return DateTime
      */
-    public function toUtc () {
+    public function toUtc() {
         if ($this->db->isSQLite()) {
             // docs:
             // > "utc" assumes that the time value to its left is in the local timezone
@@ -191,7 +191,7 @@ 
      *
      * @return Num
      */
-    public function weekOfYear () {
+    public function weekOfYear() {
         return Num::factory($this->db, $this->dateFormat([
             'mysql' => '%U',
             'sqlite' => '%W'
@@ -203,7 +203,7 @@ 
      *
      * @return Num
      */
-    public function year () {
+    public function year() {
         return Num::factory($this->db, $this->dateFormat('%Y'));
     }
 }
\ No newline at end of file

src/DB/SQL/TextTrait.php

Spacing +9 added lines, -9 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})");
         }
@@ -119,7 +119,7 @@ 
      *
      * @return DateTime
      */
-    public function toDateTime () {
+    public function toDateTime() {
         return DateTime::factory($this->db, $this);
     }
 
@@ -130,7 +130,7 @@ 
      *
      * @return Text
      */
-    public function upper () {
+    public function upper() {
         return Text::factory($this->db, "UPPER({$this})");
     }
 }
\ No newline at end of file

src/DB.php

Spacing +42 added lines, -42 removed lines

@@ -83,7 +83,7 @@ 
      * @param string $file
      * @return static
      */
-    public static function fromConfig (string $connection = 'default', string $file = 'db.config.php') {
+    public static function fromConfig(string $connection = 'default', string $file = 'db.config.php') {
         $config = (include "{$file}")[$connection];
         $args = [
             $config['dsn'],
@@ -103,11 +103,11 @@ 
      * @param int|array|Countable $count
      * @return ExpressionInterface[]
      */
-    public static function marks ($count): array {
+    public static function marks($count): array {
         static $mark;
         $mark ??= new class implements ExpressionInterface {
 
-            public function __toString () {
+            public function __toString() {
                 return '?';
             }
         };
@@ -125,7 +125,7 @@ 
      * @param string[] $columns
      * @return string[] `["column" => ":column"]`
      */
-    public static function slots (array $columns): array {
+    public static function slots(array $columns): array {
         return array_combine($columns, array_map(function(string $column) {
             return ':' . str_replace('.', '__', $column);
         }, $columns));
@@ -135,7 +135,7 @@ 
      * @param string[] $columns
      * @return string[] `["column" => "column=:column"]`
      */
-    public static function slotsEqual (array $columns): array {
+    public static function slotsEqual(array $columns): array {
         $slots = static::slots($columns);
         foreach ($slots as $column => $slot) {
             $slots[$column] = "{$column} = {$slot}";
@@ -153,7 +153,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]];
         parent::__construct($dsn, $username, $password, $options);
         $this->setAttribute(self::ATTR_DEFAULT_FETCH_MODE, self::FETCH_ASSOC);
@@ -169,7 +169,7 @@ 
         }
         elseif ($this->isSQLite()) {
             // polyfill sqlite functions
-            $this->sqliteCreateFunctions([ // deterministic functions
+            $this->sqliteCreateFunctions([// deterministic functions
                 // https://www.sqlite.org/lang_mathfunc.html
                 'ACOS' => 'acos',
                 'ASIN' => 'asin',
@@ -195,7 +195,7 @@ 
                 'SIGN' => fn($x) => ($x > 0) - ($x < 0),
             ]);
 
-            $this->sqliteCreateFunctions([ // non-deterministic
+            $this->sqliteCreateFunctions([// non-deterministic
                 'RAND' => fn() => mt_rand() / mt_getrandmax(),
             ], false);
         }
@@ -206,7 +206,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->driver;
     }
 
@@ -217,7 +217,7 @@ 
      *
      * @return true
      */
-    public function beginTransaction () {
+    public function beginTransaction() {
         assert($this->transactions >= 0);
         if ($this->transactions === 0) {
             $this->logger->__invoke("BEGIN TRANSACTION");
@@ -237,7 +237,7 @@ 
      *
      * @return true
      */
-    public function commit () {
+    public function commit() {
         assert($this->transactions > 0);
         if ($this->transactions === 1) {
             $this->logger->__invoke("COMMIT TRANSACTION");
@@ -257,7 +257,7 @@ 
      * @param string $sql
      * @return int
      */
-    public function exec ($sql): int {
+    public function exec($sql): int {
         $this->logger->__invoke($sql);
         return parent::exec($sql);
     }
@@ -273,14 +273,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;
     }
 
@@ -290,14 +290,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;
     }
 
@@ -305,7 +305,7 @@ 
      * @param string $dir
      * @return Migrator
      */
-    public function getMigrator () {
+    public function getMigrator() {
         return Migrator::factory($this, $this->migrations);
     }
 
@@ -315,7 +315,7 @@ 
      * @param string|EntityInterface $class
      * @return Record
      */
-    public function getRecord ($class) {
+    public function getRecord($class) {
         if (is_object($class)) {
             $class = get_class($class);
         }
@@ -325,28 +325,28 @@ 
     /**
      * @return Schema
      */
-    public function getSchema () {
+    public function getSchema() {
         return $this->schema;
     }
 
     /**
      * @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';
     }
 
@@ -369,7 +369,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);
         }
@@ -390,7 +390,7 @@ 
      *
      * @return Transaction
      */
-    public function newTransaction () {
+    public function newTransaction() {
         return Transaction::factory($this);
     }
 
@@ -400,7 +400,7 @@ 
      * @param string $table
      * @return bool
      */
-    final public function offsetExists ($table): bool {
+    final public function offsetExists($table): bool {
         return (bool)$this->offsetGet($table);
     }
 
@@ -410,7 +410,7 @@ 
      * @param string $table
      * @return null|Table
      */
-    public function offsetGet ($table) {
+    public function offsetGet($table) {
         return $this->schema->getTable($table);
     }
 
@@ -419,7 +419,7 @@ 
      * @param $value
      * @throws LogicException
      */
-    final public function offsetSet ($offset, $value) {
+    final public function offsetSet($offset, $value) {
         throw new LogicException('The schema cannot be altered this way.');
     }
 
@@ -427,7 +427,7 @@ 
      * @param $offset
      * @throws LogicException
      */
-    final public function offsetUnset ($offset) {
+    final public function offsetUnset($offset) {
         throw new LogicException('The schema cannot be altered this way.');
     }
 
@@ -436,7 +436,7 @@ 
      *
      * @return Num
      */
-    public function pi () {
+    public function pi() {
         return Num::factory($this, "PI()");
     }
 
@@ -447,7 +447,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);
@@ -463,7 +463,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());
@@ -481,7 +481,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;
         }
@@ -501,7 +501,7 @@ 
      * @param array $values
      * @return string[]
      */
-    public function quoteArray (array $values) {
+    public function quoteArray(array $values) {
         return array_map([$this, 'quote'], $values);
     }
 
@@ -511,7 +511,7 @@ 
      * @param array $values
      * @return string
      */
-    public function quoteList (array $values): string {
+    public function quoteList(array $values): string {
         return implode(',', $this->quoteArray($values));
     }
 
@@ -520,7 +520,7 @@ 
      *
      * @return Num
      */
-    public function rand () {
+    public function rand() {
         return Num::factory($this, "RAND()");
     }
 
@@ -531,7 +531,7 @@ 
      *
      * @return true
      */
-    public function rollBack () {
+    public function rollBack() {
         assert($this->transactions > 0);
         if ($this->transactions === 1) {
             $this->logger->__invoke("ROLLBACK TRANSACTION");
@@ -551,7 +551,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);
     }
 
@@ -560,7 +560,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;
     }
@@ -569,7 +569,7 @@ 
      * @param Closure $logger
      * @return $this
      */
-    public function setLogger (Closure $logger) {
+    public function setLogger(Closure $logger) {
         $this->logger = $logger;
         return $this;
     }
@@ -579,7 +579,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;
     }
@@ -588,7 +588,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();
@@ -604,7 +604,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

@@ -166,8 +166,7 @@ 
 
         if ($this->isMySQL()) {
             $this->exec("SET time_zone = 'UTC'");
-        }
-        elseif ($this->isSQLite()) {
+        } elseif ($this->isSQLite()) {
             // polyfill sqlite functions
             $this->sqliteCreateFunctions([ // deterministic functions
                 // https://www.sqlite.org/lang_mathfunc.html
@@ -222,8 +221,7 @@ 
         if ($this->transactions === 0) {
             $this->logger->__invoke("BEGIN TRANSACTION");
             parent::beginTransaction();
-        }
-        else {
+        } else {
             $this->exec("SAVEPOINT SAVEPOINT_{$this->transactions}");
         }
         $this->transactions++;
@@ -242,8 +240,7 @@ 
         if ($this->transactions === 1) {
             $this->logger->__invoke("COMMIT TRANSACTION");
             parent::commit();
-        }
-        else {
+        } else {
             $savepoint = $this->transactions - 1;
             $this->exec("RELEASE SAVEPOINT SAVEPOINT_{$savepoint}");
         }
@@ -536,8 +533,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}");
         }