Level-2 / Maphper

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

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

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

Braces +5 added lines, -2 removed lines

@@ -25,8 +25,11 @@
 
 	public function offsetGet($key) {
 		$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);
+		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);
+		}
 	}
 
 	public function offsetSet($key, $value) {

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

Braces +14 added lines, -5 removed lines

@@ -6,7 +6,9 @@ 
 	private $localField;
 	
 	public function __construct(\Maphper\Maphper $mapper, $parentField, $localField, array $critiera = []) {
-		if ($critiera) $mapper->filter($critiera);
+		if ($critiera) {
+			$mapper->filter($critiera);
+		}
 		$this->mapper = $mapper;
 		$this->parentField = $parentField;
 		$this->localField = $localField;		
@@ -14,17 +16,24 @@ 
 	
 	
 	public function getData($parentObject) {
-		if (!isset($parentObject->{$this->parentField})) $mapper = $this->mapper;
-		else $mapper = $this->mapper->filter([$this->localField => $parentObject->{$this->parentField}]);
+		if (!isset($parentObject->{$this->parentField})) {
+			$mapper = $this->mapper;
+		} else {
+			$mapper = $this->mapper->filter([$this->localField => $parentObject->{$this->parentField}]);
+		}
 		
 		return $mapper;
 	}
 
 	
 	public function overwrite($key, &$mapper) {
-		if (!isset($key->{$this->parentField})) return false;
+		if (!isset($key->{$this->parentField})) {
+			return false;
+		}
 		foreach ($mapper as $k => $val) {
-			if (!empty($val->{$this->localField}) && $val->{$this->localField} == $key->{$this->parentField}) continue;
+			if (!empty($val->{$this->localField}) && $val->{$this->localField} == $key->{$this->parentField}) {
+				continue;
+			}
 			$val->{$this->localField} = $key->{$this->parentField};
 			$this->mapper[] = $val;
 		}

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

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
   }
 
   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();
 	}
 

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

Braces +25 added lines, -9 removed lines

@@ -61,7 +61,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;
 	}
@@ -78,13 +80,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);
@@ -92,7 +98,9 @@ 
 
 		$value = $this->processFilters($value);
 		$pk = $this->dataSource->getPrimaryKey();
-		if ($offset !== null) $value->{$pk[0]} = $offset;
+		if ($offset !== null) {
+			$value->{$pk[0]} = $offset;
+		}
 		$valueCopy = clone $value;
 		$value = $this->entity->wrap($this->relations, $value);
 		$this->dataSource->save($value);
@@ -104,7 +112,9 @@ 
 	}
 
 	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]);
@@ -117,7 +127,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);
@@ -128,11 +140,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) {

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

Braces +13 added lines, -7 removed lines

@@ -11,16 +11,21 @@ 
 		foreach ($columns as $column) {
 			$parts = explode('.', $column->Field_name);
 			$name = $this->quote(end($parts));
-			if ($column->Min_value === null && $column->Max_value === null) $this->pdo->query('ALTER TABLE ' . $this->quote($table) . ' DROP COLUMN ' . $name);
-			else {
+			if ($column->Min_value === null && $column->Max_value === null) {
+				$this->pdo->query('ALTER TABLE ' . $this->quote($table) . ' DROP COLUMN ' . $name);
+			} else {
 				$type = $column->Optimal_fieldtype;
 				if ($column->Max_length < 11) {
 					//Check for dates
 					$count = $this->pdo->query('SELECT count(*) as `count` FROM ' . $this->quote($table) . ' WHERE STR_TO_DATE(' . $name . ',\'%Y-%m-%d %H:%i:s\') IS NULL OR STR_TO_DATE(' . $name . ',\'%Y-%m-%d %H:%i:s\') != ' . $name . ' LIMIT 1')->fetch(\PDO::FETCH_OBJ)->count;
-					if ($count == 0) $type = 'DATETIME';
+					if ($count == 0) {
+						$type = 'DATETIME';
+					}
 
 					$count = $this->pdo->query('SELECT count(*) as `count` FROM ' . $this->quote($table) . ' WHERE STR_TO_DATE(' . $name . ',\'%Y-%m-%d\') IS NULL OR STR_TO_DATE(' . $name . ',\'%Y-%m-%d\') != ' . $name . ' LIMIT 1')->fetch(\PDO::FETCH_OBJ)->count;
-					if ($count == 0) $type = 'DATE';
+					if ($count == 0) {
+						$type = 'DATE';
+					}
 				}
 
 				//If it's text, work out if it would be better to be something else
@@ -30,8 +35,7 @@ 
 					if ($count == 0) {
 						$type = 'INT(11)';
 						$runAgain = true;
-					}
-					else {
+					} else {
 						//See if it's decimal
 						$count = $this->pdo->query('SELECT count(*) FROM ' . $table . ' WHERE concat(\'\', ' . $name . ' * 1) != ' . $name . ')')->fetch(\PDO::FETCH_OBJ)->count;
 						if ($count == 0) {
@@ -45,6 +49,8 @@ 
 			}
 		}
 		//Sometimes a second pass is needed, if a column has gone from varchar -> int(11) a better int type may be needed
-		if ($runAgain) $this->optimiseColumns($table);
+		if ($runAgain) {
+			$this->optimiseColumns($table);
+		}
 	}
 }
\ No newline at end of file

maphper/datasource/databaseoptions.php

Braces +6 added lines, -2 removed lines

@@ -10,7 +10,9 @@ 
 	}
 
 	public function getAdapter() {
-		if (!($this->db instanceof \PDO)) return $this->db;
+		if (!($this->db instanceof \PDO)) {
+			return $this->db;
+		}
 
 		$adapter = '\\Maphper\\DataSource\\' . ucfirst($this->db->getAttribute(\PDO::ATTR_DRIVER_NAME)) . 'Adapter';
 
@@ -18,7 +20,9 @@ 
 	}
 
 	public function getEditMode() {
-		if (!isset($this->options['editmode'])) return false;
+		if (!isset($this->options['editmode'])) {
+			return false;
+		}
 
 		return $this->options['editmode'] === true ? Database::EDIT_STRUCTURE | Database::EDIT_INDEX | Database::EDIT_OPTIMISE : $this->options['editmode'];
 	}

maphper/datasource/StmtCache.php

Braces +6 added lines, -3 removed lines

@@ -10,10 +10,13 @@
 
     public function getCachedStmt($sql) {
 		$queryId = $this->getQueryId($sql);
-		if (isset($this->queryCache[$queryId])) $stmt = $this->queryCache[$queryId];
-		else {
+		if (isset($this->queryCache[$queryId])) {
+			$stmt = $this->queryCache[$queryId];
+		} else {
 			$stmt = $this->pdo->prepare($sql, [\PDO::ATTR_CURSOR => \PDO::CURSOR_FWDONLY]);
-			if ($stmt) $this->queryCache[$queryId] = $stmt;
+			if ($stmt) {
+				$this->queryCache[$queryId] = $stmt;
+			}
 		}
 		return $stmt;
 	}

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 = [];
+	}
 }