Level-2 / Maphper

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;
 	}