Level-2 / Maphper

maphper/datasource/DatabaseModify.php

Indentation +15 added lines, -15 removed lines

@@ -2,25 +2,25 @@
 namespace Maphper\DataSource;
 
 class DatabaseModify {
-    private $adapter;
-    private $alterDb;
-    private $table;
+	private $adapter;
+	private $alterDb;
+	private $table;
 
-    public function __construct(DatabaseAdapter $adapter, $alterDb, $table) {
-        $this->adapter = $adapter;
-        $this->alterDb = $alterDb;
-        $this->table = $table;
-    }
+	public function __construct(DatabaseAdapter $adapter, $alterDb, $table) {
+		$this->adapter = $adapter;
+		$this->alterDb = $alterDb;
+		$this->table = $table;
+	}
 
-    public function addIndex($args) {
+	public function addIndex($args) {
 		if (Database::EDIT_INDEX & $this->alterDb) $this->adapter->addIndex($this->table, $args);
 	}
 
-    public function optimizeColumns() {
-        if (Database::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) $this->adapter->optimiseColumns($this->table);
-    }
+	public function optimizeColumns() {
+		if (Database::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) $this->adapter->optimiseColumns($this->table);
+	}
 
-    public function getTryInsertAgain($tryagain) {
-        return $tryagain && Database::EDIT_STRUCTURE & $this->alterDb;
-    }
+	public function getTryInsertAgain($tryagain) {
+		return $tryagain && Database::EDIT_STRUCTURE & $this->alterDb;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 	}
 
     public function optimizeColumns() {
-        if (Database::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) $this->adapter->optimiseColumns($this->table);
+        if (Database::EDIT_OPTIMISE & $this->alterDb && rand(0, 500) == 1) $this->adapter->optimiseColumns($this->table);
     }
 
     public function getTryInsertAgain($tryagain) {

Braces +6 added lines, -2 removed lines

@@ -13,11 +13,15 @@
     }
 
     public function addIndex($args) {
-		if (Database::EDIT_INDEX & $this->alterDb) $this->adapter->addIndex($this->table, $args);
+		if (Database::EDIT_INDEX & $this->alterDb) {
+			$this->adapter->addIndex($this->table, $args);
+		}
 	}
 
     public function optimizeColumns() {
-        if (Database::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) $this->adapter->optimiseColumns($this->table);
+        if (Database::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) {
+        	$this->adapter->optimiseColumns($this->table);
+        }
     }
 
     public function getTryInsertAgain($tryagain) {

maphper/lib/ArrayFilter.php

Indentation +40 added lines, -40 removed lines

@@ -3,50 +3,50 @@
 use Maphper\Maphper;
 
 class ArrayFilter {
-    private $array;
+	private $array;
 
-    public function __construct(array $array) {
-        $this->array = $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;
-    }
+	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);
+	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 !(Maphper::FIND_OR & $mode);
-        };
-    }
+				if (Maphper::FIND_OR & $mode && $currentFieldResult === true) return true;
+				else if (!(Maphper::FIND_OR & $mode) && $currentFieldResult === false) return false;
+			}
+			return !(Maphper::FIND_OR & $mode);
+		};
+	}
 
-    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);
-    }
+	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);
+	}
 
