Level-2 / Maphper

Maphper/Lib/Entity.php

Indentation +8 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
 	private $parent;
 
 	public function __construct(\Maphper\Maphper $parent, $className = null) {
-        $this->parent = $parent;
+		$this->parent = $parent;
 		$this->className = $className;
 	}
 
@@ -25,12 +25,12 @@ 
 		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;
-        }
+	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;
+		}
 
-        $object->$name = $relation->getData($object, $siblings);
-    }
+		$object->$name = $relation->getData($object, $siblings);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 	}
 
     private function addRelationData($object, $name, $relation, $siblings) {
-        if (isset($object->$name) && !($object->$name instanceof \Maphper\Relation) ) {
+        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;
         }

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

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

Spacing +5 added lines, -5 removed lines

@@ -20,11 +20,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 \DateTimeInterface) {
-				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;
@@ -36,13 +36,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

@@ -20,10 +20,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 \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');
+				}
+			}
+			if (is_object($value)) {
+				continue;
 			}
-			if (is_object($value)) continue;
 			if ($prependField){
 				$sql[] = $this->quote($field) . ' = :' . $field;
 			} else {
@@ -42,7 +47,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

Indentation +54 added lines, -54 removed lines

@@ -3,58 +3,58 @@
 use Maphper\Maphper;
 
 class ArrayFilter {
-    private $array;
-
-    public function __construct(array $array) {
-        $this->array = $array;
-    }
-
-    public function filter($fields) {
-        $filteredArray = array_filter($this->array, $this->getSearchFieldFunction($fields, \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND));
-        // Need to reset indexes
-        $filteredArray = array_values($filteredArray);
-        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);
-
-                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);
-        };
-    }
-
-    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);
-    }
-
-    private function shouldRunDeepSearch($key, $val) {
-        return is_numeric($key) && is_array($val);
-    }
-
-    private function isInArraySearch($mode, $key, $val) {
-        return !(Maphper::FIND_BETWEEN & $mode) && !is_numeric($key) && is_array($val);
-    }
-
-    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);
-        return $expected == $actual;
-    }
+	private $array;
+
+	public function __construct(array $array) {
+		$this->array = $array;
+	}
+
+	public function filter($fields) {
+		$filteredArray = array_filter($this->array, $this->getSearchFieldFunction($fields, \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND));
+		// Need to reset indexes
+		$filteredArray = array_values($filteredArray);
+		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);
+
+				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);
+		};
+	}
+
+	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);
+	}
+
+	private function shouldRunDeepSearch($key, $val) {
+		return is_numeric($key) && is_array($val);
+	}
+
+	private function isInArraySearch($mode, $key, $val) {
+		return !(Maphper::FIND_BETWEEN & $mode) && !is_numeric($key) && is_array($val);
+	}
+
+	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);
+		return $expected == $actual;
+	}
 }

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

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

Indentation +9 added lines, -9 removed lines

@@ -2,15 +2,15 @@
 namespace Maphper\Lib\Sql;
 
 class NullConditional implements WhereConditional {
-    public function matches($key, $value, $mode) {
-        return $value === NULL;
-    }
+	public function matches($key, $value, $mode) {
+		return $value === NULL;
+	}
 
-    public function getSql($key, $value, $mode) {
-        $nullSql = $key . ' IS ';
-        if (\Maphper\Maphper::FIND_NOT & $mode) $nullSql .= 'NOT ';
-        $sql = [$nullSql . 'NULL'];
+	public function getSql($key, $value, $mode) {
+		$nullSql = $key . ' IS ';
+		if (\Maphper\Maphper::FIND_NOT & $mode) $nullSql .= 'NOT ';
+		$sql = [$nullSql . 'NULL'];
 
-        return ['args' => [], 'sql' => $sql];
-    }
+		return ['args' => [], 'sql' => $sql];
+	}
 }

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

Indentation +2 added lines, -2 removed lines

@@ -2,6 +2,6 @@
 namespace Maphper\Lib\Sql;
 
 interface WhereConditional {
-    public function matches($key, $value, $mode);
-    public function getSql($key, $value, $mode);
+	public function matches($key, $value, $mode);
+	public function getSql($key, $value, $mode);
 }

