Level-2 / Maphper

maphper/datasource/StmtCache.php

Indentation +12 added lines, -12 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,11 +18,11 @@ 
 		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)]);
+	}
 }

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

Indentation +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 		$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->stmtCache = new StmtCache($pdo);
 	}
 
 	public function quote($str) {
@@ -18,7 +18,7 @@ 
 	public function query(\Maphper\Lib\Query $query) {
 		$stmt = $this->stmtCache->getCachedStmt($query->getSql());
 		$args = $query->getArgs();
-        $stmt->execute($args);
+		$stmt->execute($args);
 
 		return $stmt;
 	}

Braces +27 added lines, -12 removed lines

@@ -24,10 +24,15 @@ 
 	}
 
 	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)';
 	}
 
@@ -36,8 +41,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) . ')';
@@ -48,15 +56,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);
 			}
 		}
@@ -74,7 +87,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/database.php

Indentation +50 added lines, -50 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, $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;
+	}
 
 	private function addIndex($args) {
 		if (self::EDIT_INDEX & $this->alterDb) $this->adapter->addIndex($this->table, $args);
@@ -124,22 +124,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);
@@ -157,26 +157,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;
@@ -188,20 +188,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);
+	}
 }

Braces +49 added lines, -26 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->selectQuery($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,8 +80,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;
 		}
 	}
@@ -83,15 +88,21 @@ 
     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 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,14 +110,15 @@ 
 		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;
+			}
 
 			try {
 				$this->resultCache[$cacheId] = $this->selectQuery($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] = [];
 			}
@@ -142,10 +154,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);
@@ -162,28 +177,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;
 		}
 
@@ -196,7 +217,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/sqliteadapter.php

Indentation +8 added lines, -8 removed lines

@@ -7,7 +7,7 @@ 
 
 	public function __construct(\PDO $pdo) {
 		$this->pdo = $pdo;
-        $this->stmtCache = new StmtCache($pdo);
+		$this->stmtCache = new StmtCache($pdo);
 	}
 
 	public function quote($str) {
@@ -15,19 +15,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() {

Braces +35 added lines, -17 removed lines

@@ -19,7 +19,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') {
@@ -35,12 +37,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) {
@@ -74,8 +83,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();
 		}
@@ -89,8 +97,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) . ')';
@@ -99,8 +110,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);
 		
@@ -110,10 +125,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);
@@ -122,8 +141,7 @@ 
 		
 		try {
 			$this->pdo->query('CREATE INDEX IF NOT EXISTS  ' . $keyName . ' ON ' . $table . ' (' . implode(', ', $fields) . ')');
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			
 		}
 	}