Level-2 / Maphper

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

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

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

Indentation +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 	private $parent;
 	private $primaryKey;
 	private $lookup;
-    private $mapper;
+	private $mapper;
 
 	public function __construct(Maphper $mapper, $lookup, array $primaryKey, MultiPk $parent = null) {
 		$this->parent = $parent;

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/relation/one.php

Indentation +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 
 	public function __get($name) {
 		if ($this->lazyLoad()) return $this->lazyLoad()->$name;
-        else return null;
+		else return null;
 	}
 
 	public function __isset($name) {

maphper/relation/manymanyiterator.php

Indentation +4 added lines, -4 removed lines

@@ -7,17 +7,17 @@
   private $intermediateName;
 
   public function __construct(\Maphper\Iterator $iterator, $intermediateName = null) {
-    $this->iterator = $iterator;
-    $this->intermediateName = $intermediateName;
+	$this->iterator = $iterator;
+	$this->intermediateName = $intermediateName;
   }
 
   public function current() {
-    if ($this->intermediateName) return $this->iterator->current()->{$this->intermediateName};
+	if ($this->intermediateName) return $this->iterator->current()->{$this->intermediateName};
 		return $this->iterator->current();
 	}
 
 	public function key() {
-    return $this->iterator->key();
+	return $this->iterator->key();
 	}
 
 	public function next() {

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 +9 added lines, -9 removed lines

@@ -96,15 +96,15 @@ 
 		$value = $this->entity->wrap($this->relations, $value);
 		$this->dataSource->save($value);
 		$visibilityOverride->write($value);
-        $this->entity->create((array_merge((array)$value, (array)$valueCopy)), $this->relations);
+		$this->entity->create((array_merge((array)$value, (array)$valueCopy)), $this->relations);
 	}
 
 	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);
 	}
 
@@ -114,10 +114,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);
 	}
 

maphper/Optimiser/MySql.php

Spacing +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
 		return;
 
 		$runAgain = false;
-		$columns = $this->pdo->query('SELECT * FROM '. $this->quote($table) . ' PROCEDURE ANALYSE(1,1)')->fetchAll(\PDO::FETCH_OBJ);
+		$columns = $this->pdo->query('SELECT * FROM ' . $this->quote($table) . ' PROCEDURE ANALYSE(1,1)')->fetchAll(\PDO::FETCH_OBJ);
 		foreach ($columns as $column) {
 			$parts = explode('.', $column->Field_name);
 			$name = $this->quote(end($parts));
@@ -130,7 +130,7 @@ 
 					}
 				}
 
-				$this->pdo->query('ALTER TABLE ' . $this->quote($table) . ' MODIFY '. $name . ' ' . $type);
+				$this->pdo->query('ALTER TABLE ' . $this->quote($table) . ' MODIFY ' . $name . ' ' . $type);
 			}
 		}
 		//Sometimes a second pass is needed, if a column has gone from varchar -> int(11) a better int type may be needed

maphper/datasource/StmtCache.php

Indentation +15 added lines, -15 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 namespace Maphper\DataSource;
 class StmtCache {
-    private $pdo;
-    private $queryCache = [];
+	private $pdo;
+	private $queryCache = [];
 
-    public function __construct(\PDO $pdo) {
-        $this->pdo = $pdo;
-    }
+	public function __construct(\PDO $pdo) {
+		$this->pdo = $pdo;
+	}
 
-    public function getCachedStmt($sql) {
+	public function getCachedStmt($sql) {
 		$queryId = $this->getQueryId($sql);
 		if (isset($this->queryCache[$queryId])) $stmt = $this->queryCache[$queryId];
 		else {
@@ -18,15 +18,15 @@ 
 		return $stmt;
 	}
 
-    private function getQueryId($sql) {
-        return md5($sql);
-    }
+	private function getQueryId($sql) {
+		return md5($sql);
+	}
 
-    public function deleteQueryFromCache($sql) {
-        unset($this->queryCache[$this->getQueryId($sql)]);
-    }
+	public function deleteQueryFromCache($sql) {
+		unset($this->queryCache[$this->getQueryId($sql)]);
+	}
 
-    public function clearCache() {
-        $this->queryCache = [];
-    }
+	public function clearCache() {
+		$this->queryCache = [];
+	}
 }

maphper/datasource/DatabaseSelect.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
     }
 
     public function updateCache($data, $pkValue) {
-		if (isset($this->cache[$pkValue])) $this->cache[$pkValue] = (object) array_merge((array)$this->cache[$pkValue], (array)$data);
+		if (isset($this->cache[$pkValue])) $this->cache[$pkValue] = (object)array_merge((array)$this->cache[$pkValue], (array)$data);
 		else $this->cache[$pkValue] = $data;
     }
 

Indentation +49 added lines, -49 removed lines

@@ -2,31 +2,31 @@ 
 namespace Maphper\DataSource;
 
 class DatabaseSelect {
-    private $resultCache = [];
-    private $idCache = [];
-    private $selectBuilder;
-    private $whereBuilder;
-    private $adapter;
-    private $databaseModify;
-    private $defaultSort;
-    private $table;
-
-    public function __construct(DatabaseAdapter $adapter, DatabaseModify $databaseModify, $table, $defaultSort) {
-        $this->adapter = $adapter;
-        $this->databaseModify = $databaseModify;
-        $this->selectBuilder = new \Maphper\Lib\SelectBuilder();
-        $this->whereBuilder = new \Maphper\Lib\Sql\WhereBuilder();
-        $this->defaultSort = $defaultSort;
-        $this->table = $table;
-    }
-
-    public function findById($id, $pk) {
+	private $resultCache = [];
+	private $idCache = [];
+	private $selectBuilder;
+	private $whereBuilder;
+	private $adapter;
+	private $databaseModify;
+	private $defaultSort;
+	private $table;
+
+	public function __construct(DatabaseAdapter $adapter, DatabaseModify $databaseModify, $table, $defaultSort) {
+		$this->adapter = $adapter;
+		$this->databaseModify = $databaseModify;
+		$this->selectBuilder = new \Maphper\Lib\SelectBuilder();
+		$this->whereBuilder = new \Maphper\Lib\Sql\WhereBuilder();
+		$this->defaultSort = $defaultSort;
+		$this->table = $table;
+	}
+
+	public function findById($id, $pk) {
 		if (!isset($this->idCache[$id])) {
 			try {
 				$result = $this->selectQuery($this->selectBuilder->select($this->table, $pk . ' = :id', [':id' => $id], ['limit' => 1]));
 			}
 			catch (\Exception $e) {
-                // Don't issue an error if it cannot be found since we return null
+				// Don't issue an error if it cannot be found since we return null
 			}
 
 			if (isset($result[0])) 	$this->idCache[$id] = $result[0];
@@ -35,7 +35,7 @@ 
 		return $this->idCache[$id];
 	}
 
-    public function findByField(array $fields, $options = []) {
+	public function findByField(array $fields, $options = []) {
 		$cacheId = md5(serialize(func_get_args()));
 		if (!isset($this->resultCache[$cacheId])) {
 			$query = $this->whereBuilder->createSql($fields);
@@ -55,7 +55,7 @@ 
 		return $this->resultCache[$cacheId];
 	}
 
-    public function findAggregate($function, $field, $group = null, array $criteria = [], array $options = []) {
+	public function findAggregate($function, $field, $group = null, array $criteria = [], array $options = []) {
 		//Cannot count/sum/max multiple fields, pick the first one. This should only come into play when trying to count() a mapper with multiple primary keys
 		if (is_array($field)) $field = $field[0];
 		$query = $this->whereBuilder->createSql($criteria);
@@ -72,34 +72,34 @@ 
 		}
 	}
 
-    private function determineAggregateResult($result, $group, $field) {
-        if ($group != null) {
-            $ret = [];
-            foreach ($result as $res) $ret[$res->$field] = $res->val;
-            return $ret;
-        }
-        else if (isset($result[0])) return $result[0]->val;
-        else return 0;
-    }
-
-    private function selectQuery(\Maphper\Lib\Query $query) {
-        return $this->adapter->query($query)->fetchAll(\PDO::FETCH_OBJ);
-    }
-
-    public function clearResultCache() {
-        $this->resultCache = [];
-    }
-
-    public function clearIDCache() {
-        $this->idCache = [];
-    }
-
-    public function updateCache($data, $pkValue) {
+	private function determineAggregateResult($result, $group, $field) {
+		if ($group != null) {
+			$ret = [];
+			foreach ($result as $res) $ret[$res->$field] = $res->val;
+			return $ret;
+		}
+		else if (isset($result[0])) return $result[0]->val;
+		else return 0;
+	}
+
+	private function selectQuery(\Maphper\Lib\Query $query) {
+		return $this->adapter->query($query)->fetchAll(\PDO::FETCH_OBJ);
+	}
+
+	public function clearResultCache() {
+		$this->resultCache = [];
+	}
+
+	public function clearIDCache() {
+		$this->idCache = [];
+	}
+
+	public function updateCache($data, $pkValue) {
 		if (isset($this->cache[$pkValue])) $this->cache[$pkValue] = (object) array_merge((array)$this->cache[$pkValue], (array)$data);
 		else $this->cache[$pkValue] = $data;
-    }
+	}
 
-    public function deleteIDFromCache($id) {
-        unset($this->idCache[$id]);
-    }
+	public function deleteIDFromCache($id) {
+		unset($this->idCache[$id]);
+	}
 }