Level-2 / Maphper

maphper/datasource/mysqladapter.php

Indentation +8 added lines, -8 removed lines

@@ -3,14 +3,14 @@ 
 class MysqlAdapter implements DatabaseAdapter {
 	private $pdo;
 	private $stmtCache;
-    private $generalEditor;
+	private $generalEditor;
 
 	public function __construct(\PDO $pdo) {
 		$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->generalEditor = new GeneralEditDatabase($this->pdo, ['short_string_max_len' => 191]);
+		$this->stmtCache = new StmtCache($pdo);
+		$this->generalEditor = new GeneralEditDatabase($this->pdo, ['short_string_max_len' => 191]);
 	}
 
 	public function quote($str) {
@@ -20,13 +20,13 @@ 
 	public function query(\Maphper\Lib\Query $query) {
 		$stmt = $this->stmtCache->getCachedStmt($query->getSql());
 		$args = $query->getArgs();
-        $stmt->execute($args);
+		$stmt->execute($args);
 
 		return $stmt;
 	}
 
-    private function alterColumns($table, array $primaryKey, $data) {
-        foreach ($data as $key => $value) {
+	private function alterColumns($table, array $primaryKey, $data) {
+		foreach ($data as $key => $value) {
 			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) continue;
 
 			$type = $this->generalEditor->getType($value);
@@ -38,11 +38,11 @@ 
 				$this->pdo->query('ALTER TABLE ' . $table . ' MODIFY ' . $this->quote($key) . ' ' . $type);
 			}
 		}
-    }
+	}
 
 	public function alterDatabase($table, array $primaryKey, $data) {
 		$this->generalEditor->createTable($table, $primaryKey, $data);
-        $this->alterColumns($table, $primaryKey, $data);
+		$this->alterColumns($table, $primaryKey, $data);
 	}
 
 	public function lastInsertId() {

Braces +10 added lines, -5 removed lines

@@ -27,14 +27,17 @@ 
 
     private function alterColumns($table, array $primaryKey, $data) {
         foreach ($data as $key => $value) {
-			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) continue;
+			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) {
+				continue;
+			}
 
 			$type = $this->generalEditor->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);
 			}
 		}
@@ -57,7 +60,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/GeneralEditDatabase.php

Indentation +32 added lines, -32 removed lines

