Level-2 / Maphper

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], 1));
-        $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], 1));
+		$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/database.php

Indentation +7 added lines, -7 removed lines

@@ -7,8 +7,8 @@ 
 
 	private $primaryKey;
 	private $fields = '*';
-    private $databaseSelect;
-    private $databaseCrud;
+	private $databaseSelect;
+	private $databaseCrud;
 
 	public function __construct($db, $table, $primaryKey = 'id', array $options = []) {
 		$options = new DatabaseOptions($db, $options);
@@ -20,10 +20,10 @@ 
 
 		$defaultSort = $options->read('defaultSort') !== false ? $options->read('defaultSort')  : implode(', ', $this->primaryKey);
 
-        $databaseModify = new DatabaseModify($adapter, $options->getEditMode(), $table);
+		$databaseModify = new DatabaseModify($adapter, $options->getEditMode(), $table);
 
-        $this->databaseSelect = new DatabaseSelect($adapter, $databaseModify, $table, $defaultSort);
-        $this->databaseCrud = new DatabaseCrud($adapter, $databaseModify, $this->databaseSelect, $table, $this->primaryKey);
+		$this->databaseSelect = new DatabaseSelect($adapter, $databaseModify, $table, $defaultSort);
+		$this->databaseCrud = new DatabaseCrud($adapter, $databaseModify, $this->databaseSelect, $table, $this->primaryKey);
 
 		$databaseModify->optimizeColumns();
 	}
@@ -45,7 +45,7 @@ 
 	}
 
 	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 = []) {
@@ -53,6 +53,6 @@ 
 	}
 
 	public function save($data) {
-        $this->databaseCrud->save($data, true);
+		$this->databaseCrud->save($data, true);
 	}
 }

Spacing +2 added lines, -2 removed lines

@@ -16,9 +16,9 @@
 
 		$this->primaryKey = is_array($primaryKey) ? $primaryKey : [$primaryKey];
 
-		$this->fields = implode(',', array_map([$adapter, 'quote'], (array) $options->read('fields')));
+		$this->fields = implode(',', array_map([$adapter, 'quote'], (array)$options->read('fields')));
 
