Level-2 / Maphper

Maphper/DataSource/MysqlAdapter.php

Indentation +16 added lines, -16 removed lines

@@ -3,14 +3,14 @@ 
 class MysqlAdapter implements DatabaseAdapter {
 	private $pdo;
 	private $stmtCache;
-    private $generalEditor;
+	private $generalEditor;
 
 	public function __construct(\PDO $pdo) {
 		$this->pdo = $pdo;
 		//Set to strict mode to detect 'out of range' errors, action at a distance but it needs to be set for all INSERT queries
 		$this->pdo->query('SET sql_mode = STRICT_ALL_TABLES');
-        $this->stmtCache = new StmtCache($pdo);
-        $this->generalEditor = new GeneralEditDatabase($this->pdo, ['short_string_max_len' => 191]);
+		$this->stmtCache = new StmtCache($pdo);
+		$this->generalEditor = new GeneralEditDatabase($this->pdo, ['short_string_max_len' => 191]);
 	}
 
 	public function quote($str) {
@@ -20,32 +20,32 @@ 
 	public function query(\Maphper\Lib\Query $query) {
 		$stmt = $this->stmtCache->getCachedStmt($query->getSql());
 		$args = $query->getArgs();
-        $stmt->execute($args);
+		$stmt->execute($args);
 
 		return $stmt;
 	}
 
-    private function alterColumns($table, array $primaryKey, $data) {
-        foreach ($data as $key => $value) {
+	private function alterColumns($table, array $primaryKey, $data) {
+		foreach ($data as $key => $value) {
 			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) continue;
             
 			$type = $this->generalEditor->getType($value);
 			$this->tryAlteringColumn($table, $key, $type);
 		}
-    }
+	}
 
-    private function tryAlteringColumn($table, $key, $type) {
-        try {
-            if (!$this->pdo->query('ALTER TABLE ' . $table . ' ADD ' . $this->quote($key) . ' ' . $type)) throw new \Exception('Could not alter table');
-        }
-        catch (\Exception $e) {
-            $this->pdo->query('ALTER TABLE ' . $table . ' MODIFY ' . $this->quote($key) . ' ' . $type);
-        }
-    }
+	private function tryAlteringColumn($table, $key, $type) {
+		try {
+			if (!$this->pdo->query('ALTER TABLE ' . $table . ' ADD ' . $this->quote($key) . ' ' . $type)) throw new \Exception('Could not alter table');
+		}
+		catch (\Exception $e) {
+			$this->pdo->query('ALTER TABLE ' . $table . ' MODIFY ' . $this->quote($key) . ' ' . $type);
+		}
+	}
 
 	public function alterDatabase($table, array $primaryKey, $data) {
 		$this->generalEditor->createTable($table, $primaryKey, $data);
-        $this->alterColumns($table, $primaryKey, $data);
+		$this->alterColumns($table, $primaryKey, $data);
 	}
 
 	public function lastInsertId() {

Braces +10 added lines, -5 removed lines

@@ -27,7 +27,9 @@ 
 
     private function alterColumns($table, array $primaryKey, $data) {
         foreach ($data as $key => $value) {
-			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) continue;
+			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) {
+				continue;
+			}
             
 			$type = $this->generalEditor->getType($value);
 			$this->tryAlteringColumn($table, $key, $type);
@@ -36,9 +38,10 @@ 
 
     private function tryAlteringColumn($table, $key, $type) {
         try {
-            if (!$this->pdo->query('ALTER TABLE ' . $table . ' ADD ' . $this->quote($key) . ' ' . $type)) throw new \Exception('Could not alter table');
-        }
-        catch (\Exception $e) {
+            if (!$this->pdo->query('ALTER TABLE ' . $table . ' ADD ' . $this->quote($key) . ' ' . $type)) {
+            	throw new \Exception('Could not alter table');
+            }
+        } catch (\Exception $e) {
             $this->pdo->query('ALTER TABLE ' . $table . ' MODIFY ' . $this->quote($key) . ' ' . $type);
         }
     }
@@ -60,7 +63,9 @@ 
 		$keyName = $this->quote(implode('_', $fields));
 
 		$results = $this->pdo->query('SHOW INDEX FROM ' . $this->quote($table) . ' WHERE Key_Name = "' . $keyName . '"');
-		if ($results && count($results->fetchAll()) == 0)  $this->pdo->query('CREATE INDEX ' . $keyName . ' ON ' . $this->quote($table) . ' (' . implode(', ', $fields) . ')');
+		if ($results && count($results->fetchAll()) == 0) {
+			$this->pdo->query('CREATE INDEX ' . $keyName . ' ON ' . $this->quote($table) . ' (' . implode(', ', $fields) . ')');
+		}
 	}
 
 	public function optimiseColumns($table) {

Maphper/Maphper.php

Spacing +15 added lines, -15 removed lines

@@ -1,19 +1,19 @@ 
 <?php
 namespace Maphper;
 class Maphper implements \Countable, \ArrayAccess, \IteratorAggregate {
-	const FIND_EXACT 		= 	0x1;
-	const FIND_LIKE 		= 	0x2;
-	const FIND_STARTS 		= 	0x4;
-	const FIND_ENDS 		= 	0x8;
-	const FIND_BIT 			= 	0x10;
-	const FIND_GREATER 		= 	0x20;
-	const FIND_LESS 		=	0x40;
-	const FIND_EXPRESSION 	= 	0x80;
-	const FIND_AND 			= 	0x100;
-	const FIND_OR 			= 	0x200;
-	const FIND_NOT 			= 	0x400;
-	const FIND_BETWEEN		= 	0x800;
-	const FIND_NOCASE		= 	0x1000;
+	const FIND_EXACT = 0x1;
+	const FIND_LIKE 		= 0x2;
+	const FIND_STARTS = 0x4;
+	const FIND_ENDS 		= 0x8;
+	const FIND_BIT 			= 0x10;
+	const FIND_GREATER = 0x20;
+	const FIND_LESS 		= 0x40;
+	const FIND_EXPRESSION = 0x80;
+	const FIND_AND 			= 0x100;
+	const FIND_OR = 0x200;
+	const FIND_NOT 			= 0x400;
+	const FIND_BETWEEN = 0x800;
+	const FIND_NOCASE		= 0x1000;
 
 	private $dataSource;
 	private $relations = [];
@@ -57,7 +57,7 @@ 
 			}
 		}
 		$results = $this->dataSource->findByField($this->settings['filter'],
-			['order' => $this->settings['sort'], 'limit' => $this->settings['limit'], 'offset' => $this->settings['offset'] ]);
+			['order' => $this->settings['sort'], 'limit' => $this->settings['limit'], 'offset' => $this->settings['offset']]);
 
 		$siblings = new \ArrayObject();
 
@@ -108,7 +108,7 @@ 
             $data = $this->dataSource->findByField(array_merge($this->settings['filter'], [$this->dataSource->getPrimaryKey()[0] => $offset]));
             return isset($data[0]);
         }
