Level-2 / Maphper

Maphper/MultiPk.php

Indentation +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 	private $parent;
 	private $primaryKey;
 	private $lookup;
-    private $mapper;
+	private $mapper;
 
 	public function __construct(Maphper $mapper, $lookup, array $primaryKey, MultiPk $parent = null) {
 		$this->parent = $parent;

Braces +5 added lines, -2 removed lines

@@ -25,8 +25,11 @@
 
 	public function offsetGet($key) {
 		$depth = $this->getDepth()+1;
-		if (count($this->primaryKey)-1 == $depth) return $this->mapper->filter([$this->primaryKey[$depth] => $key])->item(0);
-		else return new MultiPk($this->mapper, $key, $this->primaryKey, $this);
+		if (count($this->primaryKey)-1 == $depth) {
+			return $this->mapper->filter([$this->primaryKey[$depth] => $key])->item(0);
+		} else {
+			return new MultiPk($this->mapper, $key, $this->primaryKey, $this);
+		}
 	}
 
 	public function offsetSet($key, $value) {

Maphper/DataSource/DatabaseCrud.php

Indentation +50 added lines, -50 removed lines

@@ -2,30 +2,30 @@ 
 namespace Maphper\DataSource;
 
 class DatabaseCrud {
-    private $crudBuilder;
-    private $whereBuilder;
-    private $adapter;
-    private $databaseModify;
-    private $databaseSelect;
-    private $table;
-    private $primaryKey;
-
-    public function __construct(DatabaseAdapter $adapter, DatabaseModify $databaseModify, DatabaseSelect $databaseSelect, $table, $primaryKey) {
-        $this->adapter = $adapter;
-        $this->databaseModify = $databaseModify;
-        $this->databaseSelect = $databaseSelect;
-        $this->crudBuilder = new \Maphper\Lib\CrudBuilder();
-        $this->whereBuilder = new \Maphper\Lib\Sql\WhereBuilder();
-        $this->table = $table;
-        $this->primaryKey = $primaryKey;
-    }
-
-    public function deleteById($id) {
-        $this->adapter->query($this->crudBuilder->delete($this->table, $this->primaryKey[0] . ' = :id', [':id' => $id]));
-        $this->databaseSelect->deleteIDFromCache($id);
+	private $crudBuilder;
+	private $whereBuilder;
+	private $adapter;
+	private $databaseModify;
+	private $databaseSelect;
+	private $table;
+	private $primaryKey;
+
+	public function __construct(DatabaseAdapter $adapter, DatabaseModify $databaseModify, DatabaseSelect $databaseSelect, $table, $primaryKey) {
+		$this->adapter = $adapter;
+		$this->databaseModify = $databaseModify;
+		$this->databaseSelect = $databaseSelect;
+		$this->crudBuilder = new \Maphper\Lib\CrudBuilder();
+		$this->whereBuilder = new \Maphper\Lib\Sql\WhereBuilder();
+		$this->table = $table;
+		$this->primaryKey = $primaryKey;
 	}
 
-    public function deleteByField(array $fields, array $options = []) {
+	public function deleteById($id) {
+		$this->adapter->query($this->crudBuilder->delete($this->table, $this->primaryKey[0] . ' = :id', [':id' => $id]));
+		$this->databaseSelect->deleteIDFromCache($id);
+	}
+
+	public function deleteByField(array $fields, array $options = []) {
 		$query = $this->whereBuilder->createSql($fields);
 		$this->adapter->query($this->crudBuilder->delete($this->table, $query['sql'], $query['args'], $options['limit'], null, $options['order']));
 		$this->databaseModify->addIndex(array_keys($query['args']));
@@ -35,22 +35,22 @@ 
 		$this->databaseSelect->clearResultCache();
 	}
 
-    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);
+	public function save($data, $tryagain = true) {
+		$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);
@@ -68,15 +68,15 @@ 
 		$this->databaseSelect->updateCache($data, $data->{$this->primaryKey[0]});
 	}
 
-    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->whereBuilder->createSql($data);
-        $matched = $this->databaseSelect->findByField($updateWhere['args']);
-        if (count($matched) == 0) throw new \InvalidArgumentException('Record inserted into table ' . $this->table . ' fails table constraints');
-    }
+	private function checkIfUpdateWorked($data) {
+		$updateWhere = $this->whereBuilder->createSql($data);
+		$matched = $this->databaseSelect->findByField($updateWhere['args']);
+		if (count($matched) == 0) throw new \InvalidArgumentException('Record inserted into table ' . $this->table . ' fails table constraints');
+	}
 
 	private function insert($table, array $primaryKey, $data) {
 		$error = 0;
@@ -88,16 +88,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;
+	}
 }

Braces +17 added lines, -9 removed lines

@@ -53,10 +53,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->databaseModify->getTryInsertAgain($tryagain)) throw $e;
+			if ($result->errorCode() !== '00000') {
+				throw new \Exception('Could not insert into ' . $this->table);
+			}
+		} catch (\Exception $e) {
+			if (!$this->databaseModify->getTryInsertAgain($tryagain)) {
+				throw $e;
+			}
 
 			$this->adapter->alterDatabase($this->table, $this->primaryKey, $data);
 			$this->save($data, false);
@@ -69,21 +72,24 @@ 
 	}
 
     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->whereBuilder->createSql($data);
         $matched = $this->databaseSelect->findByField($updateWhere['args']);
