Level-2 / Maphper

maphper/lib/dateinjector.php

Braces +25 added lines, -11 removed lines

@@ -6,19 +6,26 @@ 
 
 	public function replaceDates($obj, $reset = true) {
 		//prevent infinite recursion, only process each object once
-		if ($this->checkCache($obj, $reset)) return $obj;
-
-		if ($this->isIterable($obj)) foreach ($obj as &$o) $o = $this->replaceDates($o, false);
-		if ($this->isPossiblyDateString($obj)) $obj = $this->tryToGetDateObjFromString($obj);
+		if ($this->checkCache($obj, $reset)) {
+			return $obj;
+		}
+
+		if ($this->isIterable($obj)) {
+			foreach ($obj as &$o) $o = $this->replaceDates($o, false);
+		}
+		if ($this->isPossiblyDateString($obj)) {
+			$obj = $this->tryToGetDateObjFromString($obj);
+		}
 		return $obj;
 	}
 
     private function tryToGetDateObjFromString($obj) {
         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;
     }
@@ -32,11 +39,18 @@ 
     }
 
 	private function checkCache($obj, $reset) {
-		if ($reset) $this->processCache = new \SplObjectStorage();
-        if (!is_object($obj)) return false;
+		if ($reset) {
+			$this->processCache = new \SplObjectStorage();
+		}
+        if (!is_object($obj)) {
+        	return false;
+        }
 
-		if ($this->processCache->contains($obj)) return $obj;
-		else $this->processCache->attach($obj, true);
+		if ($this->processCache->contains($obj)) {
+			return $obj;
+		} else {
+			$this->processCache->attach($obj, true);
+		}
 
 		return false;
 	}

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/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 !(Maphper::FIND_OR & $mode);
         };
@@ -31,22 +34,31 @@ 
     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);
     }
 
     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/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/Sql/WhereBuilder.php

Braces +25 added lines, -10 removed lines

@@ -13,7 +13,9 @@ 
             'Maphper\Lib\Sql\GeneralOperator'
         ];
 
-        foreach ($defaultConditionals as $conditional) $this->addConditional(new $conditional);
+        foreach ($defaultConditionals as $conditional) {
+        	$this->addConditional(new $conditional);
+        }
     }
 
     public function addConditional(WhereConditional $conditional) {
@@ -27,7 +29,9 @@ 
         foreach ($fields as $key => $value) {
             $value = $this->convertDates($value);
 
-            if (is_object($value)) continue;
+            if (is_object($value)) {
+            	continue;
+            }
 			$result = $this->getResult($key, $value, $mode);
             $sql = array_merge($sql, (array)$result['sql']);
             $args = array_merge($args, $result['args']);
@@ -40,29 +44,40 @@ 
      * Either get sql from a conditional or call createSql again because the mode needs to be changed
      */
     private function getResult($key, $value, $mode) {
-        if (is_numeric($key) && is_array($value)) return $this->createSql($value, $key);
+        if (is_numeric($key) && is_array($value)) {
+        	return $this->createSql($value, $key);
+        }
         return $this->getConditional($key, $value, $mode);
     }
 
     private function sqlArrayToString($sql, $mode) {
-        if (\Maphper\Maphper::FIND_OR & $mode) $query = implode(' OR  ', $sql);
-		else $query = implode(' AND ', $sql);
-		if (!empty($query)) $query = '(' . $query . ')';
+        if (\Maphper\Maphper::FIND_OR & $mode) {
+        	$query = implode(' OR  ', $sql);
+        } else {
+			$query = implode(' AND ', $sql);
+		}
+		if (!empty($query)) {
+			$query = '(' . $query . ')';
+		}
         return $query;
     }
 
     private function getConditional($key, $value, $mode) {
         foreach ($this->conditionals as $conditional) {
-            if ($conditional->matches($key, $value, $mode))
-                return $conditional->getSql($key, $value, $mode);
+            if ($conditional->matches($key, $value, $mode)) {
+                            return $conditional->getSql($key, $value, $mode);
+            }
         }
         throw new \Exception("Invalid WHERE query");
     }
 
     private function convertDates($value) {
         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');
+            }
         }
         return $value;
     }