-    private function processFilter($mode, $expected, $actual) {
-        if (Maphper::FIND_NOT & $mode) return $expected != $actual;
-        else if (Maphper::FIND_GREATER & $mode && Maphper::FIND_EXACT & $mode) return $expected <= $actual;
-        else if (Maphper::FIND_LESS & $mode && 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 function processFilter($mode, $expected, $actual) {
+		if (Maphper::FIND_NOT & $mode) return $expected != $actual;
+		else if (Maphper::FIND_GREATER & $mode && Maphper::FIND_EXACT & $mode) return $expected <= $actual;
+		else if (Maphper::FIND_LESS & $mode && 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 !(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 & $mode && Maphper::FIND_EXACT & $mode) return $expected <= $actual;
-        else if (Maphper::FIND_LESS & $mode && 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 & $mode && Maphper::FIND_EXACT & $mode) {
+        	return $expected <= $actual;
+        } else if (Maphper::FIND_LESS & $mode && 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/datasource/mock.php

Indentation +58 added lines, -58 removed lines

@@ -2,76 +2,76 @@
 namespace Maphper\DataSource;
 use Maphper\Maphper;
 class Mock implements \Maphper\DataSource {
-    private $data;
-    private $id;
+	private $data;
+	private $id;
 
-    public function __construct(\ArrayObject $data, $id) {
-        $this->data = $data;
-        $this->id = is_array($id) ? $id : [$id];
-    }
+	public function __construct(\ArrayObject $data, $id) {
+		$this->data = $data;
+		$this->id = is_array($id) ? $id : [$id];
+	}
 
-    public function getPrimaryKey() {
-        return $this->id;
-    }
+	public function getPrimaryKey() {
+		return $this->id;
+	}
 
-    public function findById($id) {
-        return isset($this->data[$id]) ? (array)$this->data[$id] : [];
-    }
+	public function findById($id) {
+		return isset($this->data[$id]) ? (array)$this->data[$id] : [];
+	}
 
-    public function findByField(array $fields, $options = []) {
-        $arrayFilter = new \Maphper\Lib\ArrayFilter(iterator_to_array($this->data->getIterator()));
-        $filteredArray = $arrayFilter->filter($fields);
-        if (isset($options['order'])) {
-            list($columns, $order) = explode(' ', $options['order']);
-            usort($filteredArray, $this->getOrderFunction($order, $columns));
-        }
-        if (isset($options['offset'])) $filteredArray = array_slice($filteredArray, $options['offset']);
-        if (isset($options['limit'])) $filteredArray = array_slice($filteredArray, 0, $options['limit']);
-        return $filteredArray;
-    }
+	public function findByField(array $fields, $options = []) {
+		$arrayFilter = new \Maphper\Lib\ArrayFilter(iterator_to_array($this->data->getIterator()));
+		$filteredArray = $arrayFilter->filter($fields);
+		if (isset($options['order'])) {
+			list($columns, $order) = explode(' ', $options['order']);
+			usort($filteredArray, $this->getOrderFunction($order, $columns));
+		}
+		if (isset($options['offset'])) $filteredArray = array_slice($filteredArray, $options['offset']);
+		if (isset($options['limit'])) $filteredArray = array_slice($filteredArray, 0, $options['limit']);
+		return $filteredArray;
+	}
 
   	public function findAggregate($function, $field, $group = null, array $criteria = [], array $options = []) {
-        return $function($this->findByField($criteria));
-    }
+		return $function($this->findByField($criteria));
+	}
 
   	public function deleteById($id) {
-        unset($this->data[$id]);
-    }
+		unset($this->data[$id]);
+	}
 
   	public function deleteByField(array $fields, array $options) {
-        foreach ($this->findByField($fields, $options) as $val) unset($this->data[$val->{$this->id[0]}]);
-    }
+		foreach ($this->findByField($fields, $options) as $val) unset($this->data[$val->{$this->id[0]}]);
+	}
 
-    public function save($data) {
-        if (isset($data->{$this->id[0]})) {
-            $id = $data->{$this->id[0]};
-        }
-        else {
-            $id = count($this->data);
-            $data->{$this->id[0]} = $id;
-        }
+	public function save($data) {
+		if (isset($data->{$this->id[0]})) {
+			$id = $data->{$this->id[0]};
+		}
+		else {
+			$id = count($this->data);
+			$data->{$this->id[0]} = $id;
+		}
 
-        $this->data[$id] = (object)array_merge($this->findById($id), (array)$data);
-    }
+		$this->data[$id] = (object)array_merge($this->findById($id), (array)$data);
+	}
 
-    public function getErrors() {
-        return [];
-    }
+	public function getErrors() {
+		return [];
+	}
 
-    private function getOrderFunction($order, $columns) {
-        return function($a, $b) use ($order, $columns) {
-          foreach (explode(',', $columns) as $column) {
-            $aColumn = $a->$column;
-            $bColumn = $b->$column;
-            if ($aColumn === $bColumn) {
-              $sortVal = 0;
-              continue;
-            }
-            else $sortVal = ($aColumn < $bColumn) ? -1 : 1;
-            break;
-          }
-          if ($order === 'desc') return -$sortVal;
-          else return $sortVal;
-        };
-    }
+	private function getOrderFunction($order, $columns) {
+		return function($a, $b) use ($order, $columns) {
+		  foreach (explode(',', $columns) as $column) {
+			$aColumn = $a->$column;
+			$bColumn = $b->$column;
+			if ($aColumn === $bColumn) {
+			  $sortVal = 0;
+			  continue;
+			}
+			else $sortVal = ($aColumn < $bColumn) ? -1 : 1;
+			break;
+		  }
+		  if ($order === 'desc') return -$sortVal;
+		  else return $sortVal;
+		};
+	}
 }

Braces +17 added lines, -8 removed lines

@@ -25,8 +25,12 @@ 
             list($columns, $order) = explode(' ', $options['order']);
             usort($filteredArray, $this->getOrderFunction($order, $columns));
         }
-        if (isset($options['offset'])) $filteredArray = array_slice($filteredArray, $options['offset']);
-        if (isset($options['limit'])) $filteredArray = array_slice($filteredArray, 0, $options['limit']);
+        if (isset($options['offset'])) {
+        	$filteredArray = array_slice($filteredArray, $options['offset']);
+        }
+        if (isset($options['limit'])) {
+        	$filteredArray = array_slice($filteredArray, 0, $options['limit']);
+        }
         return $filteredArray;
     }
 
@@ -39,14 +43,15 @@ 
     }
 
   	public function deleteByField(array $fields, array $options) {
-        foreach ($this->findByField($fields, $options) as $val) unset($this->data[$val->{$this->id[0]}]);
+        foreach ($this->findByField($fields, $options) as $val) {
+        	unset($this->data[$val->{$this->id[0]}]);
+        }
     }
 
     public function save($data) {
         if (isset($data->{$this->id[0]})) {
             $id = $data->{$this->id[0]};
-        }
-        else {
+        } else {
             $id = count($this->data);
             $data->{$this->id[0]} = $id;
         }
@@ -66,12 +71,16 @@ 
             if ($aColumn === $bColumn) {
               $sortVal = 0;
               continue;
+            } else {
+            	$sortVal = ($aColumn < $bColumn) ? -1 : 1;
             }
-            else $sortVal = ($aColumn < $bColumn) ? -1 : 1;
             break;
           }
-          if ($order === 'desc') return -$sortVal;
-          else return $sortVal;
+          if ($order === 'desc') {
+          	return -$sortVal;
+          } else {
+          	return $sortVal;
+          }
         };
     }
 }

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