chillerlan / php-database

src/Query/Dialects/SQLite/CreateTable.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -12,8 +12,8 @@
 
 namespace chillerlan\Database\Query\Dialects\SQLite;
 
-use chillerlan\Database\Query\CreateTableInterface;
 use chillerlan\Database\Query\CreateTableAbstract;
+use chillerlan\Database\Query\CreateTableInterface;
 use chillerlan\Database\Query\QueryException;
 
 /**

Indentation +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
 
 			if($this->primaryKey){
 				$sql .=','.PHP_EOL."\t".'PRIMARY KEY ('.$this->quote($this->primaryKey)
-				       .(in_array($this->dir, ['ASC', 'DESC']) ? $this->dir : '').')';
+					   .(in_array($this->dir, ['ASC', 'DESC']) ? $this->dir : '').')';
 			}
 
 			$sql .= PHP_EOL.')';
@@ -87,7 +87,7 @@ 
 
 
 		if(is_int($length)&& in_array($type, ['CHAR', 'NCHAR','VARCHAR', 'NVARCHAR', 'CHARACTER'])
-		    || is_string($length) && count(explode(',', $length)) === 2 && $type === 'DECIMAL'){
+			|| is_string($length) && count(explode(',', $length)) === 2 && $type === 'DECIMAL'){
 			$field[] = $type_translation.'('. $length . ')';
 		}
 		else{

Spacing +4 added lines, -4 removed lines

@@ -44,13 +44,13 @@ 
 
 		$n = explode('.', $this->name);
 
-		$sql .= $this->quote($n[count($n)-1]);
+		$sql .= $this->quote($n[count($n) - 1]);
 
 		if(!empty($this->cols)){
 			$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)
 				       .(in_array($this->dir, ['ASC', 'DESC']) ? $this->dir : '').')';
 			}
 
@@ -86,9 +86,9 @@ 
 
 
 
-		if(is_int($length)&& in_array($type, ['CHAR', 'NCHAR','VARCHAR', 'NVARCHAR', 'CHARACTER'])
+		if(is_int($length) && in_array($type, ['CHAR', 'NCHAR', 'VARCHAR', 'NVARCHAR', 'CHARACTER'])
 		    || is_string($length) && count(explode(',', $length)) === 2 && $type === 'DECIMAL'){
-			$field[] = $type_translation.'('. $length . ')';
+			$field[] = $type_translation.'('.$length.')';
 		}
 		else{
 			$field[] = $type_translation;

src/Query/SelectAbstract.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 
 	/**
 	 * @param      $expr1
-	 * @param null $expr2
+	 * @param string|null $expr2
 	 * @param null $func
 	 *
 	 * @return void

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/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) : '';

src/Query/Dialects/Postgres/CreateTable.php

Spacing +3 added lines, -3 removed lines

@@ -33,13 +33,13 @@ 
 
 		$n = explode('.', $this->name);
 
-		$sql .= $this->quote($n[count($n)-1]);
+		$sql .= $this->quote($n[count($n) - 1]);
 
 		if(!empty($this->cols)){
 			$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.')';
@@ -83,7 +83,7 @@ 
 
 		if((is_int($length) || is_string($length) && count(explode(',', $length)) === 2)
 		   && in_array($type, ['BIT', 'VARBIT', 'CHAR', 'VARCHAR', 'DECIMAL', 'NUMERIC', 'TIME', 'TIMESTAMP', 'INTERVAL'])){
-			$field[] = $type_translation.'('. $length . ')';
+			$field[] = $type_translation.'('.$length.')';
 		}
 		else{
 			$field[] = $type_translation;

src/Query/Dialects/Firebird/CreateTable.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
 
 		$n = explode('.', $this->name);
 
-		$sql .= $this->quote($n[count($n)-1]);
+		$sql .= $this->quote($n[count($n) - 1]);
 
 		$cols = [];
 
@@ -98,14 +98,14 @@ 
 			$field[] = $type_translation;
 		}
 		else if(in_array($type, ['CHAR', 'VARCHAR', 'DECIMAL', 'NUMERIC'])){
-			$field[] = $type.'('. $length . ')';
+			$field[] = $type.'('.$length.')';
 		}
 		else{
 			$field[] = $type;
 		}
 
 
-		if($isNull ===  false && !in_array($type, ['DATE', 'TIME', 'TIMESTAMP'])){
+		if($isNull === false && !in_array($type, ['DATE', 'TIME', 'TIMESTAMP'])){
 			$field[] = 'NOT NULL';
 		}
 

src/Query/Dialects/Postgres/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) : '';

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) : '';

src/DBQuery.php

Unused Use Statements +2 added lines, -2 removed lines

@@ -14,11 +14,11 @@
 
 use chillerlan\Database\Drivers\DBDriverInterface;
 use chillerlan\Database\Query\AlterInterface;
+use chillerlan\Database\Query\CreateDatabaseInterface;
 use chillerlan\Database\Query\CreateInterface;
+use chillerlan\Database\Query\CreateTableInterface;
 use chillerlan\Database\Query\DropInterface;
 use chillerlan\Database\Query\StatementAbstract;
-use chillerlan\Database\Query\CreateDatabaseInterface;
-use chillerlan\Database\Query\CreateTableInterface;
 
 /**
  * @property \chillerlan\Database\Query\SelectInterface $select

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);
 	}
 
 	/**