hfw / db

src/DB.php

Spacing +23 added lines, -23 removed lines

@@ -52,7 +52,7 @@ 
      * @param string $passwd
      * @param array $options
      */
-    public function __construct ($dsn, $username = null, $passwd = null, $options = null) {
+    public function __construct($dsn, $username = null, $passwd = null, $options = null) {
         parent::__construct($dsn, $username, $passwd, $options);
         $this->driver = $this->getAttribute(self::ATTR_DRIVER_NAME);
         $this->setAttribute(self::ATTR_DEFAULT_FETCH_MODE, self::FETCH_ASSOC);
@@ -73,7 +73,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->driver;
     }
 
@@ -83,7 +83,7 @@ 
      * @param string $sql
      * @return int
      */
-    public function exec ($sql): int {
+    public function exec($sql): int {
         $this->logger->__invoke($sql);
         return parent::exec($sql);
     }
@@ -91,7 +91,7 @@ 
     /**
      * @return string
      */
-    final public function getDriver (): string {
+    final public function getDriver(): string {
         return $this->driver;
     }
 
@@ -101,7 +101,7 @@ 
      * @param string $interface
      * @return Junction
      */
-    public function getJunction ($interface) {
+    public function getJunction($interface) {
         if (!isset($this->junctions[$interface])) {
             $this->junctions[$interface] = Junction::fromInterface($this, $interface);
         }
@@ -111,7 +111,7 @@ 
     /**
      * @return Closure
      */
-    public function getLogger () {
+    public function getLogger() {
         return $this->logger;
     }
 
@@ -121,7 +121,7 @@ 
      * @param string|EntityInterface $class
      * @return Record
      */
-    public function getRecord ($class) {
+    public function getRecord($class) {
         $name = $class;
         if (is_object($name)) {
             $name = get_class($name);
@@ -148,7 +148,7 @@ 
      * @param mixed $b
      * @return string
      */
-    public function match ($a, $b) {
+    public function match($a, $b) {
         if ($b instanceof Closure) {
             if (!$a instanceof Column) {
                 $a = new Column($this, $a);
@@ -174,7 +174,7 @@ 
      * @param array $match
      * @return string[]
      */
-    public function matchArray (array $match) {
+    public function matchArray(array $match) {
         return array_map([$this, 'match'], array_keys($match), $match);
     }
 
@@ -182,7 +182,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);
     }
 
@@ -190,7 +190,7 @@ 
      * @param string $class Class or interface name.
      * @return null|Record|Junction
      */
-    public function offsetGet ($class) {
+    public function offsetGet($class) {
         if (class_exists($class)) {
             return $this->getRecord($class);
         }
@@ -204,7 +204,7 @@ 
      * @param string $class Class or interface name.
      * @param Record|Junction $access
      */
-    public function offsetSet ($class, $access) {
+    public function offsetSet($class, $access) {
         if ($access instanceof Record) {
             $this->setRecord($class, $access);
         }
@@ -216,7 +216,7 @@ 
     /**
      * @param string $class Class or interface name.
      */
-    public function offsetUnset ($class) {
+    public function offsetUnset($class) {
         unset($this->records[$class]);
         unset($this->junctions[$class]);
     }
@@ -228,7 +228,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);
@@ -244,7 +244,7 @@ 
      * @param array $ctorargs
      * @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());
@@ -263,7 +263,7 @@ 
      * @param int $type Ignored.
      * @return string
      */
-    public function quote ($value, $type = null) {
+    public function quote($value, $type = null) {
         if ($value instanceof ExpressionInterface) {
             return $value;
         }
@@ -283,7 +283,7 @@ 
      * @param array $values
      * @return string[]
      */
-    public function quoteArray (array $values): array {
+    public function quoteArray(array $values): array {
         return array_map([$this, 'quote'], $values);
     }
 
@@ -293,7 +293,7 @@ 
      * @param array $values
      * @return string
      */
-    public function quoteList (array $values): string {
+    public function quoteList(array $values): string {
         return implode(',', $this->quoteArray($values));
     }
 
@@ -303,7 +303,7 @@ 
      * @param mixed $value
      * @return string|string[]
      */
-    public function quoteMixed ($value) {
+    public function quoteMixed($value) {
         if (is_array($value)) {
             return $this->quoteArray($value);
         }
@@ -316,7 +316,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);
     }
 
@@ -325,7 +325,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;
     }
@@ -334,7 +334,7 @@ 
      * @param Closure $logger
      * @return $this
      */
-    public function setLogger (Closure $logger) {
+    public function setLogger(Closure $logger) {
         $this->logger = $logger;
         return $this;
     }
@@ -344,7 +344,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/Table.php

Spacing +14 added lines, -14 removed lines

@@ -39,7 +39,7 @@ 
      * @param string $name
      * @param string[] $columns
      */
-    public function __construct (DB $db, $name, array $columns) {
+    public function __construct(DB $db, $name, array $columns) {
         parent::__construct($db);
         $this->name = $name;
         foreach ($columns as $column) {
@@ -52,7 +52,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->name;
     }
 
@@ -62,7 +62,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 = implode(', ', $this->db->quoteArray($values));
         switch ($this->db) {
@@ -84,7 +84,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] ?? $this->_cache[$key] = $prepare->__invoke();
     }
 
@@ -92,7 +92,7 @@ 
      * @param array $match
      * @return int
      */
-    public function count (array $match = []) {
+    public function count(array $match = []) {
         $select = $this->select(['COUNT(*)']);
         foreach ($this->db->matchArray($match) as $condition) {
             $select->where($condition);
@@ -108,7 +108,7 @@ 
      * @param array $match
      * @return int Rows affected.
      */
-    public function delete (array $match): int {
+    public function delete(array $match): int {
         $match = Predicate::all($this->db->matchArray($match));
         return $this->db->exec("DELETE FROM {$this} WHERE {$match}");
     }
@@ -116,14 +116,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;
     }
 
@@ -133,7 +133,7 @@ 
      * @param array $values
      * @return Statement
      */
-    public function insert (array $values) {
+    public function insert(array $values) {
         $columns = implode(',', array_keys($values));
         $values = implode(', ', $this->db->quoteArray($values));
         return $this->db->query("INSERT INTO {$this} ($columns) VALUES ($values)");
@@ -143,7 +143,7 @@ 
      * @param string $name
      * @return bool
      */
-    public function offsetExists ($name): bool {
+    public function offsetExists($name): bool {
         return isset($this->columns[$name]);
     }
 
@@ -151,7 +151,7 @@ 
      * @param string $name
      * @return Column
      */
-    public function offsetGet ($name) {
+    public function offsetGet($name) {
         return $this->columns[$name];
     }
 
@@ -161,7 +161,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;
         }
@@ -174,7 +174,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) {
@@ -192,7 +192,7 @@ 
      * @param array $match
      * @return int Rows affected.
      */
-    public function update (array $values, array $match): int {
+    public function update(array $values, array $match): int {
         $values = implode(', ', $this->db->matchArray($values));
         $match = Predicate::all($this->db->matchArray($match));
         return $this->db->exec("UPDATE {$this} SET {$values} WHERE {$match}");

src/DB/Select.php

Spacing +25 added lines, -25 removed lines

@@ -106,7 +106,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();
@@ -126,7 +126,7 @@ 
      * @param array $args
      * @return Statement
      */
-    public function __invoke (array $args = []) {
+    public function __invoke(array $args = []) {
         return $this->execute($args);
     }
 
@@ -135,7 +135,7 @@ 
      *
      * @return string
      */
-    final public function __toString () {
+    final public function __toString() {
         return $this->alias;
     }
 
@@ -145,7 +145,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 = '';
@@ -158,7 +158,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());
         }
@@ -173,7 +173,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)));
     }
 
@@ -186,7 +186,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));
     }
 
@@ -198,7 +198,7 @@ 
      * @param array $args
      * @return mixed
      */
-    public function getFirst (array $args = []) {
+    public function getFirst(array $args = []) {
         return $this->getEach($args)->current();
     }
 
@@ -209,7 +209,7 @@ 
      *
      * @return Generator
      */
-    public function getIterator () {
+    public function getIterator() {
         yield from $this->getEach();
     }
 
@@ -219,7 +219,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}";
         }
@@ -235,7 +235,7 @@ 
      * @param string $condition
      * @return $this
      */
-    public function having (string $condition) {
+    public function having(string $condition) {
         if (!strlen($this->_having)) {
             $this->_having = " HAVING {$condition}";
         }
@@ -250,7 +250,7 @@ 
      *
      * @return Predicate
      */
-    public function isCorrelated () {
+    public function isCorrelated() {
         return new Predicate("EXISTS ({$this->toSql()})");
     }
 
@@ -259,7 +259,7 @@ 
      *
      * @return Predicate
      */
-    public function isNotCorrelated () {
+    public function isNotCorrelated() {
         return new Predicate("NOT EXISTS ({$this->toSql()})");
     }
 
@@ -271,7 +271,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();
         }
@@ -286,7 +286,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 = '';
         }
@@ -305,7 +305,7 @@ 
      * @param mixed $offset Ordinal or reference name.
      * @return bool
      */
-    public function offsetExists ($offset): bool {
+    public function offsetExists($offset): bool {
         return isset($this->referable[$offset]);
     }
 
@@ -315,7 +315,7 @@ 
      * @param mixed $offset Ordinal or reference name.
      * @return Column
      */
-    public function offsetGet ($offset) {
+    public function offsetGet($offset) {
         return new Column($this->db, $this->referable[$offset], $this->alias);
     }
 
@@ -325,7 +325,7 @@ 
      * @param string $order
      * @return $this
      */
-    public function order (string $order) {
+    public function order(string $order) {
         if (strlen($order)) {
             $order = " ORDER BY {$order}";
         }
@@ -336,7 +336,7 @@ 
     /**
      * @return Statement
      */
-    public function prepare () {
+    public function prepare() {
         return $this->db->prepare($this->toSql());
     }
 
@@ -344,7 +344,7 @@ 
      * @param string $alias
      * @return $this
      */
-    public function setAlias (string $alias) {
+    public function setAlias(string $alias) {
         $this->alias = $alias;
         return $this;
     }
@@ -353,7 +353,7 @@ 
      * @param string[] $columns
      * @return $this
      */
-    public function setColumns (array $columns) {
+    public function setColumns(array $columns) {
         $this->referable = [];
         $_columns = [];
         $i = 0;
@@ -385,7 +385,7 @@ 
      * @param Closure $fetcher
      * @return $this
      */
-    public function setFetcher (Closure $fetcher) {
+    public function setFetcher(Closure $fetcher) {
         $this->fetcher = $fetcher;
         return $this;
     }
@@ -395,7 +395,7 @@ 
      *
      * @return string
      */
-    public function toSql (): string {
+    public function toSql(): string {
         $sql = "SELECT {$this->_columns} FROM {$this->table}";
         $sql .= $this->_join;
         $sql .= $this->_where;
@@ -411,7 +411,7 @@ 
      *
      * @return string
      */
-    public function toSubquery (): string {
+    public function toSubquery(): string {
         return "({$this->toSql()}) AS {$this->alias}";
     }
 
@@ -421,7 +421,7 @@ 
      * @param string $condition
      * @return $this
      */
-    public function where (string $condition) {
+    public function where(string $condition) {
         if (!strlen($this->_where)) {
             $this->_where = " WHERE {$condition}";
         }

Braces +6 added lines, -12 removed lines

@@ -111,8 +111,7 @@ 
         if ($table instanceof Select) {
             $this->table = $table->toSubquery();
             $this->alias = uniqid('_') . "_{$table->alias}";
-        }
-        else {
+        } else {
             $this->table = (string)$table;
             $this->alias = uniqid('_') . "__{$table}";
         }
@@ -222,8 +221,7 @@ 
     public function group (string $column) {
         if (!strlen($this->_group)) {
             $this->_group = " GROUP BY {$column}";
-        }
-        else {
+        } else {
             $this->_group .= ", {$column}";
         }
         return $this;
@@ -238,8 +236,7 @@ 
     public function having (string $condition) {
         if (!strlen($this->_having)) {
             $this->_having = " HAVING {$condition}";
-        }
-        else {
+        } else {
             $this->_having .= " AND {$condition}";
         }
         return $this;
@@ -289,8 +286,7 @@ 
     public function limit (int $limit, int $offset = 0) {
         if ($limit == 0) {
             $this->_limit = '';
-        }
-        else {
+        } else {
             $this->_limit = " LIMIT {$limit}";
             if ($offset > 1) {
                 $this->_limit .= " OFFSET {$offset}";
@@ -367,8 +363,7 @@ 
             }
             if ($name !== $alias) {
                 $_columns[] = "{$column} AS {$alias}";
-            }
-            else {
+            } else {
                 $_columns[] = "{$column}";
             }
             if (is_string($name)) {
@@ -424,8 +419,7 @@ 
     public function where (string $condition) {
         if (!strlen($this->_where)) {
             $this->_where = " WHERE {$condition}";
-        }
-        else {
+        } else {
             $this->_where .= " AND {$condition}";
         }
         return $this;

src/DB/Record.php

Spacing +17 added lines, -17 removed lines

@@ -59,7 +59,7 @@ 
      * @param string|EntityInterface $class
      * @return Record
      */
-    public static function fromClass (DB $db, $class) {
+    public static function fromClass(DB $db, $class) {
         try {
             $rClass = new ReflectionClass($class);
         }
@@ -92,7 +92,7 @@ 
      * @param string[] $columns Property names.
      * @param EAV[] $eav Keyed by property name.
      */
-    public function __construct (DB $db, EntityInterface $proto, string $table, array $columns, array $eav = []) {
+    public function __construct(DB $db, EntityInterface $proto, string $table, array $columns, array $eav = []) {
         parent::__construct($db, $table, $columns);
         $this->proto = $proto;
         try {
@@ -128,7 +128,7 @@ 
      * @param array[] $eavMatch Additional `[eav property => attribute => mixed]`
      * @return Select
      */
-    public function find (array $match, array $eavMatch = []) {
+    public function find(array $match, array $eavMatch = []) {
         $select = $this->select();
         foreach ($this->db->matchArray($match) as $condition) {
             $select->where($condition);
@@ -146,7 +146,7 @@ 
      * @param Statement $statement
      * @return EntityInterface[] Enumerated
      */
-    public function getAll (Statement $statement): array {
+    public function getAll(Statement $statement): array {
         return iterator_to_array($this->getEach($statement));
     }
 
@@ -157,7 +157,7 @@ 
      * @param Statement $statement
      * @return Generator
      */
-    public function getEach (Statement $statement) {
+    public function getEach(Statement $statement) {
         do {
             $entities = [];
             for ($i = 0; $i < 256 and false !== $row = $statement->fetch(); $i++) {
@@ -175,14 +175,14 @@ 
      * @param string $property
      * @return EAV
      */
-    final public function getEav (string $property) {
+    final public function getEav(string $property) {
         return $this->eav[$property];
     }
 
     /**
      * @return EntityInterface
      */
-    public function getProto () {
+    public function getProto() {
         return $this->proto;
     }
 
@@ -190,7 +190,7 @@ 
      * @param EntityInterface $entity
      * @return array
      */
-    protected function getValues (EntityInterface $entity): array {
+    protected function getValues(EntityInterface $entity): array {
         $values = [];
         foreach (array_keys($this->columns) as $name) {
             $values[$name] = $this->properties[$name]->getValue($entity);
@@ -204,7 +204,7 @@ 
      * @param int $id
      * @return null|EntityInterface
      */
-    public function load (int $id) {
+    public function load(int $id) {
         $load = $this->cache(__FUNCTION__, function() {
             return $this->select(array_keys($this->columns))->where('id = ?')->prepare();
         });
@@ -222,7 +222,7 @@ 
      *
      * @param EntityInterface[] $entities
      */
-    protected function loadEav (array $entities): void {
+    protected function loadEav(array $entities): void {
         $ids = array_keys($entities);
         foreach ($this->eav as $name => $eav) {
             foreach ($eav->loadAll($ids) as $id => $values) {
@@ -239,7 +239,7 @@ 
      * @param EntityInterface $entity
      * @return int ID
      */
-    public function save (EntityInterface $entity): int {
+    public function save(EntityInterface $entity): int {
         if (!$entity->getId()) {
             $this->saveInsert($entity);
         }
@@ -253,7 +253,7 @@ 
     /**
      * @param EntityInterface $entity
      */
-    protected function saveEav (EntityInterface $entity): void {
+    protected function saveEav(EntityInterface $entity): void {
         $id = $entity->getId();
         foreach ($this->eav as $name => $eav) {
             $values = $this->properties[$name]->getValue($entity);
@@ -268,7 +268,7 @@ 
      *
      * @param EntityInterface $entity
      */
-    protected function saveInsert (EntityInterface $entity): void {
+    protected function saveInsert(EntityInterface $entity): void {
         $insert = $this->cache(__FUNCTION__, function() {
             $slots = SQL::slots(array_keys($this->columns));
             unset($slots['id']);
@@ -286,7 +286,7 @@ 
      *
      * @param EntityInterface $entity
      */
-    protected function saveUpdate (EntityInterface $entity): void {
+    protected function saveUpdate(EntityInterface $entity): void {
         $this->cache(__FUNCTION__, function() {
             $slots = SQL::slotsEqual(array_keys($this->columns));
             unset($slots['id']);
@@ -301,7 +301,7 @@ 
      * @param array $columns Defaults to all columns.
      * @return Select
      */
-    public function select (array $columns = []) {
+    public function select(array $columns = []) {
         $select = parent::select($columns);
         if (empty($columns)) {
             $select->setFetcher(function(Statement $statement) {
@@ -315,7 +315,7 @@ 
      * @param EntityInterface $proto
      * @return $this
      */
-    public function setProto (EntityInterface $proto) {
+    public function setProto(EntityInterface $proto) {
         $this->proto = $proto;
         return $this;
     }
@@ -324,7 +324,7 @@ 
      * @param EntityInterface $entity
      * @param array $values
      */
-    protected function setValues (EntityInterface $entity, array $values): void {
+    protected function setValues(EntityInterface $entity, array $values): void {
         foreach ($values as $name => $value) {
             settype($value, $this->types[$name]);
             $this->properties[$name]->setValue($entity, $value);

src/DB/SQL/Predicate.php

Spacing +5 added lines, -5 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 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 reset($conditions);
         }
@@ -56,7 +56,7 @@ 
      * @param string $listOper
      * @return Predicate
      */
-    public static function compare ($a, $b, $oper = '=', $listOper = 'IN') {
+    public static function compare($a, $b, $oper = '=', $listOper = 'IN') {
         if (is_array($b)) {
             return new static("{$a} {$listOper} (" . implode(',', $b) . ")");
         }
@@ -77,7 +77,7 @@ 
      * @param string $listOper
      * @return Predicate[]
      */
-    public static function compareArray (array $values, $oper = '=', $listOper = 'IN') {
+    public static function compareArray(array $values, $oper = '=', $listOper = 'IN') {
         foreach ($values as $a => $b) {
             $values[$a] = static::compare($a, $b, $oper, $listOper);
         }
@@ -89,7 +89,7 @@ 
      *
      * @return Predicate
      */
-    public function invert () {
+    public function invert() {
         return new static("NOT({$this})");
     }
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -59,8 +59,7 @@
     public static function compare ($a, $b, $oper = '=', $listOper = 'IN') {
         if (is_array($b)) {
             return new static("{$a} {$listOper} (" . implode(',', $b) . ")");
-        }
-        elseif ($b instanceof Select) {
+        } elseif ($b instanceof Select) {
             return new static("{$a} {$listOper} ({$b->toSql()})");
         }
         return new static("{$a} {$oper} {$b}");

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 new Text($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 new Numeric($this->db, $this->getDateTimeFormat('%d'));
     }
 
@@ -57,7 +57,7 @@ 
      *
      * @return Numeric
      */
-    public function getDayOfWeek () {
+    public function getDayOfWeek() {
         return new Numeric($this->db, $this->getDateTimeFormat('%w'));
     }
 
@@ -66,7 +66,7 @@ 
      *
      * @return Numeric
      */
-    public function getDayOfYear () {
+    public function getDayOfYear() {
         return new Numeric($this->db, $this->getDateTimeFormat('%j'));
     }
 
@@ -75,7 +75,7 @@ 
      *
      * @return Numeric
      */
-    public function getHours () {
+    public function getHours() {
         return new Numeric($this->db, $this->getDateTimeFormat('%H'));
     }
 
@@ -84,7 +84,7 @@ 
      *
      * @return Numeric
      */
-    public function getMinutes () {
+    public function getMinutes() {
         return new Numeric($this->db, $this->getDateTimeFormat([
             'mysql' => '%i',
             'sqlite' => '%M'
@@ -96,7 +96,7 @@ 
      *
      * @return Numeric
      */
-    public function getMonth () {
+    public function getMonth() {
         return new Numeric($this->db, $this->getDateTimeFormat('%m'));
     }
 
@@ -105,7 +105,7 @@ 
      *
      * @return Numeric
      */
-    public function getSeconds () {
+    public function getSeconds() {
         return new Numeric($this->db, $this->getDateTimeFormat('%S'));
     }
 
@@ -114,7 +114,7 @@ 
      *
      * @return Text
      */
-    public function getTime () {
+    public function getTime() {
         return new Text($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 new Numeric($this->db, "STRFTIME('%s',{$this})");
@@ -140,7 +140,7 @@ 
      *
      * @return Numeric
      */
-    public function getWeekOfYear () {
+    public function getWeekOfYear() {
         return new Numeric($this->db, $this->getDateTimeFormat([
             'mysql' => '%U',
             'sqlite' => '%W'
@@ -152,7 +152,7 @@ 
      *
      * @return Numeric
      */
-    public function getYear () {
+    public function getYear() {
         return new Numeric($this->db, $this->getDateTimeFormat('%Y'));
     }
 }
\ 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 new Numeric($this->db, "CAST({$this} AS REAL)");
@@ -28,7 +28,7 @@ 
      *
      * @return Numeric
      */
-    public function toInt () {
+    public function toInt() {
         switch ($this->db) {
             case 'sqlite':
                 return new Numeric($this->db, "CAST({$this} AS INTEGER)");

src/DB/SQL/ComparisonTrait.php

Spacing +16 added lines, -16 removed lines

@@ -28,7 +28,7 @@ 
      * @param array $values
      * @return Value
      */
-    public function coalesce (array $values) {
+    public function coalesce(array $values) {
         array_unshift($values, $this);
         $values = $this->db->quoteList($values);
         return new Value($this->db, "COALESCE({$values})");
@@ -40,7 +40,7 @@ 
      * @param array $values `[when => then]`
      * @return Choice
      */
-    public function getChoice (array $values) {
+    public function getChoice(array $values) {
         return new Choice($this->db, "{$this}", $values);
     }
 
@@ -53,7 +53,7 @@ 
      * @param null|bool|number|string|Select $arg
      * @return Predicate
      */
-    public function is ($arg): Predicate {
+    public function is($arg): Predicate {
         if ($arg === null or is_bool($arg)) {
             $arg = ['' => 'NULL', 1 => 'TRUE', 0 => 'FALSE'][$arg];
         }
@@ -79,7 +79,7 @@ 
      * @param number|string $max
      * @return Predicate
      */
-    public function isBetween ($min, $max) {
+    public function isBetween($min, $max) {
         $min = $this->db->quote($min);
         $max = $this->db->quote($max);
         return new Predicate("{$this} BETWEEN {$min} AND {$max}");
@@ -91,7 +91,7 @@ 
      * @param bool|number|string|array|Select $arg
      * @return Predicate
      */
-    public function isEqual ($arg) {
+    public function isEqual($arg) {
         return Predicate::compare($this, $this->db->quoteMixed($arg));
     }
 
@@ -104,7 +104,7 @@ 
      * @param number|string|Select $arg
      * @return Predicate
      */
-    public function isGreater ($arg) {
+    public function isGreater($arg) {
         if ($arg instanceof Select and $this->db == 'sqlite') {
             $sub = new Select($this->db, $arg, [$arg[0]]);
             return $sub->where("{$this} <= {$arg[0]}")->isNotCorrelated();
@@ -121,7 +121,7 @@ 
      * @param number|string|Select $arg
      * @return Predicate
      */
-    public function isGreaterOrEqual ($arg) {
+    public function isGreaterOrEqual($arg) {
         if ($arg instanceof Select and $this->db == 'sqlite') {
             $sub = new Select($this->db, $arg, [$arg[0]]);
             return $sub->where("{$this} < {$arg[0]}")->isNotCorrelated();
@@ -138,7 +138,7 @@ 
      * @param number|string|Select $arg
      * @return Predicate
      */
-    public function isLess ($arg) {
+    public function isLess($arg) {
         if ($arg instanceof Select and $this->db == 'sqlite') {
             $sub = new Select($this->db, $arg, [$arg[0]]);
             return $sub->where("{$this} >= {$arg[0]}")->isNotCorrelated();
@@ -155,7 +155,7 @@ 
      * @param number|string|Select $arg
      * @return Predicate
      */
-    public function isLessOrEqual ($arg) {
+    public function isLessOrEqual($arg) {
         if ($arg instanceof Select and $this->db == 'sqlite') {
             $sub = new Select($this->db, $arg, [$arg[0]]);
             return $sub->where("{$this} > {$arg[0]}")->isNotCorrelated();
@@ -169,7 +169,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isLike (string $pattern) {
+    public function isLike(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return new Predicate("{$this} LIKE {$pattern}");
     }
@@ -180,7 +180,7 @@ 
      * @param null|bool|number|string|Select $arg
      * @return Predicate
      */
-    public function isNot ($arg) {
+    public function isNot($arg) {
         return $this->is($arg)->invert();
     }
 
@@ -191,7 +191,7 @@ 
      * @param number|string $max
      * @return Predicate
      */
-    public function isNotBetween ($min, $max) {
+    public function isNotBetween($min, $max) {
         $min = $this->db->quote($min);
         $max = $this->db->quote($max);
         return new Predicate("{$this} NOT BETWEEN {$min} AND {$max}");
@@ -203,7 +203,7 @@ 
      * @param bool|number|string|array|Select $arg
      * @return Predicate
      */
-    public function isNotEqual ($arg) {
+    public function isNotEqual($arg) {
 
         return Predicate::compare($this, $this->db->quoteMixed($arg), '<>', 'NOT IN');
     }
@@ -214,7 +214,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isNotLike (string $pattern) {
+    public function isNotLike(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return new Predicate("{$this} NOT LIKE {$pattern}");
     }
@@ -225,7 +225,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isNotRegExp (string $pattern) {
+    public function isNotRegExp(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return new Predicate("{$this} NOT REGEXP {$pattern}");
     }
@@ -236,7 +236,7 @@ 
      * @param string $pattern
      * @return Predicate
      */
-    public function isRegExp (string $pattern) {
+    public function isRegExp(string $pattern) {
         $pattern = $this->db->quote($pattern);
         return new Predicate("{$this} REGEXP {$pattern}");
     }

Braces +1 added lines, -2 removed lines

@@ -56,8 +56,7 @@
     public function is ($arg): Predicate {
         if ($arg === null or is_bool($arg)) {
             $arg = ['' => 'NULL', 1 => 'TRUE', 0 => 'FALSE'][$arg];
-        }
-        else {
+        } else {
             $arg = $this->db->quote($arg);
         }
         switch ($this->db) {

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 new Text($this->db, "HEX({$this})");
     }
 
@@ -28,7 +28,7 @@ 
      *
      * @return Numeric
      */
-    public function getLength () {
+    public function getLength() {
         switch ($this->db) {
             case 'sqlite':
                 return new Numeric($this->db, "LENGTH(CAST({$this} AS TEXT))");
@@ -42,7 +42,7 @@ 
      *
      * @return Text
      */
-    public function getLower () {
+    public function getLower() {
         return new Text($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 new Text($this->db, "REPLACE({$this},{$search},{$replace})");
@@ -82,7 +82,7 @@ 
      *
      * @return Numeric
      */
-    public function getSize () {
+    public function getSize() {
         switch ($this->db) {
             case 'sqlite':
                 return new Numeric($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 new Text($this->db, "SUBSTR({$this},{$start},{$length})");
         }
@@ -110,7 +110,7 @@ 
      *
      * @return Text
      */
-    public function getUpper () {
+    public function getUpper() {
         return new Text($this->db, "UPPER({$this})");
     }
 }
\ No newline at end of file