Level-2 / Maphper

maphper/lib/Sql/Like.php

Indentation +12 added lines, -12 removed lines

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

Braces +6 added lines, -2 removed lines

@@ -9,8 +9,12 @@
     }
 
     public function getSql($key, $value, $mode) {
-        if (Maphper::FIND_LIKE & $mode || Maphper::FIND_STARTS & $mode) $value = '%' . $value;
-        if (Maphper::FIND_LIKE & $mode || Maphper::FIND_ENDS & $mode) $value .= '%';
+        if (Maphper::FIND_LIKE & $mode || Maphper::FIND_STARTS & $mode) {
+        	$value = '%' . $value;
+        }
+        if (Maphper::FIND_LIKE & $mode || Maphper::FIND_ENDS & $mode) {
+        	$value .= '%';
+        }
 
         return [
             'sql' => [$key . ' LIKE :' . $key],

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

Indentation +43 added lines, -43 removed lines

@@ -2,62 +2,62 @@
 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;
+	}
 
-    //Needs to be broken up into better methods
+	//Needs to be broken up into better methods
 	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;
 			if (is_numeric($key) && is_array($value)) {
 				$result = $this->createSql($value, $key);
 			}
-            else {
-                $result = $this->getConditional($key, $value, $mode);
-            }
-            $sql = array_merge($sql, $result['sql']);
-            $args = array_merge($args, $result['args']);
-        }
-
-        if (\Maphper\Maphper::FIND_OR & $mode) $query = implode(' OR  ', $sql);
+			else {
+				$result = $this->getConditional($key, $value, $mode);
+			}
+			$sql = array_merge($sql, $result['sql']);
+			$args = array_merge($args, $result['args']);
+		}
+
+		if (\Maphper\Maphper::FIND_OR & $mode) $query = implode(' OR  ', $sql);
 		else $query = implode(' AND ', $sql);
 		if (!empty($query)) $query = '(' . $query . ')';
 		return ['args' => $args, 'sql' => $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 \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');
-        }
-        return $value;
-    }
+	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 \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');
+		}
+		return $value;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
     }
 
     //Needs to be broken up into better methods
-	public function createSql($fields, $mode = \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND){
+	public function createSql($fields, $mode = \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND) {
 		$args = [];
 		$sql = [];
 
@@ -55,7 +55,7 @@ 
 
     private function convertDates($value) {
         if ($value instanceof \DateTime) {
-            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 +23 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) {
@@ -28,35 +30,45 @@ 
         foreach ($fields as $key => $value) {
             $value = $this->convertDates($value);
 
-            if (is_object($value)) continue;
+            if (is_object($value)) {
+            	continue;
+            }
 			if (is_numeric($key) && is_array($value)) {
 				$result = $this->createSql($value, $key);
-			}
-            else {
+			} else {
                 $result = $this->getConditional($key, $value, $mode);
             }
             $sql = array_merge($sql, $result['sql']);
             $args = array_merge($args, $result['args']);
         }
 
-        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 ['args' => $args, 'sql' => $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;
     }

maphper/lib/Sql/In.php

Indentation +15 added lines, -15 removed lines

@@ -2,21 +2,21 @@
 namespace Maphper\Lib\Sql;
 
 class In implements WhereConditional {
-    public function matches($key, $value, $mode) {
-        return !is_numeric($key) && is_array($value);
-    }
+	public function matches($key, $value, $mode) {
+		return !is_numeric($key) && is_array($value);
+	}
 
-    public function getSql($key, $value, $mode) {
-        $args = [];
-        $inSql = [];
-        $count = count($value);
-        for ($i = 0; $i < $count; $i++) {
-            $args[$key . $i] = $value[$i];
-            $inSql[] = ':' . $key . $i;
-        }
-        if (count($inSql) == 0) return [];
-        else $sql = [$key . ' IN ( ' .  implode(', ', $inSql) . ')'];
+	public function getSql($key, $value, $mode) {
+		$args = [];
+		$inSql = [];
+		$count = count($value);
+		for ($i = 0; $i < $count; $i++) {
+			$args[$key . $i] = $value[$i];
+			$inSql[] = ':' . $key . $i;
+		}
+		if (count($inSql) == 0) return [];
+		else $sql = [$key . ' IN ( ' .  implode(', ', $inSql) . ')'];
 
-        return ['args' => $args, 'sql' => $sql];
-    }
+		return ['args' => $args, 'sql' => $sql];
+	}
 }

Spacing +1 added lines, -1 removed lines

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

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

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

Indentation +19 added lines, -19 removed lines

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

Braces +12 added lines, -5 removed lines

@@ -18,12 +18,19 @@
     private function getOperator($mode) {
         $operator = "";
 
-        if (\Maphper\Maphper::FIND_BIT & $mode) $operator = '&';
-        else if (\Maphper\Maphper::FIND_GREATER & $mode) $operator = '>';
-        else if (\Maphper\Maphper::FIND_LESS & $mode) $operator = '<';
-        else if (\Maphper\Maphper::FIND_NOT & $mode) $operator = '!=';
+        if (\Maphper\Maphper::FIND_BIT & $mode) {
+        	$operator = '&';
+        } else if (\Maphper\Maphper::FIND_GREATER & $mode) {
+        	$operator = '>';
+        } else if (\Maphper\Maphper::FIND_LESS & $mode) {
+        	$operator = '<';
+        } else if (\Maphper\Maphper::FIND_NOT & $mode) {
+        	$operator = '!=';
+        }
 
-        if (\Maphper\Maphper::FIND_EXACT & $mode) $operator .= '=';
+        if (\Maphper\Maphper::FIND_EXACT & $mode) {
+        	$operator .= '=';
+        }
 
         return $operator;
     }

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