Level-2 / Maphper

maphper/relation/many.php

Braces +14 added lines, -5 removed lines

@@ -6,7 +6,9 @@ 
 	private $localField;
 	
 	public function __construct(\Maphper\Maphper $mapper, $parentField, $localField, array $critiera = []) {
-		if ($critiera) $mapper->filter($critiera);
+		if ($critiera) {
+			$mapper->filter($critiera);
+		}
 		$this->mapper = $mapper;
 		$this->parentField = $parentField;
 		$this->localField = $localField;		
@@ -14,17 +16,24 @@ 
 	
 	
 	public function getData($parentObject) {
-		if (!isset($parentObject->{$this->parentField})) $mapper = $this->mapper;
-		else $mapper = $this->mapper->filter([$this->localField => $parentObject->{$this->parentField}]);
+		if (!isset($parentObject->{$this->parentField})) {
+			$mapper = $this->mapper;
+		} else {
+			$mapper = $this->mapper->filter([$this->localField => $parentObject->{$this->parentField}]);
+		}
 		
 		return $mapper;
 	}
 
 	
 	public function overwrite($key, &$mapper) {
-		if (!isset($key->{$this->parentField})) return false;
+		if (!isset($key->{$this->parentField})) {
+			return false;
+		}
 		foreach ($mapper as $k => $val) {
-			if (!empty($val->{$this->localField}) && $val->{$this->localField} == $key->{$this->parentField}) continue;
+			if (!empty($val->{$this->localField}) && $val->{$this->localField} == $key->{$this->parentField}) {
+				continue;
+			}
 			$val->{$this->localField} = $key->{$this->parentField};
 			$this->mapper[] = $val;
 		}

maphper/relation/manymany.php

Braces +5 added lines, -5 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.
@@ -92,15 +94,13 @@ 
 			$record->$valueField = $this->object->{$relatedField};
 			$this->intermediateMapper[] = $record;
 
-		}
-		else {
+		} else {
 			$record = $value;
 			if (isset($record->{$this->parentField}) && isset($value->{$this->intermediateName}) &&
 					$record->{$this->parentField} == $value->{$this->intermediateName}->{$this->localField} &&
 					$record->$valueField == $this->object->{$relatedField}) {
 				return;
-			}
-			else {
+			} else {
 				$record->{$this->parentField} = $value->{$this->intermediateName}->{$this->localField};
 				$record->$valueField = $this->object->{$relatedField};
 				$this->intermediateMapper[] = $record;

maphper/relation/one.php

Braces +16 added lines, -6 removed lines

@@ -30,7 +30,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();
 			
@@ -47,8 +49,11 @@ 
 
 		$recordsToLoad = array_unique($recordsToLoad);
 		//Fetch the results so they're in the cache for the corresponding maphper object
-		if ($this->criteria) $results = $this->mapper->filter($this->criteira)->filter([$this->localField => $recordsToLoad]);
-		else $results = $this->mapper->filter([$this->localField => $recordsToLoad]);
+		if ($this->criteria) {
+			$results = $this->mapper->filter($this->criteira)->filter([$this->localField => $recordsToLoad]);
+		} else {
+			$results = $this->mapper->filter([$this->localField => $recordsToLoad]);
+		}
 			
 		$cache = [];
 		foreach ($results as $result) {
@@ -68,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/relation/manymanyiterator.php

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
   }
 
   public function current() {
-    if ($this->intermediateName) return $this->iterator->current()->{$this->intermediateName};
+    if ($this->intermediateName) {
+    	return $this->iterator->current()->{$this->intermediateName};
+    }
 		return $this->iterator->current();
 	}
 

maphper/maphper.php

Braces +28 added lines, -10 removed lines

@@ -76,13 +76,17 @@ 
 	private function processFilters($value) {
 		//When saving to a mapper with filters, write the filters back into the object being stored
 		foreach ($this->settings['filter'] as $key => $filterValue) {
-			if (empty($value->$key) && !is_array($filterValue)) $value->$key = $filterValue;
+			if (empty($value->$key) && !is_array($filterValue)) {
+				$value->$key = $filterValue;
+			}
 		}
 		return $value;
 	}
 
 	public function offsetSet($offset, $valueObj) {
-		if ($valueObj instanceof \Maphper\Relation) throw new \Exception();
+		if ($valueObj instanceof \Maphper\Relation) {
+			throw new \Exception();
+		}
 
 		//Extract private properties from the object
 		$propertyReader = new \Maphper\Lib\VisibilityOverride();
@@ -90,7 +94,9 @@ 
 
 		$value = $this->processFilters($value);
 		$pk = $this->dataSource->getPrimaryKey();
-		if ($offset !== null) $value->{$pk[0]} = $offset;
+		if ($offset !== null) {
+			$value->{$pk[0]} = $offset;
+		}
 		$valueCopy = clone $value;
 		$value = $this->wrap($value);
 		$this->dataSource->save($value);
@@ -99,7 +105,9 @@ 
 	}
 
 	public function offsetExists($offset) {
-		if (count($this->dataSource->getPrimaryKey()) > 1) return new MultiPk($this, $offset, $this->dataSource->getPrimaryKey());
+		if (count($this->dataSource->getPrimaryKey()) > 1) {
+			return new MultiPk($this, $offset, $this->dataSource->getPrimaryKey());
+		}
         if (!empty($this->settings['filter'])) {
             $data = $this->dataSource->findByField(array_merge($this->settings['filter'], [$this->dataSource->getPrimaryKey()[0] => $offset]));
             return isset($data[0]);
@@ -112,7 +120,9 @@ 
 	}
 
 	public function offsetGet($offset) {
-		if (count($this->dataSource->getPrimaryKey()) > 1) return new MultiPk($this, $offset, $this->dataSource->getPrimaryKey());
+		if (count($this->dataSource->getPrimaryKey()) > 1) {
+			return new MultiPk($this, $offset, $this->dataSource->getPrimaryKey());
+		}
         if (!empty($this->settings['filter'])) {
             $data = $this->dataSource->findByField(array_merge($this->settings['filter'], [$this->dataSource->getPrimaryKey()[0] => $offset]));
             return $this->wrap($this->createNew(isset($data[0]) ? $data[0] : null));
@@ -121,7 +131,9 @@ 
 	}
 
 	private function createNew($data = [], $obj = null) {
-		if (!$obj) $obj = (is_callable($this->settings['resultClass'])) ? call_user_func($this->settings['resultClass']) : new $this->settings['resultClass'];
+		if (!$obj) {
+			$obj = (is_callable($this->settings['resultClass'])) ? call_user_func($this->settings['resultClass']) : new $this->settings['resultClass'];
+		}
 		$writer = new Lib\PropertyWriter($obj);
 		if ($data != null) {
 			foreach ($data as $key => $value) {
@@ -141,7 +153,9 @@ 
 		foreach ($this->relations as $name => $relation) {
 			if (isset($object->$name) && !($object->$name instanceof \Maphper\Relation) ) {
 				//After overwriting the relation, does the parent object ($object) need overwriting as well?
-				if ($relation->overwrite($object, $object->$name)) $this[] = $object;
+				if ($relation->overwrite($object, $object->$name)) {
+					$this[] = $object;
+				}
 			}
 
 			$object->$name = $relation->getData($object, $siblings);
@@ -153,11 +167,15 @@ 
 	public function __call($method, $args) {
 		if (array_key_exists($method, $this->settings)) {
 			$maphper = new Maphper($this->dataSource, $this->settings, $this->relations);
-			if (is_array($maphper->settings[$method])) $maphper->settings[$method] = $args[0] + $maphper->settings[$method];
-			else $maphper->settings[$method] = $args[0];
+			if (is_array($maphper->settings[$method])) {
+				$maphper->settings[$method] = $args[0] + $maphper->settings[$method];
+			} else {
+				$maphper->settings[$method] = $args[0];
+			}
 			return $maphper;
+		} else {
+			throw new \Exception('Method Maphper::' . $method . ' does not exist');
 		}
-		else throw new \Exception('Method Maphper::' . $method . ' does not exist');
 	}
 
 	public function findAggregate($function, $field, $group = null) {

maphper/lib/propertywriter.php

Braces +1 added lines, -2 removed lines

@@ -5,8 +5,7 @@
 	public function __construct($object) {
 		if ($object instanceof \stdclass) {
 			$this->closure = function ($field, $value) use ($object) { $object->$field = $value; };
-		}
-		else {
+		} else {
 			$this->closure = function ($field, $value) { $this->$field = $value; };
 			$this->closure = $this->closure->bindTo($object, $object);
 		}