Level-2 / Maphper

maphper/datasource/mock.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     }
 
     private function getSearchFieldFunction($fields, $mode) {
-        return function ($data) use ($fields, $mode) {
+        return function($data) use ($fields, $mode) {
             foreach ($fields as $key => $val) {
                 $currentFieldResult = $this->getIfFieldMatches($key, $val, $data, $mode);
 

Indentation +90 added lines, -90 removed lines

@@ -2,112 +2,112 @@
 namespace Maphper\DataSource;
 use Maphper\Maphper;
 class Mock implements \Maphper\DataSource {
-    private $data;
-    private $id;
+	private $data;
+	private $id;
 
-    public function __construct(\ArrayObject $data, $id) {
-        $this->data = $data;
-        $this->id = is_array($id) ? $id : [$id];
-    }
+	public function __construct(\ArrayObject $data, $id) {
+		$this->data = $data;
+		$this->id = is_array($id) ? $id : [$id];
+	}
 
-    public function getPrimaryKey() {
-        return $this->id;
-    }
+	public function getPrimaryKey() {
+		return $this->id;
+	}
 
-    public function findById($id) {
-        return isset($this->data[$id]) ? (array)$this->data[$id] : [];
-    }
+	public function findById($id) {
+		return isset($this->data[$id]) ? (array)$this->data[$id] : [];
+	}
 
-    public function findByField(array $fields, $options = []) {
-        $array = iterator_to_array($this->data->getIterator());
-        $filteredArray = array_filter($array, $this->getSearchFieldFunction($fields, \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND));
-        // Need to reset indexes
-        $filteredArray = array_values($filteredArray);
-        if (isset($options['order'])) {
-            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']);
-        return $filteredArray;
-    }
+	public function findByField(array $fields, $options = []) {
+		$array = iterator_to_array($this->data->getIterator());
+		$filteredArray = array_filter($array, $this->getSearchFieldFunction($fields, \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND));
+		// Need to reset indexes
+		$filteredArray = array_values($filteredArray);
+		if (isset($options['order'])) {
+			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']);
+		return $filteredArray;
+	}
 
-    private function getSearchFieldFunction($fields, $mode) {
-        return function ($data) use ($fields, $mode) {
-            foreach ($fields as $key => $val) {
-                $currentFieldResult = $this->getIfFieldMatches($key, $val, $data, $mode);
+	private function getSearchFieldFunction($fields, $mode) {
+		return function ($data) use ($fields, $mode) {
+			foreach ($fields as $key => $val) {
+				$currentFieldResult = $this->getIfFieldMatches($key, $val, $data, $mode);
 
-                if (Maphper::FIND_OR & $mode && $currentFieldResult === true) return true;
-                else if (!(Maphper::FIND_OR & $mode) && $currentFieldResult === false) return false;
-            }
-            return !(Maphper::FIND_OR & $mode);
-        };
-    }
+				if (Maphper::FIND_OR & $mode && $currentFieldResult === true) return true;
+				else if (!(Maphper::FIND_OR & $mode) && $currentFieldResult === false) return false;
+			}
+			return !(Maphper::FIND_OR & $mode);
+		};
+	}
 
-    private function getIfFieldMatches($key, $val, $data, $mode) {
-        if (is_numeric($key) && is_array($val)) {
-            return $this->getSearchFieldFunction($val, $key)($data);
-        }
-        else if (!isset($data->$key)) return false;
-        else if (!(Maphper::FIND_BETWEEN & $mode) && !is_numeric($key) && is_array($val))
-            return in_array($data->$key, $val);
-        else
-            return $this->processFilter($mode, $val, $data->$key);
-    }
+	private function getIfFieldMatches($key, $val, $data, $mode) {
+		if (is_numeric($key) && is_array($val)) {
+			return $this->getSearchFieldFunction($val, $key)($data);
+		}
+		else if (!isset($data->$key)) return false;
+		else if (!(Maphper::FIND_BETWEEN & $mode) && !is_numeric($key) && is_array($val))
+			return in_array($data->$key, $val);
+		else
+			return $this->processFilter($mode, $val, $data->$key);
+	}
 
   	public function findAggregate($function, $field, $group = null, array $criteria = [], array $options = []) {
-        return $function($this->findByField($criteria));
-    }
+		return $function($this->findByField($criteria));
+	}
 
   	public function deleteById($id) {
-        unset($this->data[$id]);
-    }
+		unset($this->data[$id]);
+	}
 
   	public function deleteByField(array $fields, array $options) {
-        foreach ($this->findByField($fields, $options) as $val) unset($this->data[$val->{$this->id[0]}]);
-    }
+		foreach ($this->findByField($fields, $options) as $val) unset($this->data[$val->{$this->id[0]}]);
+	}
 
-    public function save($data) {
-        if (isset($data->{$this->id[0]})) {
-            $id = $data->{$this->id[0]};
-        }
-        else {
-            $id = count($this->data);
-            $data->{$this->id[0]} = $id;
-        }
+	public function save($data) {
+		if (isset($data->{$this->id[0]})) {
+			$id = $data->{$this->id[0]};
+		}
+		else {
+			$id = count($this->data);
+			$data->{$this->id[0]} = $id;
+		}
 
-        $this->data[$id] = (object)array_merge($this->findById($id), (array)$data);
-    }
+		$this->data[$id] = (object)array_merge($this->findById($id), (array)$data);
+	}
 
-    public function getErrors() {
-        return [];
-    }
+	public function getErrors() {
+		return [];
+	}
 
-    private function getOrderFunction($order, $columns) {
-        return function($a, $b) use ($order, $columns) {
-          foreach (explode(',', $columns) as $column) {
-            $aColumn = $a->$column;
-            $bColumn = $b->$column;
-            if ($aColumn === $bColumn) {
-              $sortVal = 0;
-              continue;
-            }
-            else $sortVal = ($aColumn < $bColumn) ? -1 : 1;
-            break;
-          }
-          if ($order === 'desc') return -$sortVal;
-          else return $sortVal;
-        };
-    }
+	private function getOrderFunction($order, $columns) {
+		return function($a, $b) use ($order, $columns) {
+		  foreach (explode(',', $columns) as $column) {
+			$aColumn = $a->$column;
+			$bColumn = $b->$column;
+			if ($aColumn === $bColumn) {
+			  $sortVal = 0;
+			  continue;
+			}
+			else $sortVal = ($aColumn < $bColumn) ? -1 : 1;
+			break;
+		  }
+		  if ($order === 'desc') return -$sortVal;
+		  else return $sortVal;
+		};
+	}
 
-    private function processFilter($mode, $expected, $actual) {
-        if (Maphper::FIND_NOT & $mode) return $expected != $actual;
-        else if (Maphper::FIND_GREATER & $mode && Maphper::FIND_EXACT & $mode) return $expected <= $actual;
-        else if (Maphper::FIND_LESS & $mode && Maphper::FIND_EXACT & $mode) return $expected >= $actual;
-        else if (Maphper::FIND_GREATER & $mode) return $expected < $actual;
-        else if (Maphper::FIND_LESS & $mode) return $expected > $actual;
-        else if (Maphper::FIND_BETWEEN & $mode) return $expected[0] <= $actual && $actual <= $expected[1];
-        else if (Maphper::FIND_NOCASE & $mode) return strtolower($expected) == strtolower($actual);
-        return $expected == $actual;
-    }
+	private function processFilter($mode, $expected, $actual) {
+		if (Maphper::FIND_NOT & $mode) return $expected != $actual;
+		else if (Maphper::FIND_GREATER & $mode && Maphper::FIND_EXACT & $mode) return $expected <= $actual;
+		else if (Maphper::FIND_LESS & $mode && Maphper::FIND_EXACT & $mode) return $expected >= $actual;
+		else if (Maphper::FIND_GREATER & $mode) return $expected < $actual;
+		else if (Maphper::FIND_LESS & $mode) return $expected > $actual;
+		else if (Maphper::FIND_BETWEEN & $mode) return $expected[0] <= $actual && $actual <= $expected[1];
+		else if (Maphper::FIND_NOCASE & $mode) return strtolower($expected) == strtolower($actual);
+		return $expected == $actual;
+	}
 }

Braces +43 added lines, -22 removed lines

@@ -27,8 +27,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;
     }
 
@@ -37,8 +41,11 @@ 
             foreach ($fields as $key => $val) {
                 $currentFieldResult = $this->getIfFieldMatches($key, $val, $data, $mode);
 
-                if (Maphper::FIND_OR & $mode && $currentFieldResult === true) return true;
-                else if (!(Maphper::FIND_OR & $mode) && $currentFieldResult === false) return false;
+                if (Maphper::FIND_OR & $mode && $currentFieldResult === true) {
+                	return true;
+                } else if (!(Maphper::FIND_OR & $mode) && $currentFieldResult === false) {
+                	return false;
+                }
             }
             return !(Maphper::FIND_OR & $mode);
         };
@@ -47,12 +54,13 @@ 
     private function getIfFieldMatches($key, $val, $data, $mode) {
         if (is_numeric($key) && is_array($val)) {
             return $this->getSearchFieldFunction($val, $key)($data);
+        } else if (!isset($data->$key)) {
+        	return false;
+        } else if (!(Maphper::FIND_BETWEEN & $mode) && !is_numeric($key) && is_array($val)) {
+                    return in_array($data->$key, $val);
+        } else {
+                    return $this->processFilter($mode, $val, $data->$key);
         }
-        else if (!isset($data->$key)) return false;
-        else if (!(Maphper::FIND_BETWEEN & $mode) && !is_numeric($key) && is_array($val))
-            return in_array($data->$key, $val);
-        else
-            return $this->processFilter($mode, $val, $data->$key);
     }
 
   	public function findAggregate($function, $field, $group = null, array $criteria = [], array $options = []) {
@@ -64,14 +72,15 @@ 
     }
 
   	public function deleteByField(array $fields, array $options) {
-        foreach ($this->findByField($fields, $options) as $val) unset($this->data[$val->{$this->id[0]}]);
+        foreach ($this->findByField($fields, $options) as $val) {
+        	unset($this->data[$val->{$this->id[0]}]);
+        }
     }
 
     public function save($data) {
         if (isset($data->{$this->id[0]})) {
             $id = $data->{$this->id[0]};
-        }
-        else {
+        } else {
             $id = count($this->data);
             $data->{$this->id[0]} = $id;
         }
@@ -91,23 +100,35 @@ 
             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;
+          }
         };
     }
 
     private function processFilter($mode, $expected, $actual) {
-        if (Maphper::FIND_NOT & $mode) return $expected != $actual;
-        else if (Maphper::FIND_GREATER & $mode && Maphper::FIND_EXACT & $mode) return $expected <= $actual;
-        else if (Maphper::FIND_LESS & $mode && Maphper::FIND_EXACT & $mode) return $expected >= $actual;
-        else if (Maphper::FIND_GREATER & $mode) return $expected < $actual;
-        else if (Maphper::FIND_LESS & $mode) return $expected > $actual;
-        else if (Maphper::FIND_BETWEEN & $mode) return $expected[0] <= $actual && $actual <= $expected[1];
-        else if (Maphper::FIND_NOCASE & $mode) return strtolower($expected) == strtolower($actual);
+        if (Maphper::FIND_NOT & $mode) {
+        	return $expected != $actual;
+        } else if (Maphper::FIND_GREATER & $mode && Maphper::FIND_EXACT & $mode) {
+        	return $expected <= $actual;
+        } else if (Maphper::FIND_LESS & $mode && Maphper::FIND_EXACT & $mode) {
+        	return $expected >= $actual;
+        } else if (Maphper::FIND_GREATER & $mode) {
+        	return $expected < $actual;
+        } else if (Maphper::FIND_LESS & $mode) {
+        	return $expected > $actual;
+        } else if (Maphper::FIND_BETWEEN & $mode) {
+        	return $expected[0] <= $actual && $actual <= $expected[1];
+        } else if (Maphper::FIND_NOCASE & $mode) {
+        	return strtolower($expected) == strtolower($actual);
+        }
         return $expected == $actual;
     }
 }

