Level-2 / Maphper

maphper/datasource/mysqladapter.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	public function query(\Maphper\Lib\Query $query) {
 		$stmt = $this->getCachedStmt($query->getSql());
 		$args = $query->getArgs();
-        $stmt->execute($args);
+		$stmt->execute($args);
 
 		if (strpos(trim($query->getSql()), 'SELECT') === 0) return $stmt->fetchAll(\PDO::FETCH_OBJ);
 		else return $stmt;

Braces +38 added lines, -17 removed lines

@@ -16,10 +16,13 @@ 
 
 	private function getCachedStmt($sql) {
 		$queryId = md5($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;
 	}
@@ -29,15 +32,23 @@ 
 		$args = $query->getArgs();
         $stmt->execute($args);
 
-		if (strpos(trim($query->getSql()), 'SELECT') === 0) return $stmt->fetchAll(\PDO::FETCH_OBJ);
-		else return $stmt;
+		if (strpos(trim($query->getSql()), 'SELECT') === 0) {
+			return $stmt->fetchAll(\PDO::FETCH_OBJ);
+		} else {
+			return $stmt;
+		}
 	}
 
 	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)';
 	}
 
@@ -46,8 +57,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) . ')';
@@ -58,15 +72,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);
 			}
 		}
@@ -84,7 +103,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/sqliteadapter.php

Indentation +9 added lines, -9 removed lines

@@ -13,7 +13,7 @@ 
 		return '`' . str_replace('.', '`.`', trim($str, '`')) . '`';
 	}
 
-    private function getCachedStmt($sql) {
+	private function getCachedStmt($sql) {
 		$queryId = md5($sql);
 		if (isset($this->queryCache[$queryId])) $stmt = $this->queryCache[$queryId];
 		else {
@@ -25,20 +25,20 @@ 
 
 	public function query(\Maphper\Lib\Query $query) {
 		$queryId = md5($query->getSql());
-        $stmt = $this->getCachedStmt($query->getSql());
+		$stmt = $this->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') {
 			unset($this->queryCache[$queryId]);
 			return $this->query($query);
-        }
+		}
 
-        if (substr($query->getSql(), 0, 6) === 'SELECT') return $stmt->fetchAll(\PDO::FETCH_OBJ);
-        else return $stmt;
+		if (substr($query->getSql(), 0, 6) === 'SELECT') return $stmt->fetchAll(\PDO::FETCH_OBJ);
+		else return $stmt;
 	}
 	
 	public function lastInsertId() {

Spacing +6 added lines, -6 removed lines

@@ -55,7 +55,7 @@ 
 	}
 
 	private function tableExists($name) {
-		$result = $this->pdo->query('SELECT name FROM sqlite_master WHERE type="table" and name="'. $name.'"');
+		$result = $this->pdo->query('SELECT name FROM sqlite_master WHERE type="table" and name="' . $name . '"');
 		return count($result->fetchAll()) == 1;
 	}
 
@@ -74,7 +74,7 @@ 
 		// SQLSTATE[HY000]: General error: 17 database schema has changed
 		$this->queryCache = [];
 
-		$affix = '_'.substr(md5($table), 0, 6);
+		$affix = '_' . substr(md5($table), 0, 6);
 		$this->createTable($table . $affix, $primaryKey, $data);
 		$fields = [];
 		foreach ($data as $key => $value) { $fields[] = $key; }
@@ -83,7 +83,7 @@ 
 				$columns = implode(', ', $this->getColumns($table));			
 
 				$this->pdo->query('INSERT INTO ' . $this->quote($table . $affix) . '(' . $columns . ') SELECT ' . $columns . ' FROM ' . $this->quote($table));
-				$this->pdo->query('DROP TABLE IF EXISTS ' . $table );
+				$this->pdo->query('DROP TABLE IF EXISTS ' . $table);
 			}
 		}
 		catch (\PDOException $e) {
@@ -91,8 +91,8 @@ 
 			echo $e->getMessage();
 		}
 
-		$this->pdo->query('DROP TABLE IF EXISTS ' . $table );
-		$this->pdo->query('ALTER TABLE ' . $table . $affix. ' RENAME TO '. $table );
+		$this->pdo->query('DROP TABLE IF EXISTS ' . $table);
+		$this->pdo->query('ALTER TABLE ' . $table . $affix . ' RENAME TO ' . $table);
 
 	}
 
@@ -106,7 +106,7 @@ 
 		
 		$pkField = implode(', ', $parts) . ', PRIMARY KEY(' . implode(', ', $primaryKey) . ')';
 				