-        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 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;
 		}
 
@@ -96,7 +102,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;
     }

Maphper/DataSource/StmtCache.php

Indentation +15 added lines, -15 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 namespace Maphper\DataSource;
 class StmtCache {
-    private $pdo;
-    private $queryCache = [];
+	private $pdo;
+	private $queryCache = [];
 
-    public function __construct(\PDO $pdo) {
-        $this->pdo = $pdo;
-    }
+	public function __construct(\PDO $pdo) {
+		$this->pdo = $pdo;
+	}
 
-    public function getCachedStmt($sql) {
+	public function getCachedStmt($sql) {
 		$queryId = $this->getQueryId($sql);
 		if (isset($this->queryCache[$queryId])) $stmt = $this->queryCache[$queryId];
 		else {
@@ -18,15 +18,15 @@ 
 		return $stmt;
 	}
 
-    private function getQueryId($sql) {
-        return md5($sql);
-    }
+	private function getQueryId($sql) {
+		return md5($sql);
+	}
 
-    public function deleteQueryFromCache($sql) {
-        unset($this->queryCache[$this->getQueryId($sql)]);
-    }
+	public function deleteQueryFromCache($sql) {
+		unset($this->queryCache[$this->getQueryId($sql)]);
+	}
 
-    public function clearCache() {
-        $this->queryCache = [];
-    }
+	public function clearCache() {
+		$this->queryCache = [];
+	}
 }

Braces +6 added lines, -3 removed lines

@@ -10,10 +10,13 @@
 
     public function getCachedStmt($sql) {
 		$queryId = $this->getQueryId($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;
 	}

Maphper/DataSource/DatabaseModify.php

Indentation +15 added lines, -15 removed lines

@@ -2,25 +2,25 @@
 namespace Maphper\DataSource;
 
 class DatabaseModify {
-    private $adapter;
-    private $alterDb;
-    private $table;
+	private $adapter;
+	private $alterDb;
+	private $table;
 
-    public function __construct(DatabaseAdapter $adapter, $alterDb, $table) {
-        $this->adapter = $adapter;
-        $this->alterDb = $alterDb;
-        $this->table = $table;
-    }
+	public function __construct(DatabaseAdapter $adapter, $alterDb, $table) {
+		$this->adapter = $adapter;
+		$this->alterDb = $alterDb;
+		$this->table = $table;
+	}
 
-    public function addIndex($args) {
+	public function addIndex($args) {
 		if (Database::EDIT_INDEX & $this->alterDb) $this->adapter->addIndex($this->table, $args);
 	}
 
-    public function optimizeColumns() {
-        if (Database::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) $this->adapter->optimiseColumns($this->table);
-    }
+	public function optimizeColumns() {
+		if (Database::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) $this->adapter->optimiseColumns($this->table);
+	}
 
-    public function getTryInsertAgain($tryagain) {
-        return $tryagain && Database::EDIT_STRUCTURE & $this->alterDb;
-    }
+	public function getTryInsertAgain($tryagain) {
+		return $tryagain && Database::EDIT_STRUCTURE & $this->alterDb;
+	}
 }

Braces +6 added lines, -2 removed lines

@@ -13,11 +13,15 @@
     }
 
     public function addIndex($args) {
-		if (Database::EDIT_INDEX & $this->alterDb) $this->adapter->addIndex($this->table, $args);
+		if (Database::EDIT_INDEX & $this->alterDb) {
+			$this->adapter->addIndex($this->table, $args);
+		}
 	}
 
     public function optimizeColumns() {
-        if (Database::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) $this->adapter->optimiseColumns($this->table);
+        if (Database::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) {
+        	$this->adapter->optimiseColumns($this->table);
+        }
     }
 
     public function getTryInsertAgain($tryagain) {

Maphper/DataSource/SqliteAdapter.php

Indentation +23 added lines, -23 removed lines

@@ -4,15 +4,15 @@ 
 class SqliteAdapter implements DatabaseAdapter {
 	private $pdo;
 	private $stmtCache;
-    private $generalEditor;
+	private $generalEditor;
 
 	public function __construct(\PDO $pdo) {
 		$this->pdo = $pdo;
-        $this->stmtCache = new StmtCache($pdo);
-        $this->generalEditor = new GeneralEditDatabase($this->pdo, [
-            'int' => 'INTEGER',
-            'pk_default' => 'INTEGER NOT NULL',
-        ]);
+		$this->stmtCache = new StmtCache($pdo);
+		$this->generalEditor = new GeneralEditDatabase($this->pdo, [
+			'int' => 'INTEGER',
+			'pk_default' => 'INTEGER NOT NULL',
+		]);
 	}
 
 	public function quote($str) {
@@ -20,19 +20,19 @@ 
 	}
 
 	public function query(\Maphper\Lib\Query $query) {
-        $stmt = $this->stmtCache->getCachedStmt($query->getSql());
+		$stmt = $this->stmtCache->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') {
 			$this->stmtCache->deleteQueryFromCache($query->getSql());
 			return $this->query($query);
-        }
+		}
 
-        return $stmt;
+		return $stmt;
 	}
 
 	public function lastInsertId() {
@@ -59,11 +59,11 @@ 
 		// SQLSTATE[HY000]: General error: 17 database schema has changed
 		$this->stmtCache->clearCache();
 
-        // Create temp table to create a new structure
+		// Create temp table to create a new structure
 		$affix = '_'.substr(md5($table), 0, 6);
-        $tempTable = $table . $affix;
+		$tempTable = $table . $affix;
 		$this->generalEditor->createTable($tempTable, $primaryKey, $data);
-        $this->alterColumns($tempTable, $primaryKey, $data);
+		$this->alterColumns($tempTable, $primaryKey, $data);
 		$this->copyTableData($table, $tempTable);
 
 		$this->pdo->query('DROP TABLE IF EXISTS ' . $table );
@@ -71,8 +71,8 @@ 
 
 	}
 
-    private function copyTableData($tableFrom, $tableTo) {
-        try {
+	private function copyTableData($tableFrom, $tableTo) {
+		try {
 			if ($this->tableExists($tableFrom)) {
 				$columns = implode(', ', $this->getColumns($tableFrom));
 
@@ -83,19 +83,19 @@ 
 			// No data to copy
 			echo $e->getMessage();
 		}
-    }
+	}
 
-    private function alterColumns($table, array $primaryKey, $data) {
-        foreach ($data as $key => $value) {
+	private function alterColumns($table, array $primaryKey, $data) {
+		foreach ($data as $key => $value) {
 			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) continue;
 
 			$type = $this->generalEditor->getType($value);
 
 			$this->pdo->query('ALTER TABLE ' . $table . ' ADD ' . $this->quote($key) . ' ' . $type);
 		}
-    }
+	}
 
-    public function addIndex($table, array $fields) {
+	public function addIndex($table, array $fields) {
 		if (empty($fields)) return false;
 
 		//SQLite doesn't support ASC/DESC indexes, remove the keywords

Braces +14 added lines, -8 removed lines

@@ -24,7 +24,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') {
@@ -78,8 +80,7 @@ 
 
 				$this->pdo->query('INSERT INTO ' . $this->quote($tableTo) . '(' . $columns . ') SELECT ' . $columns . ' FROM ' . $this->quote($tableFrom));
 			}
-		}
-		catch (\PDOException $e) {
+		} catch (\PDOException $e) {
 			// No data to copy
 			echo $e->getMessage();
 		}
@@ -87,7 +88,9 @@ 
 
     private function alterColumns($table, array $primaryKey, $data) {
         foreach ($data as $key => $value) {
-			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) continue;
+			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) {
+				continue;
+			}
 
 			$type = $this->generalEditor->getType($value);
 
@@ -96,10 +99,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);
@@ -108,8 +115,7 @@ 
 
 		try {
 			$this->pdo->query('CREATE INDEX IF NOT EXISTS  ' . $keyName . ' ON ' . $table . ' (' . implode(', ', $fields) . ')');
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 
 		}
 	}

Maphper/DataSource/MysqlAdapter.php

Indentation +16 added lines, -16 removed lines

@@ -3,14 +3,14 @@ 
 class MysqlAdapter implements DatabaseAdapter {
 	private $pdo;
 	private $stmtCache;
-    private $generalEditor;
+	private $generalEditor;
 
 	public function __construct(\PDO $pdo) {
 		$this->pdo = $pdo;
 		//Set to strict mode to detect 'out of range' errors, action at a distance but it needs to be set for all INSERT queries
 		$this->pdo->query('SET sql_mode = STRICT_ALL_TABLES');
-        $this->stmtCache = new StmtCache($pdo);
-        $this->generalEditor = new GeneralEditDatabase($this->pdo, ['short_string_max_len' => 191]);
+		$this->stmtCache = new StmtCache($pdo);
+		$this->generalEditor = new GeneralEditDatabase($this->pdo, ['short_string_max_len' => 191]);
 	}
 
 	public function quote($str) {
@@ -20,32 +20,32 @@ 
 	public function query(\Maphper\Lib\Query $query) {
 		$stmt = $this->stmtCache->getCachedStmt($query->getSql());
 		$args = $query->getArgs();
-        $stmt->execute($args);
+		$stmt->execute($args);
 
 		return $stmt;
 	}
 
-    private function alterColumns($table, array $primaryKey, $data) {
-        foreach ($data as $key => $value) {
+	private function alterColumns($table, array $primaryKey, $data) {
+		foreach ($data as $key => $value) {
 			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) continue;
             
 			$type = $this->generalEditor->getType($value);
 			$this->tryAlteringColumn($table, $key, $type);
 		}
-    }
+	}
 
-    private function tryAlteringColumn($table, $key, $type) {
-        try {
-            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);
-        }
-    }
+	private function tryAlteringColumn($table, $key, $type) {
+		try {
+			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);
+		}
+	}
 
 	public function alterDatabase($table, array $primaryKey, $data) {
 		$this->generalEditor->createTable($table, $primaryKey, $data);
-        $this->alterColumns($table, $primaryKey, $data);
+		$this->alterColumns($table, $primaryKey, $data);
 	}
 
 	public function lastInsertId() {

Braces +10 added lines, -5 removed lines

@@ -27,7 +27,9 @@ 
 
     private function alterColumns($table, array $primaryKey, $data) {
         foreach ($data as $key => $value) {
-			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) continue;
+			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) {
+				continue;
+			}
             
 			$type = $this->generalEditor->getType($value);
 			$this->tryAlteringColumn($table, $key, $type);
@@ -36,9 +38,10 @@ 
 
     private function tryAlteringColumn($table, $key, $type) {
         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);
         }
     }
@@ -60,7 +63,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/Iterator.php

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
 		if (count($this->pk) == 1) {
 			$pk = end($this->pk);
 			return $this->array[$this->iterator]->$pk;
-		}
-		else {
+		} else {
 			$current = $this->current();
 			return array_map(function($pkName) use ($current) {
 				return $current->$pkName;

Maphper/Lib/SelectBuilder.php

Braces +10 added lines, -4 removed lines

@@ -7,17 +7,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 != null ? ' WHERE ' . $where : '') . ' ' . $groupBy, $args);
 	}
 }

Maphper/Lib/VisibilityOverride.php

Braces +1 added lines, -2 removed lines

@@ -9,8 +9,7 @@
 		if ($object instanceof \stdclass) {
 			$this->readClosure = function() use ($object) { return $object;	};
 			$this->writeClosure = function ($field, $value) use ($object) { $object->$field = $value; };
-		}
-		else {
+		} else {
             $visOverride = $this;
 			$this->readClosure = function() use ($visOverride) {
                 return (object) array_filter(get_object_vars($this), [$visOverride, 'isReturnableDataType']);

Indentation +5 added lines, -5 removed lines

@@ -11,9 +11,9 @@ 
 			$this->writeClosure = function ($field, $value) use ($object) { $object->$field = $value; };
 		}
 		else {
-            $visOverride = $this;
+			$visOverride = $this;
 			$this->readClosure = function() use ($visOverride) {
-                return (object) array_filter(get_object_vars($this), [$visOverride, 'isReturnableDataType']);
+				return (object) array_filter(get_object_vars($this), [$visOverride, 'isReturnableDataType']);
 			};
 			$this->readClosure = $this->readClosure->bindTo($object, $object);
 
@@ -23,9 +23,9 @@ 
 
 	}
 
-    public function isReturnableDataType($v) {
-        return is_scalar($v) || is_null($v) || (is_object($v) && $v instanceof \DateTimeInterface);
-    }
+	public function isReturnableDataType($v) {
+		return is_scalar($v) || is_null($v) || (is_object($v) && $v instanceof \DateTimeInterface);
+	}
 
 	public function getProperties() {
 		return ($this->readClosure)();