Level-2 / Maphper

maphper/maphper.php

Spacing +17 added lines, -17 removed lines

@@ -1,19 +1,19 @@ 
 <?php
 namespace Maphper;
 class Maphper implements \Countable, \ArrayAccess, \IteratorAggregate {
-	const FIND_EXACT 		= 	0x1;
-	const FIND_LIKE 		= 	0x2;
-	const FIND_STARTS 		= 	0x4;
-	const FIND_ENDS 		= 	0x8;
-	const FIND_BIT 			= 	0x10;
-	const FIND_GREATER 		= 	0x20;
-	const FIND_LESS 		=	0x40;
-	const FIND_EXPRESSION 	= 	0x80;
-	const FIND_AND 			= 	0x100;
-	const FIND_OR 			= 	0x200;
-	const FIND_NOT 			= 	0x400;
-	const FIND_BETWEEN		= 	0x800;
-	const FIND_NOCASE		= 	0x1000;
+	const FIND_EXACT = 0x1;
+	const FIND_LIKE 		= 0x2;
+	const FIND_STARTS = 0x4;
+	const FIND_ENDS 		= 0x8;
+	const FIND_BIT 			= 0x10;
+	const FIND_GREATER = 0x20;
+	const FIND_LESS 		= 0x40;
+	const FIND_EXPRESSION = 0x80;
+	const FIND_AND 			= 0x100;
+	const FIND_OR = 0x200;
+	const FIND_NOT 			= 0x400;
+	const FIND_BETWEEN = 0x800;
+	const FIND_NOCASE		= 0x1000;
 
 	private $dataSource;
 	private $relations = [];
@@ -54,7 +54,7 @@ 
 			}
 		}
 		$results = $this->dataSource->findByField($this->settings['filter'],
-			['order' => $this->settings['sort'], 'limit' => $this->settings['limit'], 'offset' => $this->settings['offset'] ]);
+			['order' => $this->settings['sort'], 'limit' => $this->settings['limit'], 'offset' => $this->settings['offset']]);
 
 		$siblings = new \ArrayObject();
 
@@ -94,7 +94,7 @@ 
 		$valueCopy = clone $value;
 		$value = $this->wrap($value);
 		$this->dataSource->save($value);
-		$value = $this->wrap((object) array_merge((array)$value, (array)$valueCopy));
+		$value = $this->wrap((object)array_merge((array)$value, (array)$valueCopy));
         $this->createNew($value, $valueObj);
 	}
 
@@ -104,7 +104,7 @@ 
             $data = $this->dataSource->findByField(array_merge($this->settings['filter'], [$this->dataSource->getPrimaryKey()[0] => $offset]));
             return isset($data[0]);
         }
-		return (bool) $this->dataSource->findById($offset);
+		return (bool)$this->dataSource->findById($offset);
 	}
 
 	public function offsetUnset($id) {
@@ -139,7 +139,7 @@ 
 	private function wrap($object, $key = null, $siblings = null) {
 		//see if any relations need overwriting
 		foreach ($this->relations as $name => $relation) {
-			if (isset($object->$name) && !($object->$name instanceof \Maphper\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;
 			}

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

Spacing +2 added lines, -2 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);
 		}
 	}

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);
 		}