Level-2 / Maphper

Maphper/Relation/ManyMany.php

Braces +9 added lines, -4 removed lines

@@ -32,8 +32,12 @@ 
 		list($relatedField, $valueField, $mapper) = $this->getOtherFieldNameInfo();
 		$this->results = $data;
 		$this->object = $parentObject;
-		if (!isset($parentObject->{$relatedField})) return;
-		foreach ($data as $dt) $this[] = $dt;
+		if (!isset($parentObject->{$relatedField})) {
+			return;
+		}
+		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.
@@ -88,8 +92,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/Maphper.php

Indentation +9 added lines, -9 removed lines

@@ -96,7 +96,7 @@ 
 		$value = $this->entity->wrap($this->relations, $value);
 		$this->dataSource->save($value);
 		$visibilityOverride->write($value);
-        $this->entity->create((array_merge((array)$value, (array)$valueCopy)), $this->relations);
+		$this->entity->create((array_merge((array)$value, (array)$valueCopy)), $this->relations);
 	}
 
 	private function removeRelations($obj, $pk) { // Prevent saving ManyMany twice except when pk isn't initially set
@@ -107,10 +107,10 @@ 
 
 	public function offsetExists($offset) {
 		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]);
-        }
+		if (!empty($this->settings['filter'])) {
+			$data = $this->dataSource->findByField(array_merge($this->settings['filter'], [$this->dataSource->getPrimaryKey()[0] => $offset]));
+			return isset($data[0]);
+		}
 		return (bool) $this->dataSource->findById($offset);
 	}
 
@@ -120,10 +120,10 @@ 
 
 	public function offsetGet($offset) {
 		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->entity->create(isset($data[0]) ? $data[0] : null, $this->relations);
-        }
+		if (!empty($this->settings['filter'])) {
+			$data = $this->dataSource->findByField(array_merge($this->settings['filter'], [$this->dataSource->getPrimaryKey()[0] => $offset]));
+			return $this->entity->create(isset($data[0]) ? $data[0] : null, $this->relations);
+		}
 		return $this->entity->create($this->dataSource->findById($offset), $this->relations);
 	}
 

Braces +28 added lines, -11 removed lines

@@ -60,7 +60,9 @@ 
 
 		$siblings = new \ArrayObject();
 
-		foreach ($results as &$result) $result = $this->entity->create($result, $this->relations, $siblings);
+		foreach ($results as &$result) {
+			$result = $this->entity->create($result, $this->relations, $siblings);
+		}
 
 		return $results;
 	}
@@ -77,13 +79,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
 		$visibilityOverride = new \Maphper\Lib\VisibilityOverride($valueObj);
@@ -91,7 +97,9 @@ 
 
 		$value = $this->processFilters($value);
 		$pk = $this->dataSource->getPrimaryKey();
-		if ($offset !== null) $value->{$pk[0]} = $offset;
+		if ($offset !== null) {
+			$value->{$pk[0]} = $offset;
+		}
 		$valueCopy = $this->removeRelations(clone $value, $pk);
 		$value = $this->entity->wrap($this->relations, $value);
 		$this->dataSource->save($value);
@@ -100,13 +108,16 @@ 
 	}
 
 	private function removeRelations($obj, $pk) { // Prevent saving ManyMany twice except when pk isn't initially set
-		foreach ($this->relations as $name => $relation)
-			if ($relation instanceOf \Maphper\Relation\ManyMany && isset($obj->$name) && isset($obj->{$pk[0]})) unset($obj->$name);
+		foreach ($this->relations as $name => $relation) {
+					if ($relation instanceOf \Maphper\Relation\ManyMany && isset($obj->$name) && isset($obj->{$pk[0]})) unset($obj->$name);
+		}
 		return $obj;
 	}
 
 	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]);
@@ -119,7 +130,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->entity->create(isset($data[0]) ? $data[0] : null, $this->relations);
@@ -130,11 +143,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) {