Level-2 / Maphper

maphper/relation/manymany.php

Indentation +13 added lines, -13 removed lines

@@ -88,25 +88,25 @@
 		list($relatedField, $valueField, $mapper) = $this->getOtherFieldNameInfo();
 		if ($this->autoTraverse) $this->offsetSetAutotraverse($value, $relatedField, $valueField);
 		else if ($this->doUpdateInterMapper($value, $relatedField, $valueField)) {
-            $record = $value;
+			$record = $value;
 			$record->{$this->parentField} = $value->{$this->intermediateName}->{$this->localField};
 			$record->$valueField = $this->object->{$relatedField};
 			$this->intermediateMapper[] = $record;
 		}
 	}
 
-    private function doUpdateInterMapper($record, $relatedField, $valueField) {
-        return !(isset($record->{$this->parentField}) && isset($record->{$this->intermediateName}) &&
-                $record->{$this->parentField} == $record->{$this->intermediateName}->{$this->localField} &&
-                $record->$valueField == $this->object->{$relatedField});
-    }
-
-    private function offsetSetAutotraverse($value, $relatedField, $valueField) {
-        $record = new \stdClass;
-        $record->{$this->parentField} =  $value->{$this->localField};
-        $record->$valueField = $this->object->{$relatedField};
-        $this->intermediateMapper[] = $record;
-    }
+	private function doUpdateInterMapper($record, $relatedField, $valueField) {
+		return !(isset($record->{$this->parentField}) && isset($record->{$this->intermediateName}) &&
+				$record->{$this->parentField} == $record->{$this->intermediateName}->{$this->localField} &&
+				$record->$valueField == $this->object->{$relatedField});
+	}
+
+	private function offsetSetAutotraverse($value, $relatedField, $valueField) {
+		$record = new \stdClass;
+		$record->{$this->parentField} =  $value->{$this->localField};
+		$record->$valueField = $this->object->{$relatedField};
+		$this->intermediateMapper[] = $record;
+	}
 
 	public function offsetUnset($id) {
 		//$this->relation->mapper->filter([$relatedField => $this->object->$valueField, $this->relation->parentField => $id])->delete();

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
 	//bit hacky, breaking encapsulation, but simplest way to work out the info for the other side of the many:many relationship.
 	private function getOtherFieldNameInfo() {
 		if ($this->otherInfo == null) {
-			$propertyReader = function($name) {return $this->$name;	};
+			$propertyReader = function($name) {return $this->$name; };
 
 			$reader = $propertyReader->bindTo($this->intermediateMapper, $this->intermediateMapper);
 
@@ -45,7 +45,7 @@ 
 				$propertyReader = $propertyReader->bindTo($relation, $relation);
 				if ($propertyReader('parentField') != $this->parentField) {
 					$relation = $relation->getData($this->object);
-					$this->otherInfo = [$propertyReader('localField'),  $propertyReader('parentField'), $propertyReader('mapper')];
+					$this->otherInfo = [$propertyReader('localField'), $propertyReader('parentField'), $propertyReader('mapper')];
 				}
 			}
 		}
@@ -103,7 +103,7 @@ 
 
     private function offsetSetAutotraverse($value, $relatedField, $valueField) {
         $record = new \stdClass;
-        $record->{$this->parentField} =  $value->{$this->localField};
+        $record->{$this->parentField} = $value->{$this->localField};
         $record->$valueField = $this->object->{$relatedField};
         $this->intermediateMapper[] = $record;
     }

Braces +6 added lines, -3 removed lines

@@ -31,7 +31,9 @@ 
 	public function overwrite($parentObject, &$data) {
 		$this->results = $data;
 		$this->object = $parentObject;
-		foreach ($data as $dt) $this[] = $dt;
+		foreach ($data as $dt) {
+			$this[] = $dt;
+		}
 	}
 
 	//bit hacky, breaking encapsulation, but simplest way to work out the info for the other side of the many:many relationship.
@@ -86,8 +88,9 @@ 
 
 	public function offsetSet($name, $value) {
 		list($relatedField, $valueField, $mapper) = $this->getOtherFieldNameInfo();
-		if ($this->autoTraverse) $this->offsetSetAutotraverse($value, $relatedField, $valueField);
-		else if ($this->doUpdateInterMapper($value, $relatedField, $valueField)) {
+		if ($this->autoTraverse) {
+			$this->offsetSetAutotraverse($value, $relatedField, $valueField);
+		} else if ($this->doUpdateInterMapper($value, $relatedField, $valueField)) {
             $record = $value;
 			$record->{$this->parentField} = $value->{$this->intermediateName}->{$this->localField};
 			$record->$valueField = $this->object->{$relatedField};

maphper/relation/one.php

Indentation +6 added lines, -6 removed lines

@@ -9,7 +9,7 @@ 
 	private $siblings = [];
 
 	public function __construct(\Maphper\Maphper $mapper, $parentField, $localField, array $criteria = []) {
-        if ($criteria) $mapper = $mapper->filter($this->criteira);
+		if ($criteria) $mapper = $mapper->filter($this->criteira);
 		$this->mapper = $mapper;
 		$this->parentField = $parentField;
 		$this->localField = $localField;
@@ -48,11 +48,11 @@ 
 		//Fetch the results so they're in the cache for the corresponding maphper object
 		$results = $this->mapper->filter([$this->localField => $recordsToLoad]);
 
-        $this->loadDataIntoSiblings($results);
+		$this->loadDataIntoSiblings($results);
 	}
 
-    private function loadDataIntoSiblings($results) {
-        $cache = [];
+	private function loadDataIntoSiblings($results) {
+		$cache = [];
 		foreach ($results as $result) {
 			$cache[$result->{$this->localField}] = $result;
 		}
@@ -66,7 +66,7 @@ 
 			else $sibling->data = $sibling->mapper->filter([$sibling->localField => $sibling->parentObject->{$this->parentField}])->item(0);
 		}
 		*/
-    }
+	}
 
 	public function __call($func, array $args = []) {
 		if ($this->lazyLoad() == null) return '';
@@ -75,7 +75,7 @@ 
 
 	public function __get($name) {
 		if ($this->lazyLoad()) return $this->lazyLoad()->$name;
-        else return null;
+		else return null;
 	}
 
 	public function __isset($name) {

Braces +14 added lines, -5 removed lines

@@ -9,7 +9,9 @@ 
 	private $siblings = [];
 
 	public function __construct(\Maphper\Maphper $mapper, $parentField, $localField, array $criteria = []) {
-        if ($criteria) $mapper = $mapper->filter($this->criteira);
+        if ($criteria) {
+        	$mapper = $mapper->filter($this->criteira);
+        }
 		$this->mapper = $mapper;
 		$this->parentField = $parentField;
 		$this->localField = $localField;
@@ -29,7 +31,9 @@ 
 	private function lazyLoad() {
 		if (!isset($this->data)) {
 
-			if ($this->parentObject == null) throw new \Exception('Error, no object set');
+			if ($this->parentObject == null) {
+				throw new \Exception('Error, no object set');
+			}
 
 			$this->eagerLoad();
 
@@ -69,13 +73,18 @@ 
     }
 
 	public function __call($func, array $args = []) {
-		if ($this->lazyLoad() == null) return '';
+		if ($this->lazyLoad() == null) {
+			return '';
+		}
 		return call_user_func_array([$this->lazyLoad(), $func], $args);
 	}
 
 	public function __get($name) {
-		if ($this->lazyLoad()) return $this->lazyLoad()->$name;
-        else return null;
+		if ($this->lazyLoad()) {
+			return $this->lazyLoad()->$name;
+		} else {
+        	return null;
+        }
 	}
 
 	public function __isset($name) {

maphper/datasource/mysqladapter.php

Indentation +16 added lines, -16 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,32 +20,32 @@ 
 	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);
 			$this->tryAlteringColumn($table, $key, $type);
 		}
-    }
+	}
 
-    private function tryAlteringColumn($table, $key, $type) {
-        try {
-            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);
-        }
-    }
+	private function tryAlteringColumn($table, $key, $type) {
+		try {
+			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);
+		}
+	}
 
 	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,7 +27,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);
 			$this->tryAlteringColumn($table, $key, $type);
@@ -36,9 +38,10 @@ 
 
     private function tryAlteringColumn($table, $key, $type) {
         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);
         }
     }
@@ -60,7 +63,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) {