@@ -2,55 +2,55 @@
 namespace Maphper\DataSource;
 
 class GeneralEditDatabase {
-    private $pdo;
-    private $dataTypes = [
-        'datetime' => 'DATETIME',
-        'int' => 'INT(11)',
-        'decimal' => 'DECIMAL',
-        'short_string' => 'VARCHAR',
-        'long_string' => 'LONGBLOG',
-        'short_string_max_len' => 255,
-        'other' => 'VARCHAR(255)',
+	private $pdo;
+	private $dataTypes = [
+		'datetime' => 'DATETIME',
+		'int' => 'INT(11)',
+		'decimal' => 'DECIMAL',
+		'short_string' => 'VARCHAR',
+		'long_string' => 'LONGBLOG',
+		'short_string_max_len' => 255,
+		'other' => 'VARCHAR(255)',
 
-        'pk_default' => 'INT(11) NOT NULL AUTO_INCREMENT'
-    ];
+		'pk_default' => 'INT(11) NOT NULL AUTO_INCREMENT'
+	];
 
-    public function __construct(\PDO $pdo, array $dataTypes) {
-        $this->pdo = $pdo;
-        $this->dataTypes = array_merge($this->dataTypes, $dataTypes);
-    }
+	public function __construct(\PDO $pdo, array $dataTypes) {
+		$this->pdo = $pdo;
+		$this->dataTypes = array_merge($this->dataTypes, $dataTypes);
+	}
 
-    public function quote($str) {
+	public function quote($str) {
 		return '`' . str_replace('.', '`.`', trim($str, '`')) . '`';
 	}
 
-    public function getType($val) {
+	public function getType($val) {
 		if ($val instanceof \DateTime) return $this->dataTypes['datetime'];
 		else if ($result = $this->doNumberTypes($val)) return $result;
 		else if ($result = $this->doStringTypes($val)) return $result;
 		else return $this->dataTypes['other'];
 	}
 
-    private function doNumberTypes($val) {
-        if (is_int($val)) return $this->dataTypes['int'];
+	private function doNumberTypes($val) {
+		if (is_int($val)) return $this->dataTypes['int'];
 		else if (is_double($val)) return $this->dataTypes['decimal'] . '(9,' . strlen($val) - strrpos($val, '.') - 1 . ')';
-        else return false;
-    }
+		else return false;
+	}
 
-    private function doStringTypes($val) {
-        if (!is_string($val)) return false;
-        if (strlen($val) <= $this->dataTypes['short_string_max_len'])
-            return $this->dataTypes['short_string'] . '(' . $this->dataTypes['short_string_max_len'] . ')';
+	private function doStringTypes($val) {
+		if (!is_string($val)) return false;
+		if (strlen($val) <= $this->dataTypes['short_string_max_len'])
+			return $this->dataTypes['short_string'] . '(' . $this->dataTypes['short_string_max_len'] . ')';
 		else return $this->dataTypes['long_string'];
-    }
+	}
 
-    public function isNotSavableType($value, $key, $primaryKey) {
-        return is_array($value) || (is_object($value) && !($value instanceof \DateTime)) ||
-                in_array($key, $primaryKey);
-    }
+	public function isNotSavableType($value, $key, $primaryKey) {
+		return is_array($value) || (is_object($value) && !($value instanceof \DateTime)) ||
+				in_array($key, $primaryKey);
+	}
 
-    //Alter the database so that it can store $data
-    public function createTable($table, array $primaryKey, $data) {
+	//Alter the database so that it can store $data
+	public function createTable($table, array $primaryKey, $data) {
 		$parts = [];
 		foreach ($primaryKey as $key) {
 			$pk = $data->$key;

Braces +29 added lines, -13 removed lines

@@ -25,23 +25,36 @@ 
 	}
 
     public function getType($val) {
-		if ($val instanceof \DateTime) return $this->dataTypes['datetime'];
-		else if ($result = $this->doNumberTypes($val)) return $result;
-		else if ($result = $this->doStringTypes($val)) return $result;
-		else return $this->dataTypes['other'];
+		if ($val instanceof \DateTime) {
+			return $this->dataTypes['datetime'];
+		} else if ($result = $this->doNumberTypes($val)) {
+			return $result;
+		} else if ($result = $this->doStringTypes($val)) {
+			return $result;
+		} else {
+			return $this->dataTypes['other'];
+		}
 	}
 
     private function doNumberTypes($val) {
-        if (is_int($val)) return $this->dataTypes['int'];
-		else if (is_double($val)) return $this->dataTypes['decimal'] . '(9,' . strlen($val) - strrpos($val, '.') - 1 . ')';
-        else return false;
+        if (is_int($val)) {
+        	return $this->dataTypes['int'];
+        } else if (is_double($val)) {
+			return $this->dataTypes['decimal'] . '(9,' . strlen($val) - strrpos($val, '.') - 1 . ')';
+		} else {
+        	return false;
+        }
     }
 
     private function doStringTypes($val) {
-        if (!is_string($val)) return false;
-        if (strlen($val) <= $this->dataTypes['short_string_max_len'])
-            return $this->dataTypes['short_string'] . '(' . $this->dataTypes['short_string_max_len'] . ')';
-		else return $this->dataTypes['long_string'];
+        if (!is_string($val)) {
+        	return false;
+        }
+        if (strlen($val) <= $this->dataTypes['short_string_max_len']) {
+                    return $this->dataTypes['short_string'] . '(' . $this->dataTypes['short_string_max_len'] . ')';
+        } else {
+			return $this->dataTypes['long_string'];
+		}
     }
 
     public function isNotSavableType($value, $key, $primaryKey) {
@@ -54,8 +67,11 @@ 
 		$parts = [];
 		foreach ($primaryKey as $key) {
 			$pk = $data->$key;
-			if ($pk == null) $parts[] = $key . ' ' . $this->dataTypes['pk_default'];
-			else $parts[] = $key . ' ' . $this->getType($pk) . ' NOT NULL';
+			if ($pk == null) {
+				$parts[] = $key . ' ' . $this->dataTypes['pk_default'];
+			} else {
+				$parts[] = $key . ' ' . $this->getType($pk) . ' NOT NULL';
+			}
 		}
 
 		$pkField = implode(', ', $parts) . ', PRIMARY KEY(' . implode(', ', $primaryKey) . ')';

maphper/datasource/sqliteadapter.php

Indentation +23 added lines, -23 removed lines

@@ -4,15 +4,15 @@ 
 class SqliteAdapter implements DatabaseAdapter {
 	private $pdo;
 	private $stmtCache;
-    private $generalEditor;
+	private $generalEditor;
 
 	public function __construct(\PDO $pdo) {
 		$this->pdo = $pdo;
-        $this->stmtCache = new StmtCache($pdo);
-        $this->generalEditor = new GeneralEditDatabase($this->pdo, [
-            'int' => 'INTEGER',
-            'pk_default' => 'INTEGER NOT NULL',
-        ]);
+		$this->stmtCache = new StmtCache($pdo);
+		$this->generalEditor = new GeneralEditDatabase($this->pdo, [
+			'int' => 'INTEGER',
+			'pk_default' => 'INTEGER NOT NULL',
+		]);
 	}
 
 	public function quote($str) {
@@ -20,19 +20,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() {
@@ -59,11 +59,11 @@ 
 		// SQLSTATE[HY000]: General error: 17 database schema has changed
 		$this->stmtCache->clearCache();
 
-        // Create temp table to create a new structure
+		// Create temp table to create a new structure
 		$affix = '_'.substr(md5($table), 0, 6);
-        $tempTable = $table . $affix;
+		$tempTable = $table . $affix;
 		$this->generalEditor->createTable($tempTable, $primaryKey, $data);
-        $this->alterColumns($tempTable, $primaryKey, $data);
+		$this->alterColumns($tempTable, $primaryKey, $data);
 		$this->copyTableData($table, $tempTable);
 
 		$this->pdo->query('DROP TABLE IF EXISTS ' . $table );
@@ -71,8 +71,8 @@ 
 
 	}
 
-    private function copyTableData($tableFrom, $tableTo) {
-        try {
+	private function copyTableData($tableFrom, $tableTo) {
+		try {
 			if ($this->tableExists($tableFrom)) {
 				$columns = implode(', ', $this->getColumns($tableFrom));
 
@@ -83,19 +83,19 @@ 
 			// No data to copy
 			echo $e->getMessage();
 		}
-    }
+	}
 
-    private function alterColumns($table, array $primaryKey, $data) {
-        foreach ($data as $key => $value) {
+	private function alterColumns($table, array $primaryKey, $data) {
+		foreach ($data as $key => $value) {
 			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) continue;
 
 			$type = $this->generalEditor->getType($value);
 
 			$this->pdo->query('ALTER TABLE ' . $table . ' ADD ' . $this->quote($key) . ' ' . $type);
 		}
-    }
+	}
 
-    public function addIndex($table, array $fields) {
+	public function addIndex($table, array $fields) {
 		if (empty($fields)) return false;
 
 		//SQLite doesn't support ASC/DESC indexes, remove the keywords

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,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;
 	}
 
@@ -60,14 +60,14 @@ 
 		$this->stmtCache->clearCache();
 
         // Create temp table to create a new structure
-		$affix = '_'.substr(md5($table), 0, 6);
+		$affix = '_' . substr(md5($table), 0, 6);
         $tempTable = $table . $affix;
 		$this->generalEditor->createTable($tempTable, $primaryKey, $data);
         $this->alterColumns($tempTable, $primaryKey, $data);
 		$this->copyTableData($table, $tempTable);
 
-		$this->pdo->query('DROP TABLE IF EXISTS ' . $table );
-		$this->pdo->query('ALTER TABLE ' . $tempTable . ' RENAME TO '. $table );
+		$this->pdo->query('DROP TABLE IF EXISTS ' . $table);
+		$this->pdo->query('ALTER TABLE ' . $tempTable . ' RENAME TO ' . $table);
 
 	}
 

Braces +14 added lines, -8 removed lines

@@ -24,7 +24,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') {
@@ -78,8 +80,7 @@ 
 
 				$this->pdo->query('INSERT INTO ' . $this->quote($tableTo) . '(' . $columns . ') SELECT ' . $columns . ' FROM ' . $this->quote($tableFrom));
 			}
-		}
-		catch (\PDOException $e) {
+		} catch (\PDOException $e) {
 			// No data to copy
 			echo $e->getMessage();
 		}
@@ -87,7 +88,9 @@ 
 
     private function alterColumns($table, array $primaryKey, $data) {
         foreach ($data as $key => $value) {
-			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) continue;
+			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) {
+				continue;
+			}
 
 			$type = $this->generalEditor->getType($value);
 
@@ -96,10 +99,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);
@@ -108,8 +115,7 @@ 
 
 		try {
 			$this->pdo->query('CREATE INDEX IF NOT EXISTS  ' . $keyName . ' ON ' . $table . ' (' . implode(', ', $fields) . ')');
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 
 		}
 	}