Maphper/Lib/Sql/Between.php

Indentation +15 added lines, -15 removed lines

@@ -2,20 +2,20 @@
 namespace Maphper\Lib\Sql;
 
 class Between implements WhereConditional {
-    public function matches($key, $value, $mode) {
-        return is_array($value) && \Maphper\Maphper::FIND_BETWEEN & $mode;
-    }
+	public function matches($key, $value, $mode) {
+		return is_array($value) && \Maphper\Maphper::FIND_BETWEEN & $mode;
+	}
 
-    public function getSql($key, $value, $mode) {
-        return [
-            'sql' => [
-                $key . '>= :' . $key . 'from',
-                $key . ' <= :' . $key . 'to'
-            ],
-            'args' => [
-                $key . 'from' => $value[0],
-                $key . 'to' => $value[1]
-            ]
-        ];
-    }
+	public function getSql($key, $value, $mode) {
+		return [
+			'sql' => [
+				$key . '>= :' . $key . 'from',
+				$key . ' <= :' . $key . 'to'
+			],
+			'args' => [
+				$key . 'from' => $value[0],
+				$key . 'to' => $value[1]
+			]
+		];
+	}
 }

Maphper/Lib/Sql/Like.php

Indentation +15 added lines, -15 removed lines

@@ -3,21 +3,21 @@
 use Maphper\Maphper;
 
 class Like implements WhereConditional {
-    public function matches($key, $value, $mode) {
-        return (Maphper::FIND_LIKE | Maphper::FIND_STARTS |
-                Maphper::FIND_ENDS | Maphper::FIND_NOCASE) & $mode;
-    }
+	public function matches($key, $value, $mode) {
+		return (Maphper::FIND_LIKE | Maphper::FIND_STARTS |
+				Maphper::FIND_ENDS | Maphper::FIND_NOCASE) & $mode;
+	}
 
-    public function getSql($key, $value, $mode) {
-        return [
-            'sql' => [$key . ' LIKE :' . $key],
-            'args' => [$key => $this->getValue($value, $mode)]
-        ];
-    }
+	public function getSql($key, $value, $mode) {
+		return [
+			'sql' => [$key . ' LIKE :' . $key],
+			'args' => [$key => $this->getValue($value, $mode)]
+		];
+	}
 
-    private function getValue($value, $mode) {
-        if ((Maphper::FIND_LIKE | Maphper::FIND_ENDS) & $mode) $value = '%' . $value;
-        if ((Maphper::FIND_LIKE | Maphper::FIND_STARTS) & $mode) $value .= '%';
-        return $value;
-    }
+	private function getValue($value, $mode) {
+		if ((Maphper::FIND_LIKE | Maphper::FIND_ENDS) & $mode) $value = '%' . $value;
+		if ((Maphper::FIND_LIKE | Maphper::FIND_STARTS) & $mode) $value .= '%';
+		return $value;
+	}
 }

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

Indentation +22 added lines, -22 removed lines

@@ -3,33 +3,33 @@
 use Maphper\Maphper;
 
 class GeneralOperator implements WhereConditional {
-    public function matches($key, $value, $mode) {
-        return (Maphper::FIND_BIT ^ Maphper::FIND_GREATER ^ Maphper::FIND_LESS ^ Maphper::FIND_NOT & $mode)
-                || Maphper::FIND_EXACT & $mode;
-    }
+	public function matches($key, $value, $mode) {
+		return (Maphper::FIND_BIT ^ Maphper::FIND_GREATER ^ Maphper::FIND_LESS ^ Maphper::FIND_NOT & $mode)
+				|| Maphper::FIND_EXACT & $mode;
+	}
 
-    public function getSql($key, $value, $mode) {
-        return [
-            'sql' => [$key . ' ' . $this->getOperator($mode) . ' :' . $key],
-            'args' => [$key => $value]
-        ];
-    }
+	public function getSql($key, $value, $mode) {
+		return [
+			'sql' => [$key . ' ' . $this->getOperator($mode) . ' :' . $key],
+			'args' => [$key => $value]
+		];
+	}
 
-    private function getOperator($mode) {
-        if (\Maphper\Maphper::FIND_BIT & $mode) return '&';
-        else if (\Maphper\Maphper::FIND_NOT & $mode) return '!=';
+	private function getOperator($mode) {
+		if (\Maphper\Maphper::FIND_BIT & $mode) return '&';
+		else if (\Maphper\Maphper::FIND_NOT & $mode) return '!=';
 
-        return $this->getEqualsOperators($mode);
-    }
+		return $this->getEqualsOperators($mode);
+	}
 
-    private function getEqualsOperators($mode) {
-        $operator = "";
+	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;
-    }
+		return $operator;
+	}
 }

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

