Level-2 / Maphper

maphper/lib/entity.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 	public function wrap($relations, $object, $siblings = []) {
 		//see if any relations need overwriting
 		foreach ($relations as $name => $relation) {
-			if (isset($object->$name) && !($object->$name instanceof \Maphper\Relation) ) {
+			if (isset($object->$name) && !($object->$name instanceof \Maphper\Relation)) {
 				//After overwriting the relation, does the parent object ($object) need overwriting as well?
 				if ($relation->overwrite($object, $object->$name)) $this->parent[] = $object;
 			}

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 		foreach ($relations as $name => $relation) {
 			if (isset($object->$name) && !($object->$name instanceof \Maphper\Relation) ) {
 				//After overwriting the relation, does the parent object ($object) need overwriting as well?
-				if ($relation->overwrite($object, $object->$name)) $this->parent[] = $object;
+				if ($relation->overwrite($object, $object->$name)) {
+					$this->parent[] = $object;
+				}
 			}
 
 			$object->$name = $relation->getData($object, $siblings);

maphper/lib/visibilityoverride.php

Spacing +5 added lines, -5 removed lines

@@ -7,20 +7,20 @@ 
 
 	public function __construct($object) {
 		if ($object instanceof \stdclass) {
-			$this->readClosure = function() use ($object) { return $object;	};
-			$this->writeClosure = function ($field, $value) use ($object) { $object->$field = $value; };
+			$this->readClosure = function() use ($object) { return $object; };
+			$this->writeClosure = function($field, $value) use ($object) { $object->$field = $value; };
 		}
 		else {
 			$this->readClosure = function() {
 				$data = new \stdClass;
-				foreach ($this as $k => $v)	{
+				foreach ($this as $k => $v) {
 					if (is_scalar($v) || is_null($v) || (is_object($v) && $v instanceof \DateTime))	$data->$k = $v;
 				}
 				return $data;
 			};
 			$this->readClosure = $this->readClosure->bindTo($object, $object);
 
-			$this->writeClosure = function ($field, $value) { $this->$field = $value; };
+			$this->writeClosure = function($field, $value) { $this->$field = $value; };
 			$this->writeClosure = $this->writeClosure->bindTo($object, $object);
 		}
 			
@@ -33,7 +33,7 @@ 
 	public function write($data) {
 		if ($data != null) {
 			foreach ($data as $key => $value) {
-				($this->writeClosure)($key,  $this->processDates($value));
+				($this->writeClosure)($key, $this->processDates($value));
 			}
 		}
 	}

Braces +4 added lines, -3 removed lines

@@ -9,12 +9,13 @@
 		if ($object instanceof \stdclass) {
 			$this->readClosure = function() use ($object) { return $object;	};
 			$this->writeClosure = function ($field, $value) use ($object) { $object->$field = $value; };
-		}
-		else {
+		} else {
 			$this->readClosure = function() {
 				$data = new \stdClass;
 				foreach ($this as $k => $v)	{
-					if (is_scalar($v) || is_null($v) || (is_object($v) && $v instanceof \DateTime))	$data->$k = $v;
+					if (is_scalar($v) || is_null($v) || (is_object($v) && $v instanceof \DateTime)) {
+						$data->$k = $v;
+					}
 				}
 				return $data;
 			};

maphper/Optimiser/MySql.php

Spacing +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
 		return;
 
 		$runAgain = false;
-		$columns = $this->pdo->query('SELECT * FROM '. $this->quote($table) . ' PROCEDURE ANALYSE(1,1)')->fetchAll(\PDO::FETCH_OBJ);
+		$columns = $this->pdo->query('SELECT * FROM ' . $this->quote($table) . ' PROCEDURE ANALYSE(1,1)')->fetchAll(\PDO::FETCH_OBJ);
 		foreach ($columns as $column) {
 			$parts = explode('.', $column->Field_name);
 			$name = $this->quote(end($parts));
@@ -130,7 +130,7 @@ 
 					}
 				}
 
-				$this->pdo->query('ALTER TABLE ' . $this->quote($table) . ' MODIFY '. $name . ' ' . $type);
+				$this->pdo->query('ALTER TABLE ' . $this->quote($table) . ' MODIFY ' . $name . ' ' . $type);
 			}
 		}
 		//Sometimes a second pass is needed, if a column has gone from varchar -> int(11) a better int type may be needed

Braces +13 added lines, -7 removed lines

@@ -11,16 +11,21 @@ 
 		foreach ($columns as $column) {
 			$parts = explode('.', $column->Field_name);
 			$name = $this->quote(end($parts));
-			if ($column->Min_value === null && $column->Max_value === null) $this->pdo->query('ALTER TABLE ' . $this->quote($table) . ' DROP COLUMN ' . $name);
-			else {
+			if ($column->Min_value === null && $column->Max_value === null) {
+				$this->pdo->query('ALTER TABLE ' . $this->quote($table) . ' DROP COLUMN ' . $name);
+			} else {
 				$type = $column->Optimal_fieldtype;
 				if ($column->Max_length < 11) {
 					//Check for dates
 					$count = $this->pdo->query('SELECT count(*) as `count` FROM ' . $this->quote($table) . ' WHERE STR_TO_DATE(' . $name . ',\'%Y-%m-%d %H:%i:s\') IS NULL OR STR_TO_DATE(' . $name . ',\'%Y-%m-%d %H:%i:s\') != ' . $name . ' LIMIT 1')->fetch(\PDO::FETCH_OBJ)->count;
-					if ($count == 0) $type = 'DATETIME';
+					if ($count == 0) {
+						$type = 'DATETIME';
+					}
 
 					$count = $this->pdo->query('SELECT count(*) as `count` FROM ' . $this->quote($table) . ' WHERE STR_TO_DATE(' . $name . ',\'%Y-%m-%d\') IS NULL OR STR_TO_DATE(' . $name . ',\'%Y-%m-%d\') != ' . $name . ' LIMIT 1')->fetch(\PDO::FETCH_OBJ)->count;
-					if ($count == 0) $type = 'DATE';
+					if ($count == 0) {
+						$type = 'DATE';
+					}
 				}
 
 				//If it's text, work out if it would be better to be something else
@@ -30,8 +35,7 @@ 
 					if ($count == 0) {
 						$type = 'INT(11)';
 						$runAgain = true;
-					}
-					else {
+					} else {
 						//See if it's decimal
 						$count = $this->pdo->query('SELECT count(*) FROM ' . $table . ' WHERE concat(\'\', ' . $name . ' * 1) != ' . $name . ')')->fetch(\PDO::FETCH_OBJ)->count;
 						if ($count == 0) {
@@ -45,6 +49,8 @@ 
 			}
 		}
 		//Sometimes a second pass is needed, if a column has gone from varchar -> int(11) a better int type may be needed
-		if ($runAgain) $this->optimiseColumns($table);
+		if ($runAgain) {
+			$this->optimiseColumns($table);
+		}
 	}
 }
\ No newline at end of file

maphper/datasource/databaseoptions.php

Braces +6 added lines, -2 removed lines

@@ -10,7 +10,9 @@ 
 	}
 
 	public function getAdapter() {
-		if (!($this->db instanceof \PDO)) return $this->db;
+		if (!($this->db instanceof \PDO)) {
+			return $this->db;
+		}
 
 		$adapter = '\\Maphper\\DataSource\\' . ucfirst($this->db->getAttribute(\PDO::ATTR_DRIVER_NAME)) . 'Adapter';
 
@@ -18,7 +20,9 @@ 
 	}
 
 	public function getEditMode() {
-		if (!isset($this->options['editmode'])) return false;
+		if (!isset($this->options['editmode'])) {
+			return false;
+		}
 
 		return $this->options['editmode'] === true ? Database::EDIT_STRUCTURE | Database::EDIT_INDEX | Database::EDIT_OPTIMISE : $this->options['editmode'];
 	}

maphper/datasource/mysqladapter.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	public function query(\Maphper\Lib\Query $query) {
 		$stmt = $this->getCachedStmt($query->getSql());
 		$args = $query->getArgs();
-        $stmt->execute($args);
+		$stmt->execute($args);
 
 		if (strpos(trim($query->getSql()), 'SELECT') === 0) return $stmt->fetchAll(\PDO::FETCH_OBJ);
 		else return $stmt;

Braces +38 added lines, -17 removed lines

@@ -16,10 +16,13 @@ 
 
 	private function getCachedStmt($sql) {
 		$queryId = md5($sql);
-		if (isset($this->queryCache[$queryId])) $stmt = $this->queryCache[$queryId];
-		else {
+		if (isset($this->queryCache[$queryId])) {
+			$stmt = $this->queryCache[$queryId];
+		} else {
 			$stmt = $this->pdo->prepare($sql, [\PDO::ATTR_CURSOR => \PDO::CURSOR_FWDONLY]);
-			if ($stmt) $this->queryCache[$queryId] = $stmt;
+			if ($stmt) {
+				$this->queryCache[$queryId] = $stmt;
+			}
 		}
 		return $stmt;
 	}
@@ -29,15 +32,23 @@ 
 		$args = $query->getArgs();
         $stmt->execute($args);
 
-		if (strpos(trim($query->getSql()), 'SELECT') === 0) return $stmt->fetchAll(\PDO::FETCH_OBJ);
-		else return $stmt;
+		if (strpos(trim($query->getSql()), 'SELECT') === 0) {
+			return $stmt->fetchAll(\PDO::FETCH_OBJ);
+		} else {
+			return $stmt;
+		}
 	}
 
 	private function getType($val) {
-		if ($val instanceof \DateTime) return 'DATETIME';
-		else if (is_int($val)) return  'INT(11)';
-		else if (is_double($val)) return 'DECIMAL(9,' . strlen($val) - strrpos($val, '.') - 1 . ')';
-		else if (is_string($val)) return strlen($val) < 192 ? 'VARCHAR(191)' : 'LONGBLOB';
+		if ($val instanceof \DateTime) {
+			return 'DATETIME';
+		} else if (is_int($val)) {
+			return  'INT(11)';
+		} else if (is_double($val)) {
+			return 'DECIMAL(9,' . strlen($val) - strrpos($val, '.') - 1 . ')';
+		} else if (is_string($val)) {
+			return strlen($val) < 192 ? 'VARCHAR(191)' : 'LONGBLOB';
+		}
 		return 'VARCHAR(191)';
 	}
 
@@ -46,8 +57,11 @@ 
 		$parts = [];
 		foreach ($primaryKey as $key) {
 			$pk = $data->$key;
-			if ($pk == null) $parts[] = $key . ' INT(11) NOT NULL AUTO_INCREMENT';
-			else $parts[] = $key . ' ' . $this->getType($pk) . ' NOT NULL';
+			if ($pk == null) {
+				$parts[] = $key . ' INT(11) NOT NULL AUTO_INCREMENT';
+			} else {
+				$parts[] = $key . ' ' . $this->getType($pk) . ' NOT NULL';
+			}
 		}
 
 		$pkField = implode(', ', $parts) . ', PRIMARY KEY(' . implode(', ', $primaryKey) . ')';
@@ -58,15 +72,20 @@ 
 		$this->createTable($table, $primaryKey, $data);
 
 		foreach ($data as $key => $value) {
-			if (is_array($value) || (is_object($value) && !($value instanceof \DateTime))) continue;
-			if (in_array($key, $primaryKey)) continue;
+			if (is_array($value) || (is_object($value) && !($value instanceof \DateTime))) {
+				continue;
+			}
+			if (in_array($key, $primaryKey)) {
+				continue;
+			}
 
 			$type = $this->getType($value);
 
 			try {
-				if (!$this->pdo->query('ALTER TABLE ' . $table . ' ADD ' . $this->quote($key) . ' ' . $type)) throw new \Exception('Could not alter table');
-			}
-			catch (\Exception $e) {
+				if (!$this->pdo->query('ALTER TABLE ' . $table . ' ADD ' . $this->quote($key) . ' ' . $type)) {
+					throw new \Exception('Could not alter table');
+				}
+			} catch (\Exception $e) {
 				$this->pdo->query('ALTER TABLE ' . $table . ' MODIFY ' . $this->quote($key) . ' ' . $type);
 			}
 		}
@@ -84,7 +103,9 @@ 
 		$keyName = $this->quote(implode('_', $fields));
 
 		$results = $this->pdo->query('SHOW INDEX FROM ' . $this->quote($table) . ' WHERE Key_Name = "' . $keyName . '"');
-		if ($results && count($results->fetchAll()) == 0)  $this->pdo->query('CREATE INDEX ' . $keyName . ' ON ' . $this->quote($table) . ' (' . implode(', ', $fields) . ')');
+		if ($results && count($results->fetchAll()) == 0) {
+			$this->pdo->query('CREATE INDEX ' . $keyName . ' ON ' . $this->quote($table) . ' (' . implode(', ', $fields) . ')');
+		}
 	}
 
 	public function optimiseColumns($table) {

maphper/datasource/sqliteadapter.php

Indentation +9 added lines, -9 removed lines

@@ -13,7 +13,7 @@ 
 		return '`' . str_replace('.', '`.`', trim($str, '`')) . '`';
 	}
 
-    private function getCachedStmt($sql) {
+	private function getCachedStmt($sql) {
 		$queryId = md5($sql);
 		if (isset($this->queryCache[$queryId])) $stmt = $this->queryCache[$queryId];
 		else {
@@ -25,20 +25,20 @@ 
 
 	public function query(\Maphper\Lib\Query $query) {
 		$queryId = md5($query->getSql());
-        $stmt = $this->getCachedStmt($query->getSql());
+		$stmt = $this->getCachedStmt($query->getSql());
 		$args = $query->getArgs();
 
-        //Handle SQLite when PDO_ERRMODE is set to SILENT
-        if ($stmt === false) throw new \Exception('Invalid query');
+		//Handle SQLite when PDO_ERRMODE is set to SILENT
+		if ($stmt === false) throw new \Exception('Invalid query');
 
-        $stmt->execute($args);
-        if ($stmt->errorCode() !== '00000' && $stmt->errorInfo()[2] == 'database schema has changed') {
+		$stmt->execute($args);
+		if ($stmt->errorCode() !== '00000' && $stmt->errorInfo()[2] == 'database schema has changed') {
 			unset($this->queryCache[$queryId]);
 			return $this->query($query);
-        }
+		}
 
-        if (substr($query->getSql(), 0, 6) === 'SELECT') return $stmt->fetchAll(\PDO::FETCH_OBJ);
-        else return $stmt;
+		if (substr($query->getSql(), 0, 6) === 'SELECT') return $stmt->fetchAll(\PDO::FETCH_OBJ);
+		else return $stmt;
 	}
 	
 	public function lastInsertId() {

Spacing +6 added lines, -6 removed lines

@@ -55,7 +55,7 @@ 
 	}
 
 	private function tableExists($name) {
-		$result = $this->pdo->query('SELECT name FROM sqlite_master WHERE type="table" and name="'. $name.'"');
+		$result = $this->pdo->query('SELECT name FROM sqlite_master WHERE type="table" and name="' . $name . '"');
 		return count($result->fetchAll()) == 1;
 	}
 
@@ -74,7 +74,7 @@ 
 		// SQLSTATE[HY000]: General error: 17 database schema has changed
 		$this->queryCache = [];
 
-		$affix = '_'.substr(md5($table), 0, 6);
+		$affix = '_' . substr(md5($table), 0, 6);
 		$this->createTable($table . $affix, $primaryKey, $data);
 		$fields = [];
 		foreach ($data as $key => $value) { $fields[] = $key; }
@@ -83,7 +83,7 @@ 
 				$columns = implode(', ', $this->getColumns($table));			
 
 				$this->pdo->query('INSERT INTO ' . $this->quote($table . $affix) . '(' . $columns . ') SELECT ' . $columns . ' FROM ' . $this->quote($table));
-				$this->pdo->query('DROP TABLE IF EXISTS ' . $table );
+				$this->pdo->query('DROP TABLE IF EXISTS ' . $table);
 			}
 		}
 		catch (\PDOException $e) {
@@ -91,8 +91,8 @@ 
 			echo $e->getMessage();
 		}
 
-		$this->pdo->query('DROP TABLE IF EXISTS ' . $table );
-		$this->pdo->query('ALTER TABLE ' . $table . $affix. ' RENAME TO '. $table );
+		$this->pdo->query('DROP TABLE IF EXISTS ' . $table);
+		$this->pdo->query('ALTER TABLE ' . $table . $affix . ' RENAME TO ' . $table);
 
 	}
 
@@ -106,7 +106,7 @@ 
 		
 		$pkField = implode(', ', $parts) . ', PRIMARY KEY(' . implode(', ', $primaryKey) . ')';
 				
-		$this->pdo->query('DROP TABLE IF EXISTS ' . $table );
+		$this->pdo->query('DROP TABLE IF EXISTS ' . $table);
 		$this->pdo->query('CREATE TABLE ' . $table . ' (' . $pkField . ')');
 					
 		foreach ($data as $key => $value) {

Braces +46 added lines, -22 removed lines

@@ -15,10 +15,13 @@ 
 
     private function getCachedStmt($sql) {
 		$queryId = md5($sql);
-		if (isset($this->queryCache[$queryId])) $stmt = $this->queryCache[$queryId];
-		else {
+		if (isset($this->queryCache[$queryId])) {
+			$stmt = $this->queryCache[$queryId];
+		} else {
 			$stmt = $this->pdo->prepare($sql, [\PDO::ATTR_CURSOR => \PDO::CURSOR_FWDONLY]);
-			if ($stmt) $this->queryCache[$queryId] = $stmt;
+			if ($stmt) {
+				$this->queryCache[$queryId] = $stmt;
+			}
 		}
 		return $stmt;
 	}
@@ -29,7 +32,9 @@ 
 		$args = $query->getArgs();
 
         //Handle SQLite when PDO_ERRMODE is set to SILENT
-        if ($stmt === false) throw new \Exception('Invalid query');
+        if ($stmt === false) {
+        	throw new \Exception('Invalid query');
+        }
 
         $stmt->execute($args);
         if ($stmt->errorCode() !== '00000' && $stmt->errorInfo()[2] == 'database schema has changed') {
@@ -37,8 +42,11 @@ 
 			return $this->query($query);
         }
 
-        if (substr($query->getSql(), 0, 6) === 'SELECT') return $stmt->fetchAll(\PDO::FETCH_OBJ);
-        else return $stmt;
+        if (substr($query->getSql(), 0, 6) === 'SELECT') {
+        	return $stmt->fetchAll(\PDO::FETCH_OBJ);
+        } else {
+        	return $stmt;
+        }
 	}
 	
 	public function lastInsertId() {
@@ -46,12 +54,19 @@ 
 	}
 	
 	private function getType($val) {
-		if ($val instanceof \DateTime) return 'DATETIME';
-		else if (is_int($val)) return  'INTEGER';
-		else if (is_double($val)) return 'DECIMAL(9,' . strlen($val) - strrpos($val, '.') - 1 . ')';
-		else if (is_string($val) && strlen($val) < 256) return 'VARCHAR(255)';
-		else if (is_string($val) && strlen($val) > 256) return 'LONGBLOG';
-		else return 'VARCHAR(255)';		
+		if ($val instanceof \DateTime) {
+			return 'DATETIME';
+		} else if (is_int($val)) {
+			return  'INTEGER';
+		} else if (is_double($val)) {
+			return 'DECIMAL(9,' . strlen($val) - strrpos($val, '.') - 1 . ')';
+		} else if (is_string($val) && strlen($val) < 256) {
+			return 'VARCHAR(255)';
+		} else if (is_string($val) && strlen($val) > 256) {
+			return 'LONGBLOG';
+		} else {
+			return 'VARCHAR(255)';
+		}
 	}
 
 	private function tableExists($name) {
@@ -85,8 +100,7 @@ 
 				$this->pdo->query('INSERT INTO ' . $this->quote($table . $affix) . '(' . $columns . ') SELECT ' . $columns . ' FROM ' . $this->quote($table));
 				$this->pdo->query('DROP TABLE IF EXISTS ' . $table );
 			}
-		}
-		catch (\PDOException $e) {
+		} catch (\PDOException $e) {
 			// No data to copy
 			echo $e->getMessage();
 		}
@@ -100,8 +114,11 @@ 
 		$parts = [];
 		foreach ($primaryKey as $key) {
 			$pk = $data->$key;
-			if ($pk == null) $parts[] = $key . ' INTEGER'; 
-			else $parts[] = $key . ' ' . $this->getType($pk) . ' NOT NULL';					
+			if ($pk == null) {
+				$parts[] = $key . ' INTEGER';
+			} else {
+				$parts[] = $key . ' ' . $this->getType($pk) . ' NOT NULL';
+			}
 		}
 		
 		$pkField = implode(', ', $parts) . ', PRIMARY KEY(' . implode(', ', $primaryKey) . ')';
@@ -110,8 +127,12 @@ 
 		$this->pdo->query('CREATE TABLE ' . $table . ' (' . $pkField . ')');
 					
 		foreach ($data as $key => $value) {
-			if (is_array($value) || (is_object($value) && !($value instanceof \DateTime))) continue;
-			if (in_array($key, $primaryKey)) continue;
+			if (is_array($value) || (is_object($value) && !($value instanceof \DateTime))) {
+				continue;
+			}
+			if (in_array($key, $primaryKey)) {
+				continue;
+			}
 
 			$type = $this->getType($value);
 		
@@ -121,10 +142,14 @@ 
 	
 
 	public function addIndex($table, array $fields) {
-		if (empty($fields)) return false;
+		if (empty($fields)) {
+			return false;
+		}
 		
 		//SQLite doesn't support ASC/DESC indexes, remove the keywords
-		foreach ($fields as &$field) $field = str_ireplace([' desc', ' asc'], '', $field);
+		foreach ($fields as &$field) {
+			$field = str_ireplace([' desc', ' asc'], '', $field);
+		}
 		sort($fields);
 		$fields = array_map('strtolower', $fields);
 		$fields = array_map('trim', $fields);
@@ -133,8 +158,7 @@ 
 		
 		try {
 			$this->pdo->query('CREATE INDEX IF NOT EXISTS  ' . $keyName . ' ON ' . $table . ' (' . implode(', ', $fields) . ')');
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			
 		}
 	}

maphper/lib/selectbuilder.php

Indentation +14 added lines, -14 removed lines

@@ -30,10 +30,10 @@ 
 		$sql = [];
 
 		foreach ($fields as $key => $value) {
-            if ($value instanceof \DateTime) {
-    			if ($value->format('H:i:s')  == '00:00:00') $value = $value->format('Y-m-d');
-    			else $value = $value->format('Y-m-d H:i:s');
-    		}
+			if ($value instanceof \DateTime) {
+				if ($value->format('H:i:s')  == '00:00:00') $value = $value->format('Y-m-d');
+				else $value = $value->format('Y-m-d H:i:s');
+			}
 
 			if (is_numeric($key) && is_array($value)) {
 				$result = $this->createSql($value, $key);
@@ -85,17 +85,17 @@ 
 		return ['args' => $args, 'sql' => [$query]];
 	}
 
-    private function getOperator($mode) {
-        $operator = "";
+	private function getOperator($mode) {
+		$operator = "";
 
-        if (\Maphper\Maphper::FIND_NOCASE & $mode) $operator = 'LIKE';
-        else if (\Maphper\Maphper::FIND_BIT & $mode) $operator = '&';
-        else if (\Maphper\Maphper::FIND_GREATER & $mode) $operator = '>';
-        else if (\Maphper\Maphper::FIND_LESS & $mode) $operator = '<';
-        else if (\Maphper\Maphper::FIND_NOT & $mode) $operator = '!=';
+		if (\Maphper\Maphper::FIND_NOCASE & $mode) $operator = 'LIKE';
+		else if (\Maphper\Maphper::FIND_BIT & $mode) $operator = '&';
+		else if (\Maphper\Maphper::FIND_GREATER & $mode) $operator = '>';
+		else if (\Maphper\Maphper::FIND_LESS & $mode) $operator = '<';
+		else if (\Maphper\Maphper::FIND_NOT & $mode) $operator = '!=';
 
-        if (\Maphper\Maphper::FIND_EXACT & $mode) $operator .= '=';
+		if (\Maphper\Maphper::FIND_EXACT & $mode) $operator .= '=';
 
-        return $operator;
-    }
+		return $operator;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -25,13 +25,13 @@ 
 
 
 	//Needs to be broken up into better methods
-	public function createSql($fields, $mode){
+	public function createSql($fields, $mode) {
 		$args = [];
 		$sql = [];
 
 		foreach ($fields as $key => $value) {
             if ($value instanceof \DateTime) {
-    			if ($value->format('H:i:s')  == '00:00:00') $value = $value->format('Y-m-d');
+    			if ($value->format('H:i:s') == '00:00:00') $value = $value->format('Y-m-d');
     			else $value = $value->format('Y-m-d H:i:s');
     		}
 
@@ -55,7 +55,7 @@ 
 					$inSql[] = ':' . $key . $i;
 				}
 				if (count($inSql) == 0) return [];
-				else $sql[] = $key . ' IN ( ' .  implode(', ', $inSql) . ')';
+				else $sql[] = $key . ' IN ( ' . implode(', ', $inSql) . ')';
 			}
 			else if ($value === NULL) {
 				$nullSql = $key . ' IS ';

Braces +59 added lines, -32 removed lines

@@ -9,17 +9,23 @@ 
 
 		if (isset($options['offset'])) {
 			$offset = ' OFFSET ' . $options['offset'];
-			if (!$limit) $limit = ' LIMIT  1000';
+			if (!$limit) {
+				$limit = ' LIMIT  1000';
+			}
+		} else {
+			$offset = '';
 		}
-		else $offset = '';
 
 		$order = isset($options['order']) ? ' ORDER BY ' . $options['order'] : '';
 		return new Query('SELECT * FROM ' . $table . ' ' . $where . $order . $limit . $offset, $args);
 	}
 
 	public function aggregate($table, $function, $field, $where, $args, $group) {
-		if ($group == true) $groupBy = ' GROUP BY ' . $field;
-		else $groupBy = '';
+		if ($group == true) {
+			$groupBy = ' GROUP BY ' . $field;
+		} else {
+			$groupBy = '';
+		}
 		return new Query('SELECT ' . $function . '(' . $field . ') as val, ' . $field . '   FROM ' . $table . ($where[0] != null ? ' WHERE ' : '') . implode(' AND ', $where) . ' ' . $groupBy, $args);
 	}
 
@@ -31,70 +37,91 @@ 
 
 		foreach ($fields as $key => $value) {
             if ($value instanceof \DateTime) {
-    			if ($value->format('H:i:s')  == '00:00:00') $value = $value->format('Y-m-d');
-    			else $value = $value->format('Y-m-d H:i:s');
+    			if ($value->format('H:i:s')  == '00:00:00') {
+    				$value = $value->format('Y-m-d');
+    			} else {
+    				$value = $value->format('Y-m-d H:i:s');
+    			}
     		}
 
 			if (is_numeric($key) && is_array($value)) {
 				$result = $this->createSql($value, $key);
-				foreach ($result['args'] as $arg_key => $arg) $args[$arg_key] = $arg;
-				foreach ($result['sql'] as $arg) $sql[] = $arg;
-			}
-			else if (\Maphper\Maphper::FIND_BETWEEN & $mode) {
+				foreach ($result['args'] as $arg_key => $arg) {
+					$args[$arg_key] = $arg;
+				}
+				foreach ($result['sql'] as $arg) {
+					$sql[] = $arg;
+				}
+			} else if (\Maphper\Maphper::FIND_BETWEEN & $mode) {
 				$sql[] = $key . '>= :' . $key . 'from';
 				$sql[] = $key . ' <= :' . $key . 'to';
 
 				$args[$key . 'from'] = $value[0];
 				$args[$key . 'to'] = $value[1];
-			}
-			else if (!is_numeric($key) && is_array($value)) {
+			} else if (!is_numeric($key) && is_array($value)) {
 				$inSql = [];
 				$count = count($value);
 				for ($i = 0; $i < $count; $i++) {
 					$args[$key . $i] = $value[$i];
 					$inSql[] = ':' . $key . $i;
 				}
-				if (count($inSql) == 0) return [];
-				else $sql[] = $key . ' IN ( ' .  implode(', ', $inSql) . ')';
-			}
-			else if ($value === NULL) {
+				if (count($inSql) == 0) {
+					return [];
+				} else {
+					$sql[] = $key . ' IN ( ' .  implode(', ', $inSql) . ')';
+				}
+			} else if ($value === NULL) {
 				$nullSql = $key . ' IS ';
-				if (\Maphper\Maphper::FIND_NOT & $mode) $nullSql .= 'NOT ';
+				if (\Maphper\Maphper::FIND_NOT & $mode) {
+					$nullSql .= 'NOT ';
+				}
 				$sql[] = $nullSql . 'NULL';
-			}
-			else {
+			} else {
 
 				if (\Maphper\Maphper::FIND_LIKE & $mode) {
 					$operator = 'LIKE';
 					$value = '%' . $value . '%';
-				}
-				else if (\Maphper\Maphper::FIND_STARTS & $mode) {
+				} else if (\Maphper\Maphper::FIND_STARTS & $mode) {
 					$operator = 'LIKE';
 					$value = $value . '%';
+				} else {
+					$operator = $this->getOperator($mode);
 				}
-				else $operator = $this->getOperator($mode);
 
 				$args[$key] = $value;
 				$sql[] = $key . ' ' . $operator . ' :' . $key;
 			}
 		}
 
-		if (\Maphper\Maphper::FIND_OR & $mode) $query = implode(' OR  ', $sql);
-		else $query = implode(' AND ', $sql);
-		if (!empty($query)) $query = '(' . $query . ')';
+		if (\Maphper\Maphper::FIND_OR & $mode) {
+			$query = implode(' OR  ', $sql);
+		} else {
+			$query = implode(' AND ', $sql);
+		}
+		if (!empty($query)) {
+			$query = '(' . $query . ')';
+		}
 		return ['args' => $args, 'sql' => [$query]];
 	}
 
     private function getOperator($mode) {
         $operator = "";
 
-        if (\Maphper\Maphper::FIND_NOCASE & $mode) $operator = 'LIKE';
-        else if (\Maphper\Maphper::FIND_BIT & $mode) $operator = '&';
-        else if (\Maphper\Maphper::FIND_GREATER & $mode) $operator = '>';
-        else if (\Maphper\Maphper::FIND_LESS & $mode) $operator = '<';
-        else if (\Maphper\Maphper::FIND_NOT & $mode) $operator = '!=';
-
-        if (\Maphper\Maphper::FIND_EXACT & $mode) $operator .= '=';
+        if (\Maphper\Maphper::FIND_NOCASE & $mode) {
+        	$operator = 'LIKE';
+        } else if (\Maphper\Maphper::FIND_BIT & $mode) {
+        	$operator = '&';
+        } else if (\Maphper\Maphper::FIND_GREATER & $mode) {
+        	$operator = '>';
+        } else if (\Maphper\Maphper::FIND_LESS & $mode) {
+        	$operator = '<';
+        } else if (\Maphper\Maphper::FIND_NOT & $mode) {
+        	$operator = '!=';
+        }
+
+        if (\Maphper\Maphper::FIND_EXACT & $mode) {
+        	$operator .= '=';
+        }
 
         return $operator;
     }

maphper/datasource/database.php

Indentation +48 added lines, -48 removed lines

@@ -6,7 +6,7 @@ 
 	const EDIT_OPTIMISE = 4;
 
 	private $table;
-    private $options;
+	private $options;
 	private $cache = [];
 	private $primaryKey;
 	private $fields = '*';
@@ -15,7 +15,7 @@ 
 	private $alterDb = false;
 	private $adapter;
 	private $crudBuilder;
-    private $selectBuilder;
+	private $selectBuilder;
 
 	public function __construct($db, $table, $primaryKey = 'id', array $options = []) {
 		$this->options = new DatabaseOptions($db, $options);
@@ -36,9 +36,9 @@ 
 		$this->optimizeColumns();
 	}
 
-    private function optimizeColumns() {
-        if (self::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) $this->adapter->optimiseColumns($this->table);
-    }
+	private function optimizeColumns() {
+		if (self::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) $this->adapter->optimiseColumns($this->table);
+	}
 
 	public function getPrimaryKey() {
 		return $this->primaryKey;
@@ -80,15 +80,15 @@ 
 		}
 	}
 
-    private function determineAggregateResult($result, $group) {
-        if (isset($result[0]) && $group == null) return $result[0]->val;
-        else if ($group != null) {
-            $ret = [];
-            foreach ($result as $res) $ret[$res->$field] = $res->val;
-            return $ret;
-        }
-        else return 0;
-    }
+	private function determineAggregateResult($result, $group) {
+		if (isset($result[0]) && $group == null) return $result[0]->val;
+		else if ($group != null) {
+			$ret = [];
+			foreach ($result as $res) $ret[$res->$field] = $res->val;
+			return $ret;
+		}
+		else return 0;
+	}
 
 	private function addIndex($args) {
 		if (self::EDIT_INDEX & $this->alterDb) $this->adapter->addIndex($this->table, $args);
@@ -122,7 +122,7 @@ 
 		else $limit = '';
 
 		$query = $this->selectBuilder->createSql($fields, $mode);
-        $query['sql'] = array_filter($query['sql']);
+		$query['sql'] = array_filter($query['sql']);
 		$this->adapter->query($this->crudBuilder->delete($this->table, $query['sql'], $query['args'], $limit));
 		$this->addIndex(array_keys($query['args']));
 
@@ -131,22 +131,22 @@ 
 		$this->resultCache = [];
 	}
 
-    private function getIfNew($data) {
-        $new = false;
-        foreach ($this->primaryKey as $k) {
-            if (empty($data->$k)) {
-                $data->$k = null;
-                $new = true;
-            }
-        }
-        return $new;
-    }
+	private function getIfNew($data) {
+		$new = false;
+		foreach ($this->primaryKey as $k) {
+			if (empty($data->$k)) {
+				$data->$k = null;
+				$new = true;
+			}
+		}
+		return $new;
+	}
 
 	public function save($data, $tryagain = true) {
-        $new = $this->getIfNew($data);
+		$new = $this->getIfNew($data);
 
 		try {
-            $result = $this->insert($this->table, $this->primaryKey, $data);
+			$result = $this->insert($this->table, $this->primaryKey, $data);
 
 			//If there was an error but PDO is silent, trigger the catch block anyway
 			if ($result->errorCode() !== '00000') throw new \Exception('Could not insert into ' . $this->table);
@@ -164,26 +164,26 @@ 
 		$this->updateCache($data);
 	}
 
-    private function getTryAgain($tryagain) {
-        return $tryagain && self::EDIT_STRUCTURE & $this->alterDb;
-    }
+	private function getTryAgain($tryagain) {
+		return $tryagain && self::EDIT_STRUCTURE & $this->alterDb;
+	}
 
-    private function updatePK($data, $new) {
-        if ($new && count($this->primaryKey) == 1) $data->{$this->primaryKey[0]} = $this->adapter->lastInsertId();
-    }
+	private function updatePK($data, $new) {
+		if ($new && count($this->primaryKey) == 1) $data->{$this->primaryKey[0]} = $this->adapter->lastInsertId();
+	}
 
-    private function checkIfUpdateWorked($data) {
-        $updateWhere = $this->crudBuilder->update($this->table, $this->primaryKey, $data);
-        $matched = $this->findByField($updateWhere->getArgs());
+	private function checkIfUpdateWorked($data) {
+		$updateWhere = $this->crudBuilder->update($this->table, $this->primaryKey, $data);
+		$matched = $this->findByField($updateWhere->getArgs());
 
-        if (count($matched) == 0) throw new \InvalidArgumentException('Record inserted into table ' . $this->table . ' fails table constraints');
-    }
+		if (count($matched) == 0) throw new \InvalidArgumentException('Record inserted into table ' . $this->table . ' fails table constraints');
+	}
 
-    private function updateCache($data) {
-        $pkValue = $data->{$this->primaryKey[0]};
+	private function updateCache($data) {
+		$pkValue = $data->{$this->primaryKey[0]};
 		if (isset($this->cache[$pkValue])) $this->cache[$pkValue] = (object) array_merge((array)$this->cache[$pkValue], (array)$data);
 		else $this->cache[$pkValue] = $data;
-    }
+	}
 
 	private function insert($table, array $primaryKey, $data) {
 		$error = 0;
@@ -195,16 +195,16 @@ 
 		}
 
  		if ($error || $result->errorCode() !== '00000') {
-            $result = $this->tryUpdate($table, $primaryKey, $data);
-        }
+			$result = $this->tryUpdate($table, $primaryKey, $data);
+		}
 
 		return $result;
 	}
 
-    private function tryUpdate($table, array $primaryKey, $data) {
-        $result = $this->adapter->query($this->crudBuilder->update($table, $primaryKey, $data));
-        if ($result->rowCount() === 0) $this->checkIfUpdateWorked($data);
+	private function tryUpdate($table, array $primaryKey, $data) {
+		$result = $this->adapter->query($this->crudBuilder->update($table, $primaryKey, $data));
+		if ($result->rowCount() === 0) $this->checkIfUpdateWorked($data);
 
-        return $result;
-    }
+		return $result;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -27,9 +27,9 @@ 
 		$this->crudBuilder = new \Maphper\Lib\CrudBuilder();
 		$this->selectBuilder = new \Maphper\Lib\SelectBuilder();
 
-		$this->fields = implode(',', array_map([$this->adapter, 'quote'], (array) $this->options->read('fields')));
+		$this->fields = implode(',', array_map([$this->adapter, 'quote'], (array)$this->options->read('fields')));
 
-		$this->defaultSort = $this->options->read('defaultSort') !== false ? $this->options->read('defaultSort')  : implode(', ', $this->primaryKey);
+		$this->defaultSort = $this->options->read('defaultSort') !== false ? $this->options->read('defaultSort') : implode(', ', $this->primaryKey);
 
 		$this->alterDb = $this->options->getEditMode();
 
@@ -37,7 +37,7 @@ 
 	}
 
     private function optimizeColumns() {
-        if (self::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) $this->adapter->optimiseColumns($this->table);
+        if (self::EDIT_OPTIMISE & $this->alterDb && rand(0, 500) == 1) $this->adapter->optimiseColumns($this->table);
     }
 
 	public function getPrimaryKey() {
@@ -181,7 +181,7 @@ 
 
     private function updateCache($data) {
         $pkValue = $data->{$this->primaryKey[0]};
-		if (isset($this->cache[$pkValue])) $this->cache[$pkValue] = (object) array_merge((array)$this->cache[$pkValue], (array)$data);
+		if (isset($this->cache[$pkValue])) $this->cache[$pkValue] = (object)array_merge((array)$this->cache[$pkValue], (array)$data);
 		else $this->cache[$pkValue] = $data;
     }
 

Braces +58 added lines, -30 removed lines

@@ -37,7 +37,9 @@ 
 	}
 
     private function optimizeColumns() {
-        if (self::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) $this->adapter->optimiseColumns($this->table);
+        if (self::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) {
+        	$this->adapter->optimiseColumns($this->table);
+        }
     }
 
 	public function getPrimaryKey() {
@@ -53,19 +55,23 @@ 
 		if (!isset($this->cache[$id])) {
 			try {
 				$result = $this->adapter->query($this->selectBuilder->select($this->table, [$this->getPrimaryKey()[0] . ' = :id'], [':id' => $id], ['limit' => 1]));
-			}
-			catch (\Exception $e) {
+			} catch (\Exception $e) {
 			}
 
-			if (isset($result[0])) 	$this->cache[$id] = $result[0];
-			else return null;
+			if (isset($result[0])) {
+				$this->cache[$id] = $result[0];
+			} else {
+				return null;
+			}
 		}
 		return $this->cache[$id];
 	}
 
 	public function findAggregate($function, $field, $group = null, array $criteria = [], array $options = []) {
 		//Cannot count/sum/max multiple fields, pick the first one. This should only come into play when trying to count() a mapper with multiple primary keys
-		if (is_array($field)) $field = $field[0];
+		if (is_array($field)) {
+			$field = $field[0];
+		}
 		$query = $this->selectBuilder->createSql($criteria, \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND);
 
 		try {
@@ -74,24 +80,29 @@ 
 			$result = $this->adapter->query($this->selectBuilder->aggregate($this->table, $function, $field, $query['sql'], $query['args'], $group));
 
 			return $this->determineAggregateResult($result, $group);
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			return $group ? [] : 0;
 		}
 	}
 
     private function determineAggregateResult($result, $group) {
-        if (isset($result[0]) && $group == null) return $result[0]->val;
-        else if ($group != null) {
+        if (isset($result[0]) && $group == null) {
+        	return $result[0]->val;
+        } else if ($group != null) {
             $ret = [];
-            foreach ($result as $res) $ret[$res->$field] = $res->val;
+            foreach ($result as $res) {
+            	$ret[$res->$field] = $res->val;
+            }
             return $ret;
+        } else {
+        	return 0;
         }
-        else return 0;
     }
 
 	private function addIndex($args) {
-		if (self::EDIT_INDEX & $this->alterDb) $this->adapter->addIndex($this->table, $args);
+		if (self::EDIT_INDEX & $this->alterDb) {
+			$this->adapter->addIndex($this->table, $args);
+		}
 	}
 
 	public function findByField(array $fields, $options = []) {
@@ -99,7 +110,9 @@ 
 		if (!isset($this->resultCache[$cacheId])) {
 			$query = $this->selectBuilder->createSql($fields, \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND);
 
-			if (!isset($options['order'])) $options['order'] = $this->defaultSort;
+			if (!isset($options['order'])) {
+				$options['order'] = $this->defaultSort;
+			}
 
 			$query['sql'] = array_filter($query['sql']);
 
@@ -107,8 +120,7 @@ 
 				$this->resultCache[$cacheId] = $this->adapter->query($this->selectBuilder->select($this->table, $query['sql'], $query['args'], $options));
 				$this->addIndex(array_keys($query['args']));
 				$this->addIndex(explode(',', $options['order']));
-			}
-			catch (\Exception $e) {
+			} catch (\Exception $e) {
 				$this->errors[] = $e;
 				$this->resultCache[$cacheId] = [];
 			}
@@ -117,9 +129,14 @@ 
 	}
 
 	public function deleteByField(array $fields, array $options = [], $mode = null) {
-		if ($mode == null) $mode = \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND;
-		if (isset($options['limit']) != null) $limit = ' LIMIT ' . $options['limit'];
-		else $limit = '';
+		if ($mode == null) {
+			$mode = \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND;
+		}
+		if (isset($options['limit']) != null) {
+			$limit = ' LIMIT ' . $options['limit'];
+		} else {
+			$limit = '';
+		}
 
 		$query = $this->selectBuilder->createSql($fields, $mode);
         $query['sql'] = array_filter($query['sql']);
@@ -149,10 +166,13 @@ 
             $result = $this->insert($this->table, $this->primaryKey, $data);
 
 			//If there was an error but PDO is silent, trigger the catch block anyway
-			if ($result->errorCode() !== '00000') throw new \Exception('Could not insert into ' . $this->table);
-		}
-		catch (\Exception $e) {
-			if (!$this->getTryAgain($tryagain)) throw $e;
+			if ($result->errorCode() !== '00000') {
+				throw new \Exception('Could not insert into ' . $this->table);
+			}
+		} catch (\Exception $e) {
+			if (!$this->getTryAgain($tryagain)) {
+				throw $e;
+			}
 
 			$this->adapter->alterDatabase($this->table, $this->primaryKey, $data);
 			$this->save($data, false);
@@ -169,28 +189,34 @@ 
     }
 
     private function updatePK($data, $new) {
-        if ($new && count($this->primaryKey) == 1) $data->{$this->primaryKey[0]} = $this->adapter->lastInsertId();
+        if ($new && count($this->primaryKey) == 1) {
+        	$data->{$this->primaryKey[0]} = $this->adapter->lastInsertId();
+        }
     }
 
     private function checkIfUpdateWorked($data) {
         $updateWhere = $this->crudBuilder->update($this->table, $this->primaryKey, $data);
         $matched = $this->findByField($updateWhere->getArgs());
 
-        if (count($matched) == 0) throw new \InvalidArgumentException('Record inserted into table ' . $this->table . ' fails table constraints');
+        if (count($matched) == 0) {
+        	throw new \InvalidArgumentException('Record inserted into table ' . $this->table . ' fails table constraints');
+        }
     }
 
     private function updateCache($data) {
         $pkValue = $data->{$this->primaryKey[0]};
-		if (isset($this->cache[$pkValue])) $this->cache[$pkValue] = (object) array_merge((array)$this->cache[$pkValue], (array)$data);
-		else $this->cache[$pkValue] = $data;
+		if (isset($this->cache[$pkValue])) {
+			$this->cache[$pkValue] = (object) array_merge((array)$this->cache[$pkValue], (array)$data);
+		} else {
+			$this->cache[$pkValue] = $data;
+		}
     }
 
 	private function insert($table, array $primaryKey, $data) {
 		$error = 0;
 		try {
 			$result = $this->adapter->query($this->crudBuilder->insert($table, $data));
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			$error = 1;
 		}
 
@@ -203,7 +229,9 @@ 
 
     private function tryUpdate($table, array $primaryKey, $data) {
         $result = $this->adapter->query($this->crudBuilder->update($table, $primaryKey, $data));
-        if ($result->rowCount() === 0) $this->checkIfUpdateWorked($data);
+        if ($result->rowCount() === 0) {
+        	$this->checkIfUpdateWorked($data);
+        }
 
         return $result;
     }