chillerlan / php-database

src/Query/Dialects/SQLite/Select.php

Spacing +2 added lines, -2 removed lines

@@ -36,8 +36,8 @@
 
 		$sql  = 'SELECT ';
 		$sql .= $this->distinct ? 'DISTINCT ' : '';
-		$sql .= !empty($this->cols) ? implode($glue , $this->cols).PHP_EOL : '* ';
-		$sql .= 'FROM '.implode($glue , $this->from);
+		$sql .= !empty($this->cols) ? implode($glue, $this->cols).PHP_EOL : '* ';
+		$sql .= 'FROM '.implode($glue, $this->from);
 		$sql .= $this->_getWhere();
 		$sql .= !empty($this->groupby) ? PHP_EOL.'GROUP BY '.implode($glue, $this->groupby) : '';
 		$sql .= !empty($this->orderby) ? PHP_EOL.'ORDER BY '.implode($glue, $this->orderby) : '';

tests/Query/QueryTestAbstract.php

Spacing +5 added lines, -5 removed lines

@@ -113,9 +113,9 @@ 
 		$insert
 			->into(self::TEST_TABLENAME)
 			->values([
-				['id' => 1, 'hash' => md5(1), 'data' => 'foo', 'value' => 123.456,    'active' => 0],
+				['id' => 1, 'hash' => md5(1), 'data' => 'foo', 'value' => 123.456, 'active' => 0],
 				['id' => 2, 'hash' => md5(2), 'data' => 'foo', 'value' => 123.456789, 'active' => 1],
-				['id' => 3, 'hash' => md5(3), 'data' => 'foo', 'value' => 123.456,    'active' => 0],
+				['id' => 3, 'hash' => md5(3), 'data' => 'foo', 'value' => 123.456, 'active' => 0],
 			])
 		;
 
@@ -171,7 +171,7 @@ 
 		$select = $this->statement->select;
 		$select
 			->from([self::TEST_TABLENAME])
-			->where('id', [1,2,3], 'in')
+			->where('id', [1, 2, 3], 'in')
 			->orderBy(['hash' => ['desc', 'lower']]);
 #		print_r(PHP_EOL.$select->sql().PHP_EOL);
 		$result = $select->execute();
@@ -213,7 +213,7 @@ 
 #		print_r(PHP_EOL.$update->sql().PHP_EOL);
 		$this->assertTrue($update->execute());
 
-		$r = $this->statement->select->from([self::TEST_TABLENAME])->where('id' ,1)->execute();
+		$r = $this->statement->select->from([self::TEST_TABLENAME])->where('id', 1)->execute();
 
 		$this->assertSame('bar', $r[0]->data);
 		$this->assertSame(42.42, (float)$r[0]->value);
@@ -247,7 +247,7 @@ 
 		$this->assertTrue($delete->execute());
 
 		$r = $this->statement->select->from([self::TEST_TABLENAME])->execute();
