Level-2 / Maphper

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/Like.php

Braces +6 added lines, -2 removed lines

@@ -16,8 +16,12 @@
     }
 
     private function getValue($value, $mode) {
-        if ((Maphper::FIND_LIKE | Maphper::FIND_ENDS) & $mode) $value = '%' . $value;
-        if ((Maphper::FIND_LIKE | Maphper::FIND_STARTS) & $mode) $value .= '%';
+        if ((Maphper::FIND_LIKE | Maphper::FIND_ENDS) & $mode) {
+        	$value = '%' . $value;
+        }
+        if ((Maphper::FIND_LIKE | Maphper::FIND_STARTS) & $mode) {
+        	$value .= '%';
+        }
         return $value;
     }
 }

Maphper/Lib/Sql/GeneralOperator.php

Braces +13 added lines, -5 removed lines

@@ -16,8 +16,11 @@ 
     }
 
     private function getOperator($mode) {
-        if (\Maphper\Maphper::FIND_BIT & $mode) return '&';
-        else if (\Maphper\Maphper::FIND_NOT & $mode) return '!=';
+        if (\Maphper\Maphper::FIND_BIT & $mode) {
+        	return '&';
+        } else if (\Maphper\Maphper::FIND_NOT & $mode) {
+        	return '!=';
+        }
 
         return $this->getEqualsOperators($mode);
     }
@@ -25,10 +28,15 @@ 
     private function getEqualsOperators($mode) {
         $operator = "";
 
-        if (\Maphper\Maphper::FIND_GREATER & $mode) $operator = '>';
-        else if (\Maphper\Maphper::FIND_LESS & $mode) $operator = '<';
+        if (\Maphper\Maphper::FIND_GREATER & $mode) {
+        	$operator = '>';
+        } else if (\Maphper\Maphper::FIND_LESS & $mode) {
+        	$operator = '<';
+        }
 
-        if (\Maphper\Maphper::FIND_EXACT & $mode) $operator .= '=';
+        if (\Maphper\Maphper::FIND_EXACT & $mode) {
+        	$operator .= '=';
+        }
 
         return $operator;
     }

Maphper/Lib/Sql/WhereBuilder.php

Braces +28 added lines, -11 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);
             $result = $this->fixDuplicateArgs($args, $result);
             $sql = array_merge($sql, (array)$result['sql']);
@@ -40,7 +44,9 @@ 
     // Returns result with duplicate issues removed
     private function fixDuplicateArgs($origArgs, $result) {
         $duplicates = array_intersect_key($result['args'], $origArgs); // Holds all keys in results already in the args
-        if (count($duplicates) === 0) return $result;
+        if (count($duplicates) === 0) {
+        	return $result;
+        }
 
         foreach ($duplicates as $argKey => $argVal) {
             $valHash = substr(md5($argVal), 0, 5);
@@ -59,29 +65,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 \DateTimeInterface) {
-            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;
     }

Maphper/Lib/DateInjector.php

Braces +27 added lines, -11 removed lines

@@ -11,26 +11,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 ($this->isIterable($obj)) foreach ($obj as &$o) $o = $this->replaceDates($o, false);
-		if ($this->isPossiblyDateString($obj)) $obj = $this->tryToGetDateObjFromString($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 ($this->dateMatchesFormats($date, $obj)) $obj = $date;
-        }
-        catch (\Exception $e) {	//Doesn't need to do anything as the try/catch is working out whether $obj is a date
+			if ($this->dateMatchesFormats($date, $obj)) {
+				$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 dateMatchesFormats($date, $str) {
 		foreach ($this->dateFormats as list($format, $len)) {
-			if ($date->format($format) == substr($str, 0, $len)) return true;
+			if ($date->format($format) == substr($str, 0, $len)) {
+				return true;
+			}
 		}
 		return false;
 	}
@@ -44,11 +53,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;
 	}