gamernetwork / yolk-database

src/exceptions/QueryException.php

Braces +2 added lines, -2 removed lines

@@ -14,9 +14,9 @@
 /**

  * Thrown if an error occurs whilst executing a query.

  */

-class QueryException extends DatabaseException {

+class QueryException extends DatabaseException {
 

-	public function __construct( $message = 'An error occured executing a database query', $code = 0, \Exception $previous = null ) {

+	public function __construct( $message = 'An error occured executing a database query', $code = 0, \Exception $previous = null ) {
 		parent::__construct($message, $code, $previous);

 	}

 

src/query/Delete.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 
 		if( $this->limit ) {
 			$sql[] = "LIMIT :limit";
-			$this->params['limit']  = $this->limit;
+			$this->params['limit'] = $this->limit;
 		}
 
 		return $sql;

src/query/Update.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 
 		return array_merge(
 			[
-				"UPDATE {$this->table}",
+				"update {$this->table}",
 			],
 			$this->compileSet(),
 			$this->compileWhere(),

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
 			$end++;
 		}
 
-		$sql[0]    = 'SET '. $sql[0];
+		$sql[0]    = 'SET '.$sql[0];
 		$sql[$end] = trim($sql[$end], ',');
 
 		return $sql;
@@ -88,7 +88,7 @@ 
 
 		if( $this->limit ) {
 			$sql[] = "LIMIT :limit";
-			$this->params['limit']  = $this->limit;
+			$this->params['limit'] = $this->limit;
 		}
 
 		return $sql;

src/support/DatabaseTree.php

Indentation +1 added lines, -1 removed lines

@@ -390,7 +390,7 @@
 
 		$this->db->execute("UPDATE {$this->table_name} SET lft = ?, rgt = ? WHERE id = ?", array($lft, $rgt, $id));
 
-	    return $rgt + 1;
+		return $rgt + 1;
 
 	}
 

Braces +3 added lines, -2 removed lines

@@ -108,8 +108,9 @@
 			$child['rgt'] = (int) $child['rgt'];
 
 			// if current left > right on top of stack we've gone down a level so pop the stack
-			while( $stack && $child['lft'] > $stack[count($stack) - 1] )
-				array_pop($stack);
+			while( $stack && $child['lft'] > $stack[count($stack) - 1] ) {
+							array_pop($stack);
+			}
 
 			$child['depth'] = $offset + count($stack) + 1;
 

Upper-Lower-Casing +16 added lines, -16 removed lines

@@ -142,8 +142,8 @@ 
 				$parent = $this->findNodeById($parent_id);
 
 				// shift everything up to make room for the new node
-				$this->db->query("UPDATE {$this->table_name} SET rgt = rgt + 2 WHERE rgt >= ?", $parent['rgt']);
-				$this->db->query("UPDATE {$this->table_name} SET lft = lft + 2 WHERE lft >= ?", $parent['rgt']);
+				$this->db->query("update {$this->table_name} SET rgt = rgt + 2 WHERE rgt >= ?", $parent['rgt']);
+				$this->db->query("update {$this->table_name} SET lft = lft + 2 WHERE lft >= ?", $parent['rgt']);
 
 				// single query - http://www.slideshare.net/billkarwin/models-for-hierarchical-data (slide 36)
 				/*update table set
@@ -159,7 +159,7 @@ 
 			}
 
 			$this->db->execute(
-				"UPDATE {$this->table_name} SET lft = ?, rgt = ? WHERE id = ?",
+				"update {$this->table_name} SET lft = ?, rgt = ? WHERE id = ?",
 				array($parent['rgt'], $parent['rgt'] + 1, $id)
 			);
 
@@ -194,10 +194,10 @@ 
 			$diff = (int) $node['rgt'] - (int) $node['lft'] + 1;
 
 			// remove the item from the tree by blanking the left and right indexes
-			$this->db->execute("UPDATE {$this->table_name} SET lft = 0, rgt = 0 WHERE lft BETWEEN ? AND ?", array($node['lft'], $node['rgt']));
+			$this->db->execute("update {$this->table_name} SET lft = 0, rgt = 0 WHERE lft BETWEEN ? AND ?", array($node['lft'], $node['rgt']));
 			
-			$this->db->execute("UPDATE {$this->table_name} SET lft = lft - ? WHERE lft >= ?", array($diff, $node['lft']));
-			$this->db->execute("UPDATE {$this->table_name} SET rgt = rgt - ? WHERE rgt >= ?", array($diff, $node['rgt']));
+			$this->db->execute("update {$this->table_name} SET lft = lft - ? WHERE lft >= ?", array($diff, $node['lft']));
+			$this->db->execute("update {$this->table_name} SET rgt = rgt - ? WHERE rgt >= ?", array($diff, $node['rgt']));
 
 			if( !$transaction )
 				$this->db->commit();
@@ -235,7 +235,7 @@ 
 
 			// remove the node and it's descendents from the tree whilst keeping it's structure, by converting the left and right values to negative numbers
 			$this->db->execute(
-				"UPDATE {$this->table_name} SET lft = -(lft - :lft + 1), rgt = -(rgt -:lft + 1) WHERE lft >= :lft AND rgt <= :rgt",
+				"update {$this->table_name} SET lft = -(lft - :lft + 1), rgt = -(rgt -:lft + 1) WHERE lft >= :lft AND rgt <= :rgt",
 				array(
 					'lft'  => $node['lft'],
 					'rgt'  => $node['rgt']
@@ -243,25 +243,25 @@ 
 			);
 
 			// collapse the gap we just created
-			$this->db->execute("UPDATE {$this->table_name} SET lft = lft - ? WHERE lft > ?", array($diff, $node['lft']));
-			$this->db->execute("UPDATE {$this->table_name} SET rgt = rgt - ? WHERE rgt > ?", array($diff, $node['rgt']));
+			$this->db->execute("update {$this->table_name} SET lft = lft - ? WHERE lft > ?", array($diff, $node['lft']));
+			$this->db->execute("update {$this->table_name} SET rgt = rgt - ? WHERE rgt > ?", array($diff, $node['rgt']));
 
 			// refresh parent state
 			$parent = $this->findNodeById($parent_id);
 
 			// create new gap
-			$this->db->execute("UPDATE {$this->table_name} SET lft = lft + ? WHERE lft > ?", array($diff, $parent['rgt']));
-			$this->db->execute("UPDATE {$this->table_name} SET rgt = rgt + ? WHERE rgt >= ?", array($diff, $parent['rgt']));
+			$this->db->execute("update {$this->table_name} SET lft = lft + ? WHERE lft > ?", array($diff, $parent['rgt']));
+			$this->db->execute("update {$this->table_name} SET rgt = rgt + ? WHERE rgt >= ?", array($diff, $parent['rgt']));
 
 			// refresh parent state
 			$parent = $this->findNodeById($parent_id);
 
 			// fill the gap with the original node, updating the left and right values
-			$this->db->execute("UPDATE {$this->table_name} SET lft = ? - ? - lft - 1 WHERE lft < 0", array($parent['rgt'], $diff));
-			$this->db->execute("UPDATE {$this->table_name} SET rgt = ? - ? - rgt - 1 WHERE rgt < 0", array($parent['rgt'], $diff));
+			$this->db->execute("update {$this->table_name} SET lft = ? - ? - lft - 1 WHERE lft < 0", array($parent['rgt'], $diff));
+			$this->db->execute("update {$this->table_name} SET rgt = ? - ? - rgt - 1 WHERE rgt < 0", array($parent['rgt'], $diff));
 
 			// ensure the correct parent is assigned - may have already by done by calling function
-			$this->db->execute("UPDATE {$this->table_name} SET parent_id = ? WHERE id = ?", array($parent_id, $id));
+			$this->db->execute("update {$this->table_name} SET parent_id = ? WHERE id = ?", array($parent_id, $id));
 
 			if( !$transaction )
 				$this->db->commit();
@@ -362,7 +362,7 @@ 
 
 		try {
 			$this->db->begin();
-			$this->db->execute("UPDATE {$this->table_name} SET lft = 0, rgt = 0");
+			$this->db->execute("update {$this->table_name} SET lft = 0, rgt = 0");
 			$this->rebuildNode($sort, 0);
 			$this->db->commit();
 		}
@@ -388,7 +388,7 @@ 
 			$rgt = $this->rebuildNode($sort, $child, $rgt);
 		}
 
-		$this->db->execute("UPDATE {$this->table_name} SET lft = ?, rgt = ? WHERE id = ?", array($lft, $rgt, $id));
+		$this->db->execute("update {$this->table_name} SET lft = ?, rgt = ? WHERE id = ?", array($lft, $rgt, $id));
 
 	    return $rgt + 1;
 

Spacing +1 added lines, -1 removed lines

@@ -349,7 +349,7 @@
 			$offset = (int) $offset['depth'];
 
 			foreach( $data as $id => $item ) {
-				$tree[$id] = str_repeat('|-- ', (int) $item['depth'] - $offset). $item['name'];
+				$tree[$id] = str_repeat('|-- ', (int) $item['depth'] - $offset).$item['name'];
 			}
 
 		}

src/GenericConnectionManager.php

Spacing +3 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
 		];
 
 		if( !isset($factories[$dsn->type]) )
-			throw new ConfigurationException('Invalid database type: '. $dsn->type);
+			throw new ConfigurationException('Invalid database type: '.$dsn->type);
 
 		$factory = $factories[$dsn->type];
 
@@ -113,7 +113,7 @@ 
 		elseif( is_array($dsn) )
 			return new DSN($dsn);
 		else
-			throw new ConfigurationException('Invalid DSN: '. $dsn);
+			throw new ConfigurationException('Invalid DSN: '.$dsn);
 	}
 
 	/**
@@ -152,7 +152,7 @@ 
 		if( !$name )
 			throw new DatabaseException('Managed database connections must have a name');
 		if( $this->has($name) )
-			throw new DatabaseException('Connection already exists with name: '. $name);
+			throw new DatabaseException('Connection already exists with name: '.$name);
 	}
 
 }

src/query/Insert.php

Spacing +2 added lines, -2 removed lines

@@ -85,8 +85,8 @@
 	protected function compile() {
 
 		$sql = [
-			($this->ignore ? 'INSERT IGNORE' : 'INSERT'). ' '. $this->into,
-			'('. implode(', ', $this->columns). ')',
+			($this->ignore ? 'INSERT IGNORE' : 'INSERT').' '.$this->into,
+			'('.implode(', ', $this->columns).')',
 			'VALUES',
 		];
 

src/query/Select.php

Spacing +3 added lines, -3 removed lines

@@ -116,8 +116,8 @@ 
 
 		return array_merge(
 			[
-				($this->distinct ? 'SELECT DISTINCT' : 'SELECT'). ' '. $cols,
-				'FROM '. $this->from,
+				($this->distinct ? 'SELECT DISTINCT' : 'SELECT').' '.$cols,
+				'FROM '.$this->from,
 			],
 			$this->compileJoins(),
 			$this->compileWhere(),
@@ -158,7 +158,7 @@ 
 		$sql = [];
 
 		if( $this->group )
-			$sql[] = 'GROUP BY '. implode(', ', $this->group);
+			$sql[] = 'GROUP BY '.implode(', ', $this->group);
 
 		return $sql;