-		$this->assertCount(3,  $r);
+		$this->assertCount(3, $r);
 	}
 
 	/**

src/Query/Dialects/Firebird/Select.php

Spacing +2 added lines, -2 removed lines

@@ -43,8 +43,8 @@
 		$sql  = 'SELECT ';
 		$sql .= !is_null($this->limit) ? 'FIRST ? SKIP ? ' : '';
 		$sql .= $this->distinct ? 'DISTINCT ' : '';
-		$sql .= !empty($this->cols) ? implode($glue , $this->cols).PHP_EOL : '* ';
-		$sql .= 'FROM '.implode($glue , $this->from);
+		$sql .= !empty($this->cols) ? implode($glue, $this->cols).PHP_EOL : '* ';
+		$sql .= 'FROM '.implode($glue, $this->from);
 		$sql .= $this->_getWhere();
 		$sql .= !empty($this->groupby) ? PHP_EOL.'GROUP BY '.implode($glue, $this->groupby) : '';
 		$sql .= !empty($this->orderby) ? PHP_EOL.'ORDER BY '.implode($glue, $this->orderby) : '';

src/Query/SelectAbstract.php

Spacing +5 added lines, -5 removed lines

@@ -118,7 +118,7 @@ 
 			if(is_string($k)){
 				is_array($ref)
 					? $this->addColumn($ref[0], $k, $ref[1] ?? null)
-					: $this->addColumn($ref ,$k);
+					: $this->addColumn($ref, $k);
 			}
 			else{
 				is_array($ref)
@@ -140,7 +140,7 @@ 
 		$from = $this->quote($table);
 
 		if($ref){
-			$from = sprintf('%s AS %s', $this->quote($ref), $this->quote($table));// @todo: index hint
+			$from = sprintf('%s AS %s', $this->quote($ref), $this->quote($table)); // @todo: index hint
 		}
 
 		$this->from[$ref ?? $table] = $from;
@@ -211,7 +211,7 @@ 
 					$dir = strtoupper($expression[0]);
 
 					if(in_array($dir, ['ASC', 'DESC'])){
-						$this->orderby[] =  isset($expression[1]) ? strtoupper($expression[1]).'('.$this->quote($alias).') '.$dir : $dir;
+						$this->orderby[] = isset($expression[1]) ? strtoupper($expression[1]).'('.$this->quote($alias).') '.$dir : $dir;
 					}
 
 				}
@@ -219,7 +219,7 @@ 
 					$dir = strtoupper($expression);
 
 					if(in_array($dir, ['ASC', 'DESC'])){
-						$this->orderby[] =  $this->quote($alias).' '.$dir;
+						$this->orderby[] = $this->quote($alias).' '.$dir;
 					}
 
 				}
@@ -265,7 +265,7 @@ 
 		$sql  = 'SELECT ';
 		$sql .= $this->distinct ? 'DISTINCT ' : '';
 		$sql .= 'COUNT(*) AS  '.$this->quote('count');
-		$sql .= 'FROM '.implode($glue , $this->from);
+		$sql .= 'FROM '.implode($glue, $this->from);
 		$sql .= $this->_getWhere();
 		$sql .= !empty($this->groupby) ? PHP_EOL.'GROUP BY '.implode($glue, $this->groupby) : '';
 

src/Query/Dialects/MySQL/CreateTable.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
 			$sql .= ' ('.PHP_EOL."\t".implode(','.PHP_EOL."\t", $this->cols);
 
 			if($this->primaryKey){
-				$sql .=','.PHP_EOL."\t".'PRIMARY KEY ('.$this->quote($this->primaryKey).')';
+				$sql .= ','.PHP_EOL."\t".'PRIMARY KEY ('.$this->quote($this->primaryKey).')';
 			}
 
 			$sql .= PHP_EOL.')';
@@ -85,7 +85,7 @@ 
 		                  'MEDIUMTEXT', 'LONGBLOB', 'LONGTEXT', 'SERIAL', 'BOOLEAN', 'UUID'];
 
 		$field[] = (is_int($length) || is_string($length) && count(explode(',', $length)) === 2) && !in_array($type, $nolengthtypes)
-			? $type.'('. $length . ')'
+			? $type.'('.$length.')'
 			: $type;
 
 		if($attribute){
@@ -129,7 +129,7 @@ 
 					$field[] = 'DEFAULT NULL';
 					break;
 				default:
-					$field[] = 'DEFAULT '.(is_int($defaultValue) || is_float($defaultValue) ? $defaultValue : '\''.$defaultValue.'\'') ;
+					$field[] = 'DEFAULT '.(is_int($defaultValue) || is_float($defaultValue) ? $defaultValue : '\''.$defaultValue.'\'');
 			}
 
 		}

src/Query/CreateTableInterface.php

Spacing +7 added lines, -7 removed lines

@@ -77,14 +77,14 @@
 	 */
 #	public function index($name):CreateTableInterface;
 
-	public function tinyint(string $name, int $length = null,  $defaultValue = null , bool $isNull = null, string $attribute = null):CreateTableInterface;
-	public function int(string $name, int $length = null,  $defaultValue = null , bool $isNull = null, string $attribute = null):CreateTableInterface;
+	public function tinyint(string $name, int $length = null, $defaultValue = null, bool $isNull = null, string $attribute = null):CreateTableInterface;
+	public function int(string $name, int $length = null, $defaultValue = null, bool $isNull = null, string $attribute = null):CreateTableInterface;
 
-	public function tinytext(string $name,  $defaultValue = null , bool $isNull = true):CreateTableInterface;
-	public function text(string $name,  $defaultValue = null , bool $isNull = true):CreateTableInterface;
+	public function tinytext(string $name, $defaultValue = null, bool $isNull = true):CreateTableInterface;
+	public function text(string $name, $defaultValue = null, bool $isNull = true):CreateTableInterface;
 
-	public function varchar(string $name, int $length,  $defaultValue = null , bool $isNull = null):CreateTableInterface;
-	public function decimal(string $name, string $length,  $defaultValue = null , bool $isNull = null):CreateTableInterface;
-	public function enum(string $name, array $values, $defaultValue = null , bool $isNull = null):CreateTableInterface;
+	public function varchar(string $name, int $length, $defaultValue = null, bool $isNull = null):CreateTableInterface;
+	public function decimal(string $name, string $length, $defaultValue = null, bool $isNull = null):CreateTableInterface;
+	public function enum(string $name, array $values, $defaultValue = null, bool $isNull = null):CreateTableInterface;
 
 }