Indentation +62 added lines, -62 removed lines

@@ -2,87 +2,87 @@
 namespace Maphper\Lib\Sql;
 
 class WhereBuilder {
-    private $conditionals = [];
-
-    public function __construct() {
-        $defaultConditionals = [
-            'Maphper\Lib\Sql\Between',
-            'Maphper\Lib\Sql\In',
-            'Maphper\Lib\Sql\NullConditional',
-            'Maphper\Lib\Sql\Like',
-            'Maphper\Lib\Sql\GeneralOperator'
-        ];
-
-        foreach ($defaultConditionals as $conditional) $this->addConditional(new $conditional);
-    }
+	private $conditionals = [];
+
+	public function __construct() {
+		$defaultConditionals = [
+			'Maphper\Lib\Sql\Between',
+			'Maphper\Lib\Sql\In',
+			'Maphper\Lib\Sql\NullConditional',
+			'Maphper\Lib\Sql\Like',
+			'Maphper\Lib\Sql\GeneralOperator'
+		];
+
+		foreach ($defaultConditionals as $conditional) $this->addConditional(new $conditional);
+	}
 
-    public function addConditional(WhereConditional $conditional) {
-        $this->conditionals[] = $conditional;
-    }
+	public function addConditional(WhereConditional $conditional) {
+		$this->conditionals[] = $conditional;
+	}
 
 	public function createSql($fields, $mode = \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND) {
 		$args = [];
 		$sql = [];
 
-        foreach ($fields as $key => $value) {
-            $value = $this->convertDates($value);
+		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']);
-            $args = array_merge($args, $result['args']);
-        }
+			$result = $this->fixDuplicateArgs($args, $result);
+			$sql = array_merge($sql, (array)$result['sql']);
+			$args = array_merge($args, $result['args']);
+		}
 
 		return ['args' => $args, 'sql' => $this->sqlArrayToString($sql, $mode)];
 	}
 
-    // 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;
+	// 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;
 
-        foreach ($duplicates as $argKey => $argVal) {
-            $valHash = substr(md5($argVal), 0, 5);
-            $newKey = $argKey . $valHash;
+		foreach ($duplicates as $argKey => $argVal) {
+			$valHash = substr(md5($argVal), 0, 5);
+			$newKey = $argKey . $valHash;
 
-            // Replace occurences of duplicate key with key + hash as arg
-            $result['sql'] = str_replace(':' . $argKey, ':' . $newKey, $result['sql']);
-            unset($result['args'][$argKey]);
-            $result['args'][$newKey] = $argVal;
-        }
+			// Replace occurences of duplicate key with key + hash as arg
+			$result['sql'] = str_replace(':' . $argKey, ':' . $newKey, $result['sql']);
+			unset($result['args'][$argKey]);
+			$result['args'][$newKey] = $argVal;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /*
+	/*
      * 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);
-        return $this->getConditional($key, $value, $mode);
-    }
+	private function getResult($key, $value, $mode) {
+		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);
+	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 . ')';
-        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);
-        }
-        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');
-        }
-        return $value;
-    }
+		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);
+		}
+		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');
+		}
+		return $value;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 
     private function convertDates($value) {
         if ($value instanceof \DateTimeInterface) {
-            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');
         }
         return $value;

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