-		$defaultSort = $options->read('defaultSort') !== false ? $options->read('defaultSort')  : implode(', ', $this->primaryKey);
+		$defaultSort = $options->read('defaultSort') !== false ? $options->read('defaultSort') : implode(', ', $this->primaryKey);
 
         $databaseModify = new DatabaseModify($adapter, $options->getEditMode(), $table);
 

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;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 	}
 
     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) {

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/DatabaseSelect.php

Indentation +49 added lines, -49 removed lines

@@ -2,31 +2,31 @@ 
 namespace Maphper\DataSource;
 
 class DatabaseSelect {
-    private $resultCache = [];
-    private $idCache = [];
-    private $selectBuilder;
-    private $whereBuilder;
-    private $adapter;
-    private $databaseModify;
-    private $defaultSort;
-    private $table;
-
-    public function __construct(DatabaseAdapter $adapter, DatabaseModify $databaseModify, $table, $defaultSort) {
-        $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 findById($id, $pk) {
+	private $resultCache = [];
+	private $idCache = [];
+	private $selectBuilder;
+	private $whereBuilder;
+	private $adapter;
+	private $databaseModify;
+	private $defaultSort;
+	private $table;
+
+	public function __construct(DatabaseAdapter $adapter, DatabaseModify $databaseModify, $table, $defaultSort) {
+		$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 findById($id, $pk) {
 		if (!isset($this->idCache[$id])) {
 			try {
 				$result = $this->selectQuery($this->selectBuilder->select($this->table, $pk . ' = :id', [':id' => $id], ['limit' => 1]));
 			}
 			catch (\Exception $e) {
-                // Don't issue an error if it cannot be found since we return null
+				// Don't issue an error if it cannot be found since we return null
 			}
 
 			if (isset($result[0])) 	$this->idCache[$id] = $result[0];
@@ -35,7 +35,7 @@ 
 		return $this->idCache[$id];
 	}
 
-    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);
@@ -55,7 +55,7 @@ 
 		return $this->resultCache[$cacheId];
 	}
 
-    public function findAggregate($function, $field, $group = null, array $criteria = [], array $options = []) {
+	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];
 		$query = $this->whereBuilder->createSql($criteria);
@@ -72,34 +72,34 @@ 
 		}
 	}
 
-    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 selectQuery(\Maphper\Lib\Query $query) {
-        return $this->adapter->query($query)->fetchAll(\PDO::FETCH_OBJ);
-    }
-
-    public function clearResultCache() {
-        $this->resultCache = [];
-    }
-
-    public function clearIDCache() {
-        $this->idCache = [];
-    }
-
-    public function updateCache($data, $pkValue) {
+	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 selectQuery(\Maphper\Lib\Query $query) {
+		return $this->adapter->query($query)->fetchAll(\PDO::FETCH_OBJ);
+	}
+
+	public function clearResultCache() {
+		$this->resultCache = [];
+	}
+
+	public function clearIDCache() {
+		$this->idCache = [];
+	}
+
+	public function updateCache($data, $pkValue) {
 		if (isset($this->cache[$pkValue])) $this->cache[$pkValue] = (object) array_merge((array)$this->cache[$pkValue], (array)$data);
 		else $this->cache[$pkValue] = $data;
-    }
+	}
 
-    public function deleteIDFromCache($id) {
-        unset($this->idCache[$id]);
-    }
+	public function deleteIDFromCache($id) {
+		unset($this->idCache[$id]);
+	}
 }

Braces +26 added lines, -15 removed lines

@@ -24,13 +24,15 @@ 
 		if (!isset($this->idCache[$id])) {
 			try {
 				$result = $this->selectQuery($this->selectBuilder->select($this->table, $pk . ' = :id', [':id' => $id], ['limit' => 1]));
-			}
-			catch (\Exception $e) {
+			} catch (\Exception $e) {
                 // Don't issue an error if it cannot be found since we return null
 			}
 
-			if (isset($result[0])) 	$this->idCache[$id] = $result[0];
-			else return null;
+			if (isset($result[0])) {
+				$this->idCache[$id] = $result[0];
+			} else {
+				return null;
+			}
 		}
 		return $this->idCache[$id];
 	}
@@ -40,14 +42,15 @@ 
 		if (!isset($this->resultCache[$cacheId])) {
 			$query = $this->whereBuilder->createSql($fields);
 
-			if (!isset($options['order'])) $options['order'] = $this->defaultSort;
+			if (!isset($options['order'])) {
+				$options['order'] = $this->defaultSort;
+			}
 
 			try {
 				$this->resultCache[$cacheId] = $this->selectQuery($this->selectBuilder->select($this->table, $query['sql'], $query['args'], $options));
 				$this->databaseModify->addIndex(array_keys($query['args']));
 				$this->databaseModify->addIndex(explode(',', $options['order']));
-			}
-			catch (\Exception $e) {
+			} catch (\Exception $e) {
 				$this->errors[] = $e;
 				$this->resultCache[$cacheId] = [];
 			}
@@ -57,7 +60,9 @@ 
 
     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->whereBuilder->createSql($criteria);
 
 		try {
@@ -66,8 +71,7 @@ 
 			$result = $this->selectQuery($this->selectBuilder->aggregate($this->table, $function, $field, $query['sql'], $query['args'], $group));
 
 			return $this->determineAggregateResult($result, $group, $field);
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			return $group ? [] : 0;
 		}
 	}
@@ -75,11 +79,15 @@ 
     private function determineAggregateResult($result, $group, $field) {
         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 if (isset($result[0])) {
+        	return $result[0]->val;
+        } else {
+        	return 0;
         }
-        else if (isset($result[0])) return $result[0]->val;
-        else return 0;
     }
 
     private function selectQuery(\Maphper\Lib\Query $query) {
@@ -95,8 +103,11 @@ 
     }
 
     public function updateCache($data, $pkValue) {
-		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;
+		}
     }
 
     public function deleteIDFromCache($id) {