src/Query/CreateTableAbstract.php

Spacing +8 added lines, -8 removed lines

@@ -176,12 +176,12 @@ 
 	 *
 	 * @return \chillerlan\Database\Query\CreateTableInterface
 	 */
-	public function tinyint(string $name, int $length = null,  $defaultValue = null , bool $isNull = null, string $attribute = null):CreateTableInterface{
+	public function tinyint(string $name, int $length = null, $defaultValue = null, bool $isNull = null, string $attribute = null):CreateTableInterface{
 		return $this->field($name, 'TINYINT', $length, $attribute, null, !is_null($defaultValue) ? false : $isNull, !is_null($defaultValue) ? 'USER_DEFINED' : null, $defaultValue);
 	}
 
 
-	public function int(string $name, int $length = null,  $defaultValue = null , bool $isNull = null, string $attribute = null):CreateTableInterface{
+	public function int(string $name, int $length = null, $defaultValue = null, bool $isNull = null, string $attribute = null):CreateTableInterface{
 		return $this->field($name, 'INT', $length, $attribute, null, !is_null($defaultValue) ? false : $isNull, !is_null($defaultValue) ? 'USER_DEFINED' : null, $defaultValue);
 	}
 
@@ -194,7 +194,7 @@ 
 	 *
 	 * @return \chillerlan\Database\Query\CreateTableInterface
 	 */
-	public function varchar(string $name, int $length,  $defaultValue = null , bool $isNull = null):CreateTableInterface{
+	public function varchar(string $name, int $length, $defaultValue = null, bool $isNull = null):CreateTableInterface{
 		return $this->field($name, 'VARCHAR', $length, null, null, !is_null($defaultValue) ? false : $isNull, !is_null($defaultValue) ? 'USER_DEFINED' : null, $defaultValue);
 	}
 
@@ -206,7 +206,7 @@ 
 	 *
 	 * @return \chillerlan\Database\Query\CreateTableInterface
 	 */
-	public function decimal(string $name, string $length,  $defaultValue = null , bool $isNull = null):CreateTableInterface{
+	public function decimal(string $name, string $length, $defaultValue = null, bool $isNull = null):CreateTableInterface{
 		return $this->field($name, 'DECIMAL', $length, null, null, !is_null($defaultValue) ? false : $isNull, !is_null($defaultValue) ? 'USER_DEFINED' : null, $defaultValue);
 	}
 
@@ -217,12 +217,12 @@ 
 	 *
 	 * @return \chillerlan\Database\Query\CreateTableInterface
 	 */
-	public function tinytext(string $name,  $defaultValue = null , bool $isNull = true):CreateTableInterface{
+	public function tinytext(string $name, $defaultValue = null, bool $isNull = true):CreateTableInterface{
 		return $this->field($name, 'TINYTEXT', null, null, null, !is_null($defaultValue) ? false : $isNull, !is_null($defaultValue) ? 'USER_DEFINED' : null, $defaultValue);
 	}
 
 
-	public function text(string $name,  $defaultValue = null , bool $isNull = true):CreateTableInterface{
+	public function text(string $name, $defaultValue = null, bool $isNull = true):CreateTableInterface{
 		return $this->field($name, 'TEXT', null, null, null, !is_null($defaultValue) ? false : $isNull, !is_null($defaultValue) ? 'USER_DEFINED' : null, $defaultValue);
 	}
 
@@ -235,7 +235,7 @@ 
 	 *
 	 * @return \chillerlan\Database\Query\CreateTableInterface
 	 */
-	public function enum(string $name, array $values, $defaultValue = null , bool $isNull = null):CreateTableInterface{
+	public function enum(string $name, array $values, $defaultValue = null, bool $isNull = null):CreateTableInterface{
 
 		$field = $this->quote($name);
 		$field .= 'ENUM (\''.implode('\', \'', $values).'\')';
@@ -245,7 +245,7 @@ 
 		}
 
 		if(in_array($defaultValue, $values, true)){
-			$field .= 'DEFAULT '.(is_int($defaultValue) || is_float($defaultValue) ? $defaultValue : '\''.$defaultValue.'\'') ;
+			$field .= 'DEFAULT '.(is_int($defaultValue) || is_float($defaultValue) ? $defaultValue : '\''.$defaultValue.'\'');
 		}
 		elseif($isNull && strtolower($defaultValue) === 'null'){
 			$field .= 'DEFAULT NULL';