Level-2 / Maphper

maphper/datasource/DatabaseSelect.php

Indentation +22 added lines, -22 removed lines

@@ -2,24 +2,24 @@ 
 namespace Maphper\DataSource;
 
 class DatabaseSelect {
-    private $resultCache = [];
-    private $selectBuilder;
-    private $whereBuilder;
-    private $adapter;
-    private $databaseModify;
-    private $defaultSort;
-    private $table;
+	private $resultCache = [];
+	private $selectBuilder;
+	private $whereBuilder;
+	private $adapter;
+	private $databaseModify;
+	private $defaultSort;
+	private $table;
 
-    public function __construct(DatabaseAdapter $adapter, DatabaseModify $databaseModify,  $defaultSort, $table) {
-        $this->adapter = $adapter;
-        $this->databaseModify = $databaseModify;
-        $this->selectBuilder = new \Maphper\Lib\SelectBuilder();
-        $this->whereBuilder = new \Maphper\Lib\Sql\WhereBuilder();
-        $this->defaultSort = $defaultSort;
-        $this->table = $table;
-    }
+	public function __construct(DatabaseAdapter $adapter, DatabaseModify $databaseModify,  $defaultSort, $table) {
+		$this->adapter = $adapter;
+		$this->databaseModify = $databaseModify;
+		$this->selectBuilder = new \Maphper\Lib\SelectBuilder();
+		$this->whereBuilder = new \Maphper\Lib\Sql\WhereBuilder();
+		$this->defaultSort = $defaultSort;
+		$this->table = $table;
+	}
 
-    public function findByField(array $fields, $options = []) {
+	public function findByField(array $fields, $options = []) {
 		$cacheId = md5(serialize(func_get_args()));
 		if (!isset($this->resultCache[$cacheId])) {
 			$query = $this->whereBuilder->createSql($fields);
@@ -39,11 +39,11 @@ 
 		return $this->resultCache[$cacheId];
 	}
 
-    private function selectQuery(\Maphper\Lib\Query $query) {
-        return $this->adapter->query($query)->fetchAll(\PDO::FETCH_OBJ);
-    }
+	private function selectQuery(\Maphper\Lib\Query $query) {
+		return $this->adapter->query($query)->fetchAll(\PDO::FETCH_OBJ);
+	}
 
-    public function clearResultCache() {
-        $this->resultCache = [];
-    }
+	public function clearResultCache() {
+		$this->resultCache = [];
+	}
 }

maphper/datasource/database.php

Indentation +54 added lines, -54 removed lines

@@ -6,17 +6,17 @@ 
 	const EDIT_OPTIMISE = 4;
 
 	private $table;
-    private $options;
+	private $options;
 	private $cache = [];
 	private $primaryKey;
 	private $fields = '*';
 	private $defaultSort;
 	private $adapter;
 	private $crudBuilder;
-    private $selectBuilder;
-    private $whereBuilder;
-    private $databaseModify;
-    private $databaseSelect;
+	private $selectBuilder;
+	private $whereBuilder;
+	private $databaseModify;
+	private $databaseSelect;
 
 	public function __construct($db, $table, $primaryKey = 'id', array $options = []) {
 		$this->options = new DatabaseOptions($db, $options);
@@ -27,13 +27,13 @@ 
 
 		$this->crudBuilder = new \Maphper\Lib\CrudBuilder();
 		$this->selectBuilder = new \Maphper\Lib\SelectBuilder();
-        $this->whereBuilder = new \Maphper\Lib\Sql\WhereBuilder();
+		$this->whereBuilder = new \Maphper\Lib\Sql\WhereBuilder();
 
 		$this->fields = implode(',', array_map([$this->adapter, 'quote'], (array) $this->options->read('fields')));
 
 		$defaultSort = $this->options->read('defaultSort') !== false ? $this->options->read('defaultSort')  : implode(', ', $this->primaryKey);
-        $this->databaseModify = new DatabaseModify($this->adapter, $this->options->getEditMode(), $this->table);
-        $this->databaseSelect = new DatabaseSelect($this->adapter, $this->databaseModify, $defaultSort, $this->table);
+		$this->databaseModify = new DatabaseModify($this->adapter, $this->options->getEditMode(), $this->table);
+		$this->databaseSelect = new DatabaseSelect($this->adapter, $this->databaseModify, $defaultSort, $this->table);
 
 		$this->databaseModify->optimizeColumns();
 	}
@@ -78,18 +78,18 @@ 
 		}
 	}
 
-    private function determineAggregateResult($result, $group, $field) {
-        if ($group != null) {
-            $ret = [];
-            foreach ($result as $res) $ret[$res->$field] = $res->val;
-            return $ret;
-        }
-        else if (isset($result[0])) return $result[0]->val;
-        else return 0;
-    }
+	private function determineAggregateResult($result, $group, $field) {
+		if ($group != null) {
+			$ret = [];
+			foreach ($result as $res) $ret[$res->$field] = $res->val;
+			return $ret;
+		}
+		else if (isset($result[0])) return $result[0]->val;
+		else return 0;
+	}
 
 	public function findByField(array $fields, $options = []) {
-        return $this->databaseSelect->findByField($fields, $options);
+		return $this->databaseSelect->findByField($fields, $options);
 	}
 
 	public function deleteByField(array $fields, array $options = []) {
@@ -102,22 +102,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);
+		$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);
@@ -135,25 +135,25 @@ 
 		$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->whereBuilder->createSql($data);
-        $matched = $this->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->findByField($updateWhere['args']);
+		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;
@@ -165,20 +165,20 @@ 
 		}
 
  		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;
+	}
 
-    private function selectQuery(\Maphper\Lib\Query $query) {
-        return $this->adapter->query($query)->fetchAll(\PDO::FETCH_OBJ);
-    }
+	private function selectQuery(\Maphper\Lib\Query $query) {
+		return $this->adapter->query($query)->fetchAll(\PDO::FETCH_OBJ);
+	}
 }

maphper/datasource/DatabaseModify.php

Indentation +12 added lines, -12 removed lines

@@ -2,21 +2,21 @@
 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);
+	}
 }