Level-2 / Maphper

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/Relation/One.php

Braces +20 added lines, -7 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();
 
@@ -41,8 +45,10 @@ 
 		$recordsToLoad = [];
 		//Get a list of records by FK to eager load
 		foreach ($this->siblings as $sibling) {
-			if ($sibling->parentField === $this->parentField) // Ensure that it is only loading records from the same type of relation
+			if ($sibling->parentField === $this->parentField) {
+				// Ensure that it is only loading records from the same type of relation
 				$recordsToLoad[] = $sibling->parentObject->{$sibling->parentField};
+			}
 		}
 
 		$recordsToLoad = array_unique($recordsToLoad);
@@ -59,7 +65,9 @@ 
 		}
 
 		foreach ($this->siblings as $sibling) {
-            if (isset($cache[$sibling->parentObject->{$this->parentField}])) $sibling->data = $cache[$sibling->parentObject->{$this->parentField}];
+            if (isset($cache[$sibling->parentObject->{$this->parentField}])) {
+            	$sibling->data = $cache[$sibling->parentObject->{$this->parentField}];
+            }
 		}
 		/*
 		foreach ($this->siblings as $sibling) {
@@ -70,13 +78,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/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 (empty($parentObject->{$relatedField})) return;
-		foreach ($data as $dt) $this[] = $dt;
+		if (empty($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/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/Lib/Sql/In.php

Braces +5 added lines, -2 removed lines

@@ -21,8 +21,11 @@
             $notText = ' NOT';
         }
 
-        if (count($inSql) == 0) return ['args' => [], 'sql' => ''];
-        else $sql = [$key . $notText . ' IN ( ' .  implode(', ', $inSql) . ')'];
+        if (count($inSql) == 0) {
+        	return ['args' => [], 'sql' => ''];
+        } else {
+        	$sql = [$key . $notText . ' IN ( ' .  implode(', ', $inSql) . ')'];
+        }
 
         return ['args' => $args, 'sql' => $sql];
     }

Maphper/Maphper.php

Braces +31 added lines, -12 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);
@@ -101,15 +109,20 @@ 
 	}
 
 	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) && !empty($obj->{$pk[0]})) unset($obj->$name);
+		foreach ($this->relations as $name => $relation) {
+					if ($relation instanceOf \Maphper\Relation\ManyMany && isset($obj->$name) && !empty($obj->{$pk[0]})) unset($obj->$name);
+		}
 
-		if (empty($obj->{$pk[0]})) unset($obj->{$pk[0]});
+		if (empty($obj->{$pk[0]})) {
+			unset($obj->{$pk[0]});
+		}
 		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]);
@@ -122,7 +135,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);
@@ -133,11 +148,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/DataSource/Mock.php

Braces +24 added lines, -11 removed lines

@@ -25,8 +25,12 @@ 
             list($columns, $order) = explode(' ', $options['order']);
             usort($filteredArray, $this->getOrderFunction($order, $columns));
         }
-        if (isset($options['offset'])) $filteredArray = array_slice($filteredArray, $options['offset']);
-        if (isset($options['limit'])) $filteredArray = array_slice($filteredArray, 0, $options['limit']);
+        if (isset($options['offset'])) {
+        	$filteredArray = array_slice($filteredArray, $options['offset']);
+        }
+        if (isset($options['limit'])) {
+        	$filteredArray = array_slice($filteredArray, 0, $options['limit']);
+        }
         return $filteredArray;
     }
 
@@ -40,23 +44,28 @@ 
 
   	public function deleteByField(array $fields, array $options) {
         foreach ($this->findByField($fields, $options) as $val) {
-            if (count($this->id) > 1) $id = $this->getMultiPkSaveId($val);
-            else $id = $val->{$this->id[0]};
+            if (count($this->id) > 1) {
+            	$id = $this->getMultiPkSaveId($val);
+            } else {
+            	$id = $val->{$this->id[0]};
+            }
 
             unset($this->data[$id]);
         }
     }
 
     public function save($data) {
-        if (count($this->id) > 1) return $this->saveMultiPk($data);
-        else return $this->saveSinglePk($data);
+        if (count($this->id) > 1) {
+        	return $this->saveMultiPk($data);
+        } else {
+        	return $this->saveSinglePk($data);
+        }
     }
 
     private function saveSinglePk($data) {
         if (isset($data->{$this->id[0]})) {
             $id = $data->{$this->id[0]};
-        }
-        else {
+        } else {
             $id = count($this->data);
             $data->{$this->id[0]} = $id;
         }
@@ -90,12 +99,16 @@ 
             if ($aColumn === $bColumn) {
               $sortVal = 0;
               continue;
+            } else {
+            	$sortVal = ($aColumn < $bColumn) ? -1 : 1;
             }
-            else $sortVal = ($aColumn < $bColumn) ? -1 : 1;
             break;
           }
-          if ($order === 'desc') return -$sortVal;
-          else return $sortVal;
+          if ($order === 'desc') {
+          	return -$sortVal;
+          } else {
+          	return $sortVal;
+          }
         };
     }
 }

Maphper/DataSource/DatabaseOptions.php

Braces +6 added lines, -2 removed lines

@@ -10,7 +10,9 @@ 
 	}
 
 	public function getAdapter() {
-		if ($this->db instanceof \Maphper\DataSource) return $this->db;
+		if ($this->db instanceof \Maphper\DataSource) {
+			return $this->db;
+		}
 
 		$adapter = '\\Maphper\\DataSource\\' . ucfirst($this->db->getAttribute(\PDO::ATTR_DRIVER_NAME)) . 'Adapter';
 
@@ -18,7 +20,9 @@ 
 	}
 
 	public function getEditMode() {
-		if (!isset($this->options['editmode'])) return false;
+		if (!isset($this->options['editmode'])) {
+			return false;
+		}
 
 		return $this->options['editmode'] === true ? Database::EDIT_STRUCTURE | Database::EDIT_INDEX | Database::EDIT_OPTIMISE : $this->options['editmode'];
 	}