Level-2 / Maphper

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