Level-2 / Maphper

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);
 		$writer->write($data);
 		return $obj;
@@ -132,7 +144,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);
@@ -144,11 +158,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/dateinjector.php

Braces +18 added lines, -8 removed lines

@@ -6,25 +6,35 @@
 
 	public function replaceDates($obj, $reset = true) {
 		//prevent infinite recursion, only process each object once
-		if ($this->checkCache($obj, $reset) == false) return $obj;
+		if ($this->checkCache($obj, $reset) == false) {
+			return $obj;
+		}
 
-		if (is_array($obj) || (is_object($obj) && ($obj instanceof \Iterator))) foreach ($obj as &$o) $o = $this->replaceDates($o, false);
+		if (is_array($obj) || (is_object($obj) && ($obj instanceof \Iterator))) {
+			foreach ($obj as &$o) $o = $this->replaceDates($o, false);
+		}
 		if (is_string($obj) && isset($obj[0]) && is_numeric($obj[0]) && strlen($obj) <= 20) {
 			try {
 				$date = new \DateTime($obj);
-				if ($date->format('Y-m-d H:i:s') == substr($obj, 0, 20) || $date->format('Y-m-d') == substr($obj, 0, 10)) $obj = $date;
-			}
-			catch (\Exception $e) {	//Doesn't need to do anything as the try/catch is working out whether $obj is a date
+				if ($date->format('Y-m-d H:i:s') == substr($obj, 0, 20) || $date->format('Y-m-d') == substr($obj, 0, 10)) {
+					$obj = $date;
+				}
+			} catch (\Exception $e) {	//Doesn't need to do anything as the try/catch is working out whether $obj is a date
 			}
 		}
 		return $obj;
 	}
 
 	private function checkCache($obj, $reset) {
-		if ($reset) $this->processCache = new \SplObjectStorage();
+		if ($reset) {
+			$this->processCache = new \SplObjectStorage();
+		}
 
-		if (is_object($obj) && $this->processCache->contains($obj)) return $obj;
-		else if (is_object($obj)) $this->processCache->attach($obj, true);
+		if (is_object($obj) && $this->processCache->contains($obj)) {
+			return $obj;
+		} else if (is_object($obj)) {
+			$this->processCache->attach($obj, true);
+		}
 
 		return false;
 	}

maphper/lib/propertywriter.php

Spacing +3 added lines, -3 removed lines

@@ -4,10 +4,10 @@ 
 	private $closure;
 	public function __construct($object) {
 		if ($object instanceof \stdclass) {
-			$this->closure = function ($field, $value) use ($object) { $object->$field = $value; };
+			$this->closure = function($field, $value) use ($object) { $object->$field = $value; };
 		}
 		else {
-			$this->closure = function ($field, $value) { $this->$field = $value; };
+			$this->closure = function($field, $value) { $this->$field = $value; };
 			$this->closure = $this->closure->bindTo($object, $object);
 		}
 	}
@@ -15,7 +15,7 @@ 
 	public function write($data) {
 		if ($data != null) {
 			foreach ($data as $key => $value) {
-				($this->closure)($key,  $this->processDates($value));
+				($this->closure)($key, $this->processDates($value));
 			}
 		}
 	}