maphper/iterator.php

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
 		if (count($this->pk) == 1) {
 			$pk = end($this->pk);
 			return $this->array[$this->iterator]->$pk;
-		}
-		else {
+		} else {
 			$current = $this->current();
 			return array_map(function($pkName) use ($current) {
 				return $current->$pkName;

maphper/lib/crudbuilder.php

Spacing +5 added lines, -5 removed lines

@@ -19,11 +19,11 @@ 
 			//For dates with times set, search on time, if the time is not set, search on date only.
 			//E.g. searching for all records posted on '2015-11-14' should return all records that day, not just the ones posted at 00:00:00 on that day
 			if ($value instanceof \DateTime) {
-				if ($value->format('H:i:s')  == '00:00:00') $value = $value->format('Y-m-d');
+				if ($value->format('H:i:s') == '00:00:00') $value = $value->format('Y-m-d');
 				else $value = $value->format('Y-m-d H:i:s');
 			}
 			if (is_object($value)) continue;
-			if ($prependField){
+			if ($prependField) {
 				$sql[] = $this->quote($field) . ' = :' . $field;
 			} else {
 				$sql[] = ':' . $field;
@@ -35,13 +35,13 @@ 
 
 	public function insert($table, $data) {
 		$query = $this->buildSaveQuery($data);
-		return new Query('INSERT INTO ' . $this->quote($table) . ' (' .implode(', ', array_keys($query['args'])).') VALUES ( ' . implode(', ', $query['sql']). ' )', $query['args']);
+		return new Query('INSERT INTO ' . $this->quote($table) . ' (' . implode(', ', array_keys($query['args'])) . ') VALUES ( ' . implode(', ', $query['sql']) . ' )', $query['args']);
 	}
 
 	public function update($table, array $primaryKey, $data) {
 		$query = $this->buildSaveQuery($data, true);
 		$where = [];
-		foreach($primaryKey as $field) $where[] = $this->quote($field) . ' = :' . $field;
-		return new Query('UPDATE ' . $this->quote($table) . ' SET ' . implode(', ', $query['sql']). ' WHERE '. implode(' AND ', $where), $query['args']);
+		foreach ($primaryKey as $field) $where[] = $this->quote($field) . ' = :' . $field;
+		return new Query('UPDATE ' . $this->quote($table) . ' SET ' . implode(', ', $query['sql']) . ' WHERE ' . implode(' AND ', $where), $query['args']);
 	}
 }

Braces +11 added lines, -4 removed lines

@@ -19,10 +19,15 @@ 
 			//For dates with times set, search on time, if the time is not set, search on date only.
 			//E.g. searching for all records posted on '2015-11-14' should return all records that day, not just the ones posted at 00:00:00 on that day
 			if ($value instanceof \DateTime) {
-				if ($value->format('H:i:s')  == '00:00:00') $value = $value->format('Y-m-d');
-				else $value = $value->format('Y-m-d H:i:s');
+				if ($value->format('H:i:s')  == '00:00:00') {
+					$value = $value->format('Y-m-d');
+				} else {
+					$value = $value->format('Y-m-d H:i:s');
+				}
+			}
+			if (is_object($value)) {
+				continue;
 			}
-			if (is_object($value)) continue;
 			if ($prependField){
 				$sql[] = $this->quote($field) . ' = :' . $field;
 			} else {
@@ -41,7 +46,9 @@ 
 	public function update($table, array $primaryKey, $data) {
 		$query = $this->buildSaveQuery($data, true);
 		$where = [];
-		foreach($primaryKey as $field) $where[] = $this->quote($field) . ' = :' . $field;
+		foreach($primaryKey as $field) {
+			$where[] = $this->quote($field) . ' = :' . $field;
+		}
 		return new Query('UPDATE ' . $this->quote($table) . ' SET ' . implode(', ', $query['sql']). ' WHERE '. implode(' AND ', $where), $query['args']);
 	}
 }

Indentation +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 	public function delete($table, $criteria, $args, $limit = null, $offset = null, $order = null) {
 		$limit = $limit ? ' LIMIT ' . $limit : '';
 		$offset = $offset ? ' OFFSET ' . $offset : '';
-        $order = $order ? ' ORDER BY ' . $order : '';
+		$order = $order ? ' ORDER BY ' . $order : '';
 		return new Query('DELETE FROM ' . $table . ' WHERE ' . ($criteria ?: '1 = 1 ') . $order . $limit . $offset, $args);
 	}
 

maphper/multipk.php

Spacing +3 added lines, -3 removed lines

@@ -24,8 +24,8 @@ 
 	}
 
 	public function offsetGet($key) {
-		$depth = $this->getDepth()+1;
-		if (count($this->primaryKey)-1 == $depth) return $this->mapper->filter([$this->primaryKey[$depth] => $key])->item(0);
+		$depth = $this->getDepth() + 1;
+		if (count($this->primaryKey) - 1 == $depth) return $this->mapper->filter([$this->primaryKey[$depth] => $key])->item(0);
 		else return new MultiPk($this->mapper, $key, $this->primaryKey, $this);
 	}
 
@@ -44,7 +44,7 @@ 
 
 	public function offsetUnset($key) {
 		$keys = $this->primaryKey;
-		$this->mapper->filter([ array_pop($keys) => $key])->delete();
+		$this->mapper->filter([array_pop($keys) => $key])->delete();
 	}
 
 	public function offsetExists($key) {

Braces +5 added lines, -2 removed lines

@@ -25,8 +25,11 @@
 
 	public function offsetGet($key) {
 		$depth = $this->getDepth()+1;
-		if (count($this->primaryKey)-1 == $depth) return $this->mapper->filter([$this->primaryKey[$depth] => $key])->item(0);
-		else return new MultiPk($this->mapper, $key, $this->primaryKey, $this);
+		if (count($this->primaryKey)-1 == $depth) {
+			return $this->mapper->filter([$this->primaryKey[$depth] => $key])->item(0);
+		} else {
+			return new MultiPk($this->mapper, $key, $this->primaryKey, $this);
+		}
 	}
 
 	public function offsetSet($key, $value) {

Indentation +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 	private $parent;
 	private $primaryKey;
 	private $lookup;
-    private $mapper;
+	private $mapper;
 
 	public function __construct(Maphper $mapper, $lookup, array $primaryKey, MultiPk $parent = null) {
 		$this->parent = $parent;

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

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
 	//bit hacky, breaking encapsulation, but simplest way to work out the info for the other side of the many:many relationship.
 	private function getOtherFieldNameInfo() {
 		if ($this->otherInfo == null) {
-			$propertyReader = function($name) {return $this->$name;	};
+			$propertyReader = function($name) {return $this->$name; };
 
 			$reader = $propertyReader->bindTo($this->intermediateMapper, $this->intermediateMapper);
 
@@ -45,7 +45,7 @@ 
 				$propertyReader = $propertyReader->bindTo($relation, $relation);
 				if ($propertyReader('parentField') != $this->parentField) {
 					$relation = $relation->getData($this->object);
-					$this->otherInfo = [$propertyReader('localField'),  $propertyReader('parentField'), $propertyReader('mapper')];
+					$this->otherInfo = [$propertyReader('localField'), $propertyReader('parentField'), $propertyReader('mapper')];
 				}
 			}
 		}
@@ -88,7 +88,7 @@ 
 		list($relatedField, $valueField, $mapper) = $this->getOtherFieldNameInfo();
 		if ($this->autoTraverse) {
 			$record = new \stdClass;
-			$record->{$this->parentField} =  $value->{$this->localField};
+			$record->{$this->parentField} = $value->{$this->localField};
 			$record->$valueField = $this->object->{$relatedField};
 			$this->intermediateMapper[] = $record;
 

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

Indentation +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 
 	public function __get($name) {
 		if ($this->lazyLoad()) return $this->lazyLoad()->$name;
-        else return null;
+		else return null;
 	}
 
 	public function __isset($name) {

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

Indentation +4 added lines, -4 removed lines

@@ -7,17 +7,17 @@
   private $intermediateName;
 
   public function __construct(\Maphper\Iterator $iterator, $intermediateName = null) {
-    $this->iterator = $iterator;
-    $this->intermediateName = $intermediateName;
+	$this->iterator = $iterator;
+	$this->intermediateName = $intermediateName;
   }
 
   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();
 	}
 
 	public function key() {
-    return $this->iterator->key();
+	return $this->iterator->key();
 	}
 
 	public function next() {

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/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)) return $obj;
+		if ($this->checkCache($obj, $reset)) {
+			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;
 	}