-		$this->pdo->query('DROP TABLE IF EXISTS ' . $table );
+		$this->pdo->query('DROP TABLE IF EXISTS ' . $table);
 		$this->pdo->query('CREATE TABLE ' . $table . ' (' . $pkField . ')');
 					
 		foreach ($data as $key => $value) {

Braces +46 added lines, -22 removed lines

@@ -15,10 +15,13 @@ 
 
     private function getCachedStmt($sql) {
 		$queryId = md5($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;
 	}
@@ -29,7 +32,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') {
@@ -37,8 +42,11 @@ 
 			return $this->query($query);
         }
 
-        if (substr($query->getSql(), 0, 6) === 'SELECT') return $stmt->fetchAll(\PDO::FETCH_OBJ);
-        else return $stmt;
+        if (substr($query->getSql(), 0, 6) === 'SELECT') {
+        	return $stmt->fetchAll(\PDO::FETCH_OBJ);
+        } else {
+        	return $stmt;
+        }
 	}
 	
 	public function lastInsertId() {
@@ -46,12 +54,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) {
@@ -85,8 +100,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();
 		}
@@ -100,8 +114,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) . ')';
@@ -110,8 +127,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);
 		
@@ -121,10 +142,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);
@@ -133,8 +158,7 @@ 
 		
 		try {
 			$this->pdo->query('CREATE INDEX IF NOT EXISTS  ' . $keyName . ' ON ' . $table . ' (' . implode(', ', $fields) . ')');
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			
 		}
 	}

maphper/lib/selectbuilder.php

Indentation +14 added lines, -14 removed lines