-		return (bool) $this->dataSource->findById($offset);
+		return (bool)$this->dataSource->findById($offset);
 	}
 
 	public function offsetUnset($id) {

Indentation +21 added lines, -21 removed lines

@@ -83,21 +83,21 @@ 
 	}
 
 	public function offsetSet($offset, $valueObj) {
-        if ($valueObj instanceof \Maphper\Relation) throw new \Exception();
+		if ($valueObj instanceof \Maphper\Relation) throw new \Exception();
 
-        //Extract private properties from the object
-        $visibilityOverride = new \Maphper\Lib\VisibilityOverride($valueObj);
-        $value = $visibilityOverride->getProperties($valueObj);
+		//Extract private properties from the object
+		$visibilityOverride = new \Maphper\Lib\VisibilityOverride($valueObj);
+		$value = $visibilityOverride->getProperties($valueObj);
 
-        $value = $this->processFilters($value);
-        $pk = $this->dataSource->getPrimaryKey();
-        if ($offset !== null) $value->{$pk[0]} = $offset;
-        $valueCopy = $this->removeRelations(clone $value, $pk);
-        $value = $this->entity->wrap($this->relations, $value);
-        $this->dataSource->save($value);
-        $visibilityOverride->write($value);
-        $value = $this->entity->create((array_merge((array)$value, (array)$valueCopy)), $this->relations);
-        $visibilityOverride->write($value);
+		$value = $this->processFilters($value);
+		$pk = $this->dataSource->getPrimaryKey();
+		if ($offset !== null) $value->{$pk[0]} = $offset;
+		$valueCopy = $this->removeRelations(clone $value, $pk);
+		$value = $this->entity->wrap($this->relations, $value);
+		$this->dataSource->save($value);
+		$visibilityOverride->write($value);
+		$value = $this->entity->create((array_merge((array)$value, (array)$valueCopy)), $this->relations);
+		$visibilityOverride->write($value);
 	}
 
 	private function removeRelations($obj, $pk) { // Prevent saving ManyMany twice except when pk isn't initially set
@@ -110,10 +110,10 @@ 
 
 	public function offsetExists($offset) {
 		if (count($this->dataSource->getPrimaryKey()) > 1) return new MultiPk($this, $offset, $this->dataSource->getPrimaryKey());
-        if (!empty($this->settings['filter'])) {
-            $data = $this->dataSource->findByField(array_merge($this->settings['filter'], [$this->dataSource->getPrimaryKey()[0] => $offset]));
-            return isset($data[0]);
-        }
+		if (!empty($this->settings['filter'])) {
+			$data = $this->dataSource->findByField(array_merge($this->settings['filter'], [$this->dataSource->getPrimaryKey()[0] => $offset]));
+			return isset($data[0]);
+		}
 		return (bool) $this->dataSource->findById($offset);
 	}
 
@@ -123,10 +123,10 @@ 
 
 	public function offsetGet($offset) {
 		if (count($this->dataSource->getPrimaryKey()) > 1) return new MultiPk($this, $offset, $this->dataSource->getPrimaryKey());
-        if (!empty($this->settings['filter'])) {
-            $data = $this->dataSource->findByField(array_merge($this->settings['filter'], [$this->dataSource->getPrimaryKey()[0] => $offset]));
-            return $this->entity->create(isset($data[0]) ? $data[0] : null, $this->relations);
-        }
+		if (!empty($this->settings['filter'])) {
+			$data = $this->dataSource->findByField(array_merge($this->settings['filter'], [$this->dataSource->getPrimaryKey()[0] => $offset]));
+			return $this->entity->create(isset($data[0]) ? $data[0] : null, $this->relations);
+		}
 		return $this->entity->create($this->dataSource->findById($offset), $this->relations);
 	}
 

Braces +31 added lines, -12 removed lines

@@ -60,7 +60,9 @@ 
 
 		$siblings = new \ArrayObject();
 
-		foreach ($results as &$result) $result = $this->entity->create($result, $this->relations, $siblings);
+		foreach ($results as &$result) {
+			$result = $this->entity->create($result, $this->relations, $siblings);
+		}
 
 		return $results;
 	}
@@ -77,13 +79,17 @@ 
 	private function processFilters($value) {
 		//When saving to a mapper with filters, write the filters back into the object being stored
 		foreach ($this->settings['filter'] as $key => $filterValue) {
-			if (empty($value->$key) && !is_array($filterValue)) $value->$key = $filterValue;
+			if (empty($value->$key) && !is_array($filterValue)) {
+				$value->$key = $filterValue;
+			}
 		}
 		return $value;
 	}
 
 	public function offsetSet($offset, $valueObj) {
-        if ($valueObj instanceof \Maphper\Relation) throw new \Exception();
+        if ($valueObj instanceof \Maphper\Relation) {
+        	throw new \Exception();
+        }
 
         //Extract private properties from the object
         $visibilityOverride = new \Maphper\Lib\VisibilityOverride($valueObj);
@@ -91,7 +97,9 @@ 
 
         $value = $this->processFilters($value);
         $pk = $this->dataSource->getPrimaryKey();
-        if ($offset !== null) $value->{$pk[0]} = $offset;
+        if ($offset !== null) {
+        	$value->{$pk[0]} = $offset;
+        }
         $valueCopy = $this->removeRelations(clone $value, $pk);
         $value = $this->entity->wrap($this->relations, $value);
         $this->dataSource->save($value);
@@ -101,15 +109,20 @@ 
 	}
 
 	private function removeRelations($obj, $pk) { // Prevent saving ManyMany twice except when pk isn't initially set
-		foreach ($this->relations as $name => $relation)
-			if ($relation instanceOf \Maphper\Relation\ManyMany && isset($obj->$name) && !empty($obj->{$pk[0]})) unset($obj->$name);
+		foreach ($this->relations as $name => $relation) {
+					if ($relation instanceOf \Maphper\Relation\ManyMany && isset($obj->$name) && !empty($obj->{$pk[0]})) unset($obj->$name);
+		}
 
-		if (empty($obj->{$pk[0]})) unset($obj->{$pk[0]});
+		if (empty($obj->{$pk[0]})) {
+			unset($obj->{$pk[0]});
+		}
 		return $obj;
 	}
 
 	public function offsetExists($offset) {
-		if (count($this->dataSource->getPrimaryKey()) > 1) return new MultiPk($this, $offset, $this->dataSource->getPrimaryKey());
+		if (count($this->dataSource->getPrimaryKey()) > 1) {
+			return new MultiPk($this, $offset, $this->dataSource->getPrimaryKey());
+		}
         if (!empty($this->settings['filter'])) {
             $data = $this->dataSource->findByField(array_merge($this->settings['filter'], [$this->dataSource->getPrimaryKey()[0] => $offset]));
             return isset($data[0]);
@@ -122,7 +135,9 @@ 
 	}
 
 	public function offsetGet($offset) {
-		if (count($this->dataSource->getPrimaryKey()) > 1) return new MultiPk($this, $offset, $this->dataSource->getPrimaryKey());
+		if (count($this->dataSource->getPrimaryKey()) > 1) {
+			return new MultiPk($this, $offset, $this->dataSource->getPrimaryKey());
+		}
         if (!empty($this->settings['filter'])) {
             $data = $this->dataSource->findByField(array_merge($this->settings['filter'], [$this->dataSource->getPrimaryKey()[0] => $offset]));
             return $this->entity->create(isset($data[0]) ? $data[0] : null, $this->relations);
@@ -133,11 +148,15 @@ 
 	public function __call($method, $args) {
 		if (array_key_exists($method, $this->settings)) {
 			$maphper = new Maphper($this->dataSource, $this->settings, $this->relations);
-			if (is_array($maphper->settings[$method])) $maphper->settings[$method] = $args[0] + $maphper->settings[$method];
-			else $maphper->settings[$method] = $args[0];
+			if (is_array($maphper->settings[$method])) {
+				$maphper->settings[$method] = $args[0] + $maphper->settings[$method];
+			} else {
+				$maphper->settings[$method] = $args[0];
+			}
 			return $maphper;
+		} else {
+			throw new \Exception('Method Maphper::' . $method . ' does not exist');
 		}
-		else throw new \Exception('Method Maphper::' . $method . ' does not exist');
 	}
 
 	public function findAggregate($function, $field, $group = null) {

Maphper/Iterator.php

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
 		if (count($this->pk) == 1) {
 			$pk = end($this->pk);
 			return $this->array[$this->iterator]->$pk;
-		}
-		else {
+		} else {
 			$current = $this->current();
 			return array_map(function($pkName) use ($current) {
 				return $current->$pkName;

Maphper/Lib/SelectBuilder.php

Braces +10 added lines, -4 removed lines

@@ -7,17 +7,23 @@
 
 		if (isset($options['offset'])) {
 			$offset = ' OFFSET ' . $options['offset'];
-			if (!$limit) $limit = ' LIMIT  1000';
+			if (!$limit) {
+				$limit = ' LIMIT  1000';
+			}
+		} else {
+			$offset = '';
 		}
-		else $offset = '';
 
 		$order = isset($options['order']) ? ' ORDER BY ' . $options['order'] : '';
 		return new Query('SELECT * FROM ' . $table . ' ' . $where . $order . $limit . $offset, $args);
 	}
 
 	public function aggregate($table, $function, $field, $where, $args, $group) {
-		if ($group == true) $groupBy = ' GROUP BY ' . $field;
-		else $groupBy = '';
+		if ($group == true) {
+			$groupBy = ' GROUP BY ' . $field;
+		} else {
+			$groupBy = '';
+		}
 		return new Query('SELECT ' . $function . '(' . $field . ') as val, ' . $field . '   FROM ' . $table . ($where != null ? ' WHERE ' . $where : '') . ' ' . $groupBy, $args);
 	}
 }

Maphper/Lib/VisibilityOverride.php

Indentation +5 added lines, -5 removed lines

@@ -11,9 +11,9 @@ 
 			$this->writeClosure = function ($field, $value) use ($object) { $object->$field = $value; };
 		}
 		else {
-            $visOverride = $this;
+			$visOverride = $this;
 			$this->readClosure = function() use ($visOverride) {
-                return (object) array_filter(get_object_vars($this), [$visOverride, 'isReturnableDataType']);
+				return (object) array_filter(get_object_vars($this), [$visOverride, 'isReturnableDataType']);
 			};
 			$this->readClosure = $this->readClosure->bindTo($object, $object);
 
@@ -23,9 +23,9 @@ 
 
 	}
 
-    public function isReturnableDataType($v) {
-        return is_scalar($v) || is_null($v) || (is_object($v) && $v instanceof \DateTime);
-    }
+	public function isReturnableDataType($v) {
+		return is_scalar($v) || is_null($v) || (is_object($v) && $v instanceof \DateTime);
+	}
 
 	public function getProperties() {
 		return ($this->readClosure)();

Spacing +5 added lines, -5 removed lines

@@ -7,17 +7,17 @@ 
 
 	public function __construct($object) {
 		if ($object instanceof \stdclass) {
-			$this->readClosure = function() use ($object) { return $object;	};
-			$this->writeClosure = function ($field, $value) use ($object) { $object->$field = $value; };
+			$this->readClosure = function() use ($object) { return $object; };
+			$this->writeClosure = function($field, $value) use ($object) { $object->$field = $value; };
 		}
 		else {
             $visOverride = $this;
 			$this->readClosure = function() use ($visOverride) {
-                return (object) array_filter(get_object_vars($this), [$visOverride, 'isReturnableDataType']);
+                return (object)array_filter(get_object_vars($this), [$visOverride, 'isReturnableDataType']);
 			};
 			$this->readClosure = $this->readClosure->bindTo($object, $object);
 
-			$this->writeClosure = function ($field, $value) { $this->$field = $value; };
+			$this->writeClosure = function($field, $value) { $this->$field = $value; };
 			$this->writeClosure = $this->writeClosure->bindTo($object, $object);
 		}
 
@@ -34,7 +34,7 @@ 
 	public function write($data) {
 		if ($data != null) {
 			foreach ($data as $key => $value) {
-				($this->writeClosure)($key,  $this->processDates($value));
+				($this->writeClosure)($key, $this->processDates($value));
 			}
 		}
 	}

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

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

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

@@ -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

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