Level-2 / Maphper

maphper/datasource/mock.php

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

maphper/datasource/sqliteadapter.php

Spacing +7 added lines, -7 removed lines

@@ -23,7 +23,7 @@ 
 		
 		$args = $query->getArgs();
 		foreach ($args as &$arg) if ($arg instanceof \DateTime) {
-			if ($arg->format('H:i:s')  == '00:00:00') $arg = $arg->format('Y-m-d');
+			if ($arg->format('H:i:s') == '00:00:00') $arg = $arg->format('Y-m-d');
 			else $arg = $arg->format('Y-m-d H:i:s');
 		}
 				
@@ -63,7 +63,7 @@ 
 	}
 
 	private function tableExists($name) {
-		$result = $this->pdo->query('SELECT name FROM sqlite_master WHERE type="table" and name="'. $name.'"');
+		$result = $this->pdo->query('SELECT name FROM sqlite_master WHERE type="table" and name="' . $name . '"');
 		return count($result->fetchAll()) == 1;
 	}
 
@@ -82,7 +82,7 @@ 
 		// SQLSTATE[HY000]: General error: 17 database schema has changed
 		$this->queryCache = [];
 
-		$affix = '_'.substr(md5($table), 0, 6);
+		$affix = '_' . substr(md5($table), 0, 6);
 		$this->createTable($table . $affix, $primaryKey, $data);
 		$fields = [];
 		foreach ($data as $key => $value) { $fields[] = $key; }
@@ -91,7 +91,7 @@ 
 				$columns = implode(', ', $this->getColumns($table));			
 
 				$this->pdo->query('INSERT INTO ' . $this->quote($table . $affix) . '(' . $columns . ') SELECT ' . $columns . ' FROM ' . $this->quote($table));
-				$this->pdo->query('DROP TABLE IF EXISTS ' . $table );
+				$this->pdo->query('DROP TABLE IF EXISTS ' . $table);
 			}
 		}
 		catch (\PDOException $e) {
@@ -99,8 +99,8 @@ 
 			echo $e->getMessage();
 		}
 
-		$this->pdo->query('DROP TABLE IF EXISTS ' . $table );
-		$this->pdo->query('ALTER TABLE ' . $table . $affix. ' RENAME TO '. $table );
+		$this->pdo->query('DROP TABLE IF EXISTS ' . $table);
+		$this->pdo->query('ALTER TABLE ' . $table . $affix . ' RENAME TO ' . $table);
 
 	}
 
@@ -114,7 +114,7 @@ 
 		
 		$pkField = implode(', ', $parts) . ', PRIMARY KEY(' . implode(', ', $primaryKey) . ')';
 				
-		$this->pdo->query('DROP TABLE IF EXISTS ' . $table );
+		$this->pdo->query('DROP TABLE IF EXISTS ' . $table);
 		$this->pdo->query('CREATE TABLE ' . $table . ' (' . $pkField . ')');
 					
 		foreach ($data as $key => $value) {

maphper/lib/selectbuilder.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 
 
 	//Needs to be broken up into better methods
-	public function createSql($fields, $mode){
+	public function createSql($fields, $mode) {
 		$args = [];
 		$sql = [];
 
@@ -50,7 +50,7 @@ 
 					$inSql[] = ':' . $key . $i;
 				}
 				if (count($inSql) == 0) return [];
-				else $sql[] = $key . ' IN ( ' .  implode(', ', $inSql) . ')';
+				else $sql[] = $key . ' IN ( ' . implode(', ', $inSql) . ')';
 			}
 			else if ($value === NULL) {
 				$nullSql = $key . ' IS ';

maphper/lib/crudbuilder.php

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

maphper/multipk.php

Spacing +3 added lines, -3 removed lines

@@ -24,8 +24,8 @@ 
 	}
 
 	public function offsetGet($key) {
-		$depth = $this->getDepth()+1;
-		if (count($this->primaryKey)-1 == $depth) return $this->mapper->filter([$this->primaryKey[$depth] => $key])->item(0);
+		$depth = $this->getDepth() + 1;
+		if (count($this->primaryKey) - 1 == $depth) return $this->mapper->filter([$this->primaryKey[$depth] => $key])->item(0);
 		else return new MultiPk($this->mapper, $key, $this->primaryKey, $this);
 	}
 
@@ -44,7 +44,7 @@ 
 
 	public function offsetUnset($key) {
 		$keys = $this->primaryKey;
-		$this->mapper->filter([ array_pop($keys) => $key])->delete();
+		$this->mapper->filter([array_pop($keys) => $key])->delete();
 	}
 
 	public function offsetExists($key) {

maphper/relation/manymany.php

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
 	//bit hacky, breaking encapsulation, but simplest way to work out the info for the other side of the many:many relationship.
 	private function getOtherFieldNameInfo() {
 		if ($this->otherInfo == null) {
-			$propertyReader = function($name) {return $this->$name;	};
+			$propertyReader = function($name) {return $this->$name; };
 
 			$reader = $propertyReader->bindTo($this->intermediateMapper, $this->intermediateMapper);
 
@@ -45,7 +45,7 @@ 
 				$propertyReader = $propertyReader->bindTo($relation, $relation);
 				if ($propertyReader('parentField') != $this->parentField) {
 					$relation = $relation->getData($this->object);
-					$this->otherInfo = [$propertyReader('localField'),  $propertyReader('parentField'), $propertyReader('mapper')];
+					$this->otherInfo = [$propertyReader('localField'), $propertyReader('parentField'), $propertyReader('mapper')];
 				}
 			}
 		}
@@ -88,7 +88,7 @@ 
 		list($relatedField, $valueField, $mapper) = $this->getOtherFieldNameInfo();
 		if ($this->autoTraverse) {
 			$record = new \stdClass;
-			$record->{$this->parentField} =  $value->{$this->localField};
+			$record->{$this->parentField} = $value->{$this->localField};
 			$record->$valueField = $this->object->{$relatedField};
 			$this->intermediateMapper[] = $record;
 

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

maphper/lib/entity.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 	public function wrap($relations, $object, $siblings = []) {
 		//see if any relations need overwriting
 		foreach ($relations as $name => $relation) {
-			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;
 			}

maphper/lib/visibilityoverride.php

Spacing +5 added lines, -5 removed lines

@@ -7,20 +7,20 @@ 
 
 	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 {
 			$this->readClosure = function() {
 				$data = new \stdClass;
-				foreach ($this as $k => $v)	{
+				foreach ($this as $k => $v) {
 					if (is_scalar($v) || is_null($v) || (is_object($v) && $v instanceof \DateTime))	$data->$k = $v;
 				}
 				return $data;
 			};
 			$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);
 		}
 			
@@ -33,7 +33,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));
 			}
 		}
 	}