Level-2 / Maphper

Maphper/Maphper.php

Braces +25 added lines, -9 removed lines

@@ -61,7 +61,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;
 	}
@@ -78,13 +80,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);
@@ -92,7 +98,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->entity->wrap($this->relations, $value);
 		$this->dataSource->save($value);
@@ -104,7 +112,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]);
@@ -117,7 +127,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);
@@ -128,11 +140,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/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/SelectBuilder.php

Braces +10 added lines, -4 removed lines

@@ -7,17 +7,23 @@
 
 		if (isset($options['offset'])) {
 			$offset = ' OFFSET ' . $options['offset'];
-			if (!$limit) $limit = ' LIMIT  1000';
+			if (!$limit) {
+				$limit = ' LIMIT  1000';
+			}
+		} else {
+			$offset = '';
 		}
-		else $offset = '';
 
 		$order = isset($options['order']) ? ' ORDER BY ' . $options['order'] : '';
 		return new Query('SELECT * FROM ' . $table . ' ' . $where . $order . $limit . $offset, $args);
 	}
 
 	public function aggregate($table, $function, $field, $where, $args, $group) {
-		if ($group == true) $groupBy = ' GROUP BY ' . $field;
-		else $groupBy = '';
+		if ($group == true) {
+			$groupBy = ' GROUP BY ' . $field;
+		} else {
+			$groupBy = '';
+		}
 		return new Query('SELECT ' . $function . '(' . $field . ') as val, ' . $field . '   FROM ' . $table . ($where != null ? ' WHERE ' . $where : '') . ' ' . $groupBy, $args);
 	}
 }

Maphper/Lib/VisibilityOverride.php

Braces +1 added lines, -2 removed lines

@@ -9,8 +9,7 @@
 		if ($object instanceof \stdclass) {
 			$this->readClosure = function() use ($object) { return $object;	};
 			$this->writeClosure = function ($field, $value) use ($object) { $object->$field = $value; };
-		}
-		else {
+		} else {
             $visOverride = $this;
 			$this->readClosure = function() use ($visOverride) {
                 return (object) array_filter(get_object_vars($this), [$visOverride, 'isReturnableDataType']);

Maphper/Lib/Entity.php

Braces +6 added lines, -2 removed lines

@@ -21,14 +21,18 @@
 
 	public function wrap($relations, $object, $siblings = []) {
 		//see if any relations need overwriting
-		foreach ($relations as $name => $relation) $this->addRelationData($object, $name, $relation, $siblings);
+		foreach ($relations as $name => $relation) {
+			$this->addRelationData($object, $name, $relation, $siblings);
+		}
 		return $object;
 	}
 
     private function addRelationData($object, $name, $relation, $siblings) {
         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->parent[] = $object;
+            if ($relation->overwrite($object, $object->$name)) {
+            	$this->parent[] = $object;
+            }
         }
 
         $object->$name = $relation->getData($object, $siblings);

Maphper/Lib/CrudBuilder.php

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

Maphper/Lib/ArrayFilter.php

Braces +26 added lines, -14 removed lines

@@ -21,8 +21,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 (bool)(Maphper::FIND_OR ^ $mode);
         };
@@ -31,12 +34,13 @@ 
     private function getIfFieldMatches($key, $val, $data, $mode) {
         if ($this->shouldRunDeepSearch($key, $val)) {
             return $this->getSearchFieldFunction($val, $key)($data);
+        } else if (!isset($data->$key)) {
+        	return false;
+        } else if ($this->isInArraySearch($mode, $key, $val)) {
+                    return in_array($data->$key, $val);
+        } else {
+                    return $this->processFilter($mode, $val, $data->$key);
         }
-        else if (!isset($data->$key)) return false;
-        else if ($this->isInArraySearch($mode, $key, $val))
-            return in_array($data->$key, $val);
-        else
-            return $this->processFilter($mode, $val, $data->$key);
     }
 
     private function shouldRunDeepSearch($key, $val) {
@@ -48,13 +52,21 @@ 
     }
 
     private function processFilter($mode, $expected, $actual) {
-        if (Maphper::FIND_NOT & $mode) return $expected != $actual;
-        else if ((Maphper::FIND_GREATER | Maphper::FIND_EXACT) === $mode) return $expected <= $actual;
-        else if ((Maphper::FIND_LESS | 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 | Maphper::FIND_EXACT) === $mode) {
+        	return $expected <= $actual;
+        } else if ((Maphper::FIND_LESS | 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/Lib/Sql/NullConditional.php

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
 
     public function getSql($key, $value, $mode) {
         $nullSql = $key . ' IS ';
-        if (\Maphper\Maphper::FIND_NOT & $mode) $nullSql .= 'NOT ';
+        if (\Maphper\Maphper::FIND_NOT & $mode) {
+        	$nullSql .= 'NOT ';
+        }
         $sql = [$nullSql . 'NULL'];
 
         return ['args' => [], 'sql' => $sql];

Maphper/Lib/Sql/In.php

Braces +5 added lines, -2 removed lines

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