@@ -30,10 +30,10 @@ 
 		$sql = [];
 
 		foreach ($fields as $key => $value) {
-            if ($value instanceof \DateTime) {
-    			if ($value->format('H:i:s')  == '00:00:00') $value = $value->format('Y-m-d');
-    			else $value = $value->format('Y-m-d H:i:s');
-    		}
+			if ($value instanceof \DateTime) {
+				if ($value->format('H:i:s')  == '00:00:00') $value = $value->format('Y-m-d');
+				else $value = $value->format('Y-m-d H:i:s');
+			}
 
 			if (is_numeric($key) && is_array($value)) {
 				$result = $this->createSql($value, $key);
@@ -85,17 +85,17 @@ 
 		return ['args' => $args, 'sql' => [$query]];
 	}
 
-    private function getOperator($mode) {
-        $operator = "";
+	private function getOperator($mode) {
+		$operator = "";
 
-        if (\Maphper\Maphper::FIND_NOCASE & $mode) $operator = 'LIKE';
-        else if (\Maphper\Maphper::FIND_BIT & $mode) $operator = '&';
-        else if (\Maphper\Maphper::FIND_GREATER & $mode) $operator = '>';
-        else if (\Maphper\Maphper::FIND_LESS & $mode) $operator = '<';
-        else if (\Maphper\Maphper::FIND_NOT & $mode) $operator = '!=';
+		if (\Maphper\Maphper::FIND_NOCASE & $mode) $operator = 'LIKE';
+		else if (\Maphper\Maphper::FIND_BIT & $mode) $operator = '&';
+		else if (\Maphper\Maphper::FIND_GREATER & $mode) $operator = '>';
+		else if (\Maphper\Maphper::FIND_LESS & $mode) $operator = '<';
+		else if (\Maphper\Maphper::FIND_NOT & $mode) $operator = '!=';
 
-        if (\Maphper\Maphper::FIND_EXACT & $mode) $operator .= '=';
+		if (\Maphper\Maphper::FIND_EXACT & $mode) $operator .= '=';
 
-        return $operator;
-    }
+		return $operator;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -25,13 +25,13 @@ 
 
 
 	//Needs to be broken up into better methods
-	public function createSql($fields, $mode){
+	public function createSql($fields, $mode) {
 		$args = [];
 		$sql = [];
 
 		foreach ($fields as $key => $value) {
             if ($value instanceof \DateTime) {
-    			if ($value->format('H:i:s')  == '00:00:00') $value = $value->format('Y-m-d');
+    			if ($value->format('H:i:s') == '00:00:00') $value = $value->format('Y-m-d');
     			else $value = $value->format('Y-m-d H:i:s');
     		}
 
@@ -55,7 +55,7 @@ 
 					$inSql[] = ':' . $key . $i;
 				}
 				if (count($inSql) == 0) return [];
-				else $sql[] = $key . ' IN ( ' .  implode(', ', $inSql) . ')';
+				else $sql[] = $key . ' IN ( ' . implode(', ', $inSql) . ')';
 			}
 			else if ($value === NULL) {
 				$nullSql = $key . ' IS ';

Braces +59 added lines, -32 removed lines

@@ -9,17 +9,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[0] != null ? ' WHERE ' : '') . implode(' AND ', $where) . ' ' . $groupBy, $args);
 	}
 
@@ -31,70 +37,91 @@ 
 
 		foreach ($fields as $key => $value) {
             if ($value instanceof \DateTime) {
-    			if ($value->format('H:i:s')  == '00:00:00') $value = $value->format('Y-m-d');
-    			else $value = $value->format('Y-m-d H:i:s');
+    			if ($value->format('H:i:s')  == '00:00:00') {
+    				$value = $value->format('Y-m-d');
+    			} else {
+    				$value = $value->format('Y-m-d H:i:s');
+    			}
     		}
 
 			if (is_numeric($key) && is_array($value)) {
 				$result = $this->createSql($value, $key);
-				foreach ($result['args'] as $arg_key => $arg) $args[$arg_key] = $arg;
-				foreach ($result['sql'] as $arg) $sql[] = $arg;
-			}
-			else if (\Maphper\Maphper::FIND_BETWEEN & $mode) {
+				foreach ($result['args'] as $arg_key => $arg) {
+					$args[$arg_key] = $arg;
+				}
+				foreach ($result['sql'] as $arg) {
+					$sql[] = $arg;
+				}
+			} else if (\Maphper\Maphper::FIND_BETWEEN & $mode) {
 				$sql[] = $key . '>= :' . $key . 'from';
 				$sql[] = $key . ' <= :' . $key . 'to';
 
 				$args[$key . 'from'] = $value[0];
 				$args[$key . 'to'] = $value[1];
-			}
-			else if (!is_numeric($key) && is_array($value)) {
+			} else if (!is_numeric($key) && is_array($value)) {
 				$inSql = [];
 				$count = count($value);
 				for ($i = 0; $i < $count; $i++) {
 					$args[$key . $i] = $value[$i];
 					$inSql[] = ':' . $key . $i;
 				}
-				if (count($inSql) == 0) return [];
-				else $sql[] = $key . ' IN ( ' .  implode(', ', $inSql) . ')';
-			}
-			else if ($value === NULL) {
+				if (count($inSql) == 0) {
+					return [];
+				} else {
+					$sql[] = $key . ' IN ( ' .  implode(', ', $inSql) . ')';
+				}
+			} else if ($value === NULL) {
 				$nullSql = $key . ' IS ';
-				if (\Maphper\Maphper::FIND_NOT & $mode) $nullSql .= 'NOT ';
+				if (\Maphper\Maphper::FIND_NOT & $mode) {
+					$nullSql .= 'NOT ';
+				}
 				$sql[] = $nullSql . 'NULL';
-			}
-			else {
+			} else {
 
 				if (\Maphper\Maphper::FIND_LIKE & $mode) {
 					$operator = 'LIKE';
 					$value = '%' . $value . '%';
-				}
-				else if (\Maphper\Maphper::FIND_STARTS & $mode) {
+				} else if (\Maphper\Maphper::FIND_STARTS & $mode) {
 					$operator = 'LIKE';
 					$value = $value . '%';
+				} else {
+					$operator = $this->getOperator($mode);
 				}
-				else $operator = $this->getOperator($mode);
 
 				$args[$key] = $value;
 				$sql[] = $key . ' ' . $operator . ' :' . $key;
 			}
 		}
 
-		if (\Maphper\Maphper::FIND_OR & $mode) $query = implode(' OR  ', $sql);
-		else $query = implode(' AND ', $sql);
-		if (!empty($query)) $query = '(' . $query . ')';
+		if (\Maphper\Maphper::FIND_OR & $mode) {
+			$query = implode(' OR  ', $sql);
+		} else {
+			$query = implode(' AND ', $sql);
+		}
+		if (!empty($query)) {
+			$query = '(' . $query . ')';
+		}
 		return ['args' => $args, 'sql' => [$query]];
 	}
 
     private function getOperator($mode) {
         $operator = "";
 
-        if (\Maphper\Maphper::FIND_NOCASE & $mode) $operator = 'LIKE';
-        else if (\Maphper\Maphper::FIND_BIT & $mode) $operator = '&';
-        else if (\Maphper\Maphper::FIND_GREATER & $mode) $operator = '>';
-        else if (\Maphper\Maphper::FIND_LESS & $mode) $operator = '<';
-        else if (\Maphper\Maphper::FIND_NOT & $mode) $operator = '!=';
-
-        if (\Maphper\Maphper::FIND_EXACT & $mode) $operator .= '=';
+        if (\Maphper\Maphper::FIND_NOCASE & $mode) {
+        	$operator = 'LIKE';
+        } else if (\Maphper\Maphper::FIND_BIT & $mode) {
+        	$operator = '&';
+        } else if (\Maphper\Maphper::FIND_GREATER & $mode) {
+        	$operator = '>';
+        } else if (\Maphper\Maphper::FIND_LESS & $mode) {
+        	$operator = '<';
+        } else if (\Maphper\Maphper::FIND_NOT & $mode) {
+        	$operator = '!=';
+        }
+
+        if (\Maphper\Maphper::FIND_EXACT & $mode) {
+        	$operator .= '=';
+        }
 
         return $operator;
     }