Level-2 / Maphper

maphper/datasource/mysqladapter.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/database.php

Indentation +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 	}
 
 	private function getAdapter(\PDO $pdo) {
-        $adapter = '\\Maphper\\DataSource\\' . ucfirst($pdo->getAttribute(\PDO::ATTR_DRIVER_NAME)) . 'Adapter';
+		$adapter = '\\Maphper\\DataSource\\' . ucfirst($pdo->getAttribute(\PDO::ATTR_DRIVER_NAME)) . 'Adapter';
 		return new $adapter($pdo);
 	}
 
@@ -121,7 +121,7 @@ 
 		else $limit = '';
 
 		$query = $this->selectBuilder->createSql($fields, $mode);
-        $query['sql'] = array_filter($query['sql']);
+		$query['sql'] = array_filter($query['sql']);
 		$this->adapter->query($this->crudBuilder->delete($this->table, $query['sql'], $query['args'], $limit));
 		$this->addIndex(array_keys($query['args']));
 

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 		if (isset($options['fields'])) $this->fields = implode(',', array_map([$this->adapter, 'quote'], $options['fields']));
 		$this->defaultSort = (isset($options['defaultSort'])) ? $options['defaultSort'] : implode(', ', $this->primaryKey);
 		if (isset($options['editmode'])) $this->alterDb = $options['editmode'] == true ? self::EDIT_STRUCTURE | self::EDIT_INDEX | self::EDIT_OPTIMISE : $options['editmode'];
-		if (self::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) $this->adapter->optimiseColumns($table);
+		if (self::EDIT_OPTIMISE & $this->alterDb && rand(0, 500) == 1) $this->adapter->optimiseColumns($table);
 	}
 
 	private function getAdapter(\PDO $pdo) {
@@ -168,7 +168,7 @@ 
 		//Something has changed, clear any cached results as they may now be incorrect
 		$this->resultCache = [];
 		$pkValue = $data->{$this->primaryKey[0]};
-		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;
 	}
 

maphper/datasource/mock.php

Indentation +91 added lines, -91 removed lines

@@ -2,113 +2,113 @@
 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 = []) {
-        $array = iterator_to_array($this->data->getIterator());
-        $filteredArray = array_filter($array, $this->getSearchFieldFunction($fields, \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND));
-        // Need to reset indexes
-        $filteredArray = array_values($filteredArray);
-        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 = []) {
+		$array = iterator_to_array($this->data->getIterator());
+		$filteredArray = array_filter($array, $this->getSearchFieldFunction($fields, \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND));
+		// Need to reset indexes
+		$filteredArray = array_values($filteredArray);
+		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;
+	}
 
-    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);
+	}
 
   	public function findAggregate($function, $field, $group = null, array $criteria = [], array $options = []) {
-        $array = iterator_to_array($this->data);
-        return $function($this->findByField($criteria));
-    }
+		$array = iterator_to_array($this->data);
+		return $function($this->findByField($criteria));
+	}
 
   	public function deleteById($id) {
-        unset($this->data[$id]);
-    }
+		unset($this->data[$id]);
+	}
 
   	public function deleteByField(array $fields) {
-        foreach ($this->findByField($fields) as $val) unset($this->data[$val->{$this->id[0]}]);
-    }
+		foreach ($this->findByField($fields) 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;
+		};
+	}
 
-    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);
 

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

Indentation +10 added lines, -10 removed lines

@@ -80,17 +80,17 @@
 		return ['args' => $args, 'sql' => [$query]];
 	}
 
-    private function getOperator($mode) {
-        $operator = "";
+	private function getOperator($mode) {
+		$operator = "";
 
-        if (\Maphper\Maphper::FIND_NOCASE & $mode) $operator = 'LIKE';
-        else 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_NOCASE & $mode) $operator = 'LIKE';
+		else 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;
+	}
 }

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

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 	public function __construct() {
 		$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;

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;