Level-2 / Maphper

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/lib/dateinjector.php

Braces +18 added lines, -8 removed lines

@@ -6,25 +6,35 @@
 
 	public function replaceDates($obj, $reset = true) {
 		//prevent infinite recursion, only process each object once
-		if ($this->checkCache($obj, $reset)) return $obj;
+		if ($this->checkCache($obj, $reset)) {
+			return $obj;
+		}
 
-		if (is_array($obj) || (is_object($obj) && ($obj instanceof \Iterator))) foreach ($obj as &$o) $o = $this->replaceDates($o, false);
+		if (is_array($obj) || (is_object($obj) && ($obj instanceof \Iterator))) {
+			foreach ($obj as &$o) $o = $this->replaceDates($o, false);
+		}
 		if (is_string($obj) && isset($obj[0]) && is_numeric($obj[0]) && strlen($obj) <= 20) {
 			try {
 				$date = new \DateTime($obj);
-				if ($date->format('Y-m-d H:i:s') == substr($obj, 0, 20) || $date->format('Y-m-d') == substr($obj, 0, 10)) $obj = $date;
-			}
-			catch (\Exception $e) {	//Doesn't need to do anything as the try/catch is working out whether $obj is a date
+				if ($date->format('Y-m-d H:i:s') == substr($obj, 0, 20) || $date->format('Y-m-d') == substr($obj, 0, 10)) {
+					$obj = $date;
+				}
+			} catch (\Exception $e) {	//Doesn't need to do anything as the try/catch is working out whether $obj is a date
 			}
 		}
 		return $obj;
 	}
 
 	private function checkCache($obj, $reset) {
-		if ($reset) $this->processCache = new \SplObjectStorage();
+		if ($reset) {
+			$this->processCache = new \SplObjectStorage();
+		}
 
-		if (is_object($obj) && $this->processCache->contains($obj)) return $obj;
-		else if (is_object($obj)) $this->processCache->attach($obj, true);
+		if (is_object($obj) && $this->processCache->contains($obj)) {
+			return $obj;
+		} else if (is_object($obj)) {
+			$this->processCache->attach($obj, true);
+		}
 
 		return false;
 	}

maphper/maphper.php

Indentation +8 added lines, -8 removed lines

@@ -104,10 +104,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);
 	}
 
@@ -117,10 +117,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);
 	}
 

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

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

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 		foreach ($relations as $name => $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;
+				if ($relation->overwrite($object, $object->$name)) {
+					$this->parent[] = $object;
+				}
 			}
 
 			$object->$name = $relation->getData($object, $siblings);

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

Braces +4 added lines, -3 removed lines

@@ -9,12 +9,13 @@
 		if ($object instanceof \stdclass) {
 			$this->readClosure = function() use ($object) { return $object;	};
 			$this->writeClosure = function ($field, $value) use ($object) { $object->$field = $value; };
-		}
-		else {
+		} else {
 			$this->readClosure = function() {
 				$data = new \stdClass;
 				foreach ($this as $k => $v)	{
-					if (is_scalar($v) || is_null($v) || (is_object($v) && $v instanceof \DateTime))	$data->$k = $v;
+					if (is_scalar($v) || is_null($v) || (is_object($v) && $v instanceof \DateTime)) {
+						$data->$k = $v;
+					}
 				}
 				return $data;
 			};

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

Braces +41 added lines, -18 removed lines

@@ -16,10 +16,13 @@ 
 
 	private function getCachedStmt($sql) {
 		$queryId = md5($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;
 	}
@@ -28,20 +31,30 @@ 
 		$stmt = $this->getCachedStmt($query->getSql());
 		$args = $query->getArgs();
 		foreach ($args as $name => &$arg) {
-			if ($arg instanceof \DateTime) $arg = $arg->format('Y-m-d H:i:s');
+			if ($arg instanceof \DateTime) {
+				$arg = $arg->format('Y-m-d H:i:s');
+			}
 		}
 
 		$res = $stmt->execute($args);
 
-		if (strpos(trim($query->getSql()), 'SELECT') === 0) return $stmt->fetchAll(\PDO::FETCH_OBJ);
-		else return $stmt;
+		if (strpos(trim($query->getSql()), 'SELECT') === 0) {
+			return $stmt->fetchAll(\PDO::FETCH_OBJ);
+		} else {
+			return $stmt;
+		}
 	}
 
 	private function getType($val) {
-		if ($val instanceof \DateTime) return 'DATETIME';
-		else if (is_int($val)) return  'INT(11)';
-		else if (is_double($val)) return 'DECIMAL(9,' . strlen($val) - strrpos($val, '.') - 1 . ')';
-		else if (is_string($val)) return strlen($val) < 192 ? 'VARCHAR(191)' : 'LONGBLOB';
+		if ($val instanceof \DateTime) {
+			return 'DATETIME';
+		} else if (is_int($val)) {
+			return  'INT(11)';
+		} else if (is_double($val)) {
+			return 'DECIMAL(9,' . strlen($val) - strrpos($val, '.') - 1 . ')';
+		} else if (is_string($val)) {
+			return strlen($val) < 192 ? 'VARCHAR(191)' : 'LONGBLOB';
+		}
 		return 'VARCHAR(191)';
 	}
 
@@ -50,8 +63,11 @@ 
 		$parts = [];
 		foreach ($primaryKey as $key) {
 			$pk = $data->$key;
-			if ($pk == null) $parts[] = $key . ' INT(11) NOT NULL AUTO_INCREMENT';
-			else $parts[] = $key . ' ' . $this->getType($pk) . ' NOT NULL';
+			if ($pk == null) {
+				$parts[] = $key . ' INT(11) NOT NULL AUTO_INCREMENT';
+			} else {
+				$parts[] = $key . ' ' . $this->getType($pk) . ' NOT NULL';
+			}
 		}
 
 		$pkField = implode(', ', $parts) . ', PRIMARY KEY(' . implode(', ', $primaryKey) . ')';
@@ -62,15 +78,20 @@ 
 		$this->createTable($table, $primaryKey, $data);
 
 		foreach ($data as $key => $value) {
-			if (is_array($value) || (is_object($value) && !($value instanceof \DateTime))) continue;
-			if (in_array($key, $primaryKey)) continue;
+			if (is_array($value) || (is_object($value) && !($value instanceof \DateTime))) {
+				continue;
+			}
+			if (in_array($key, $primaryKey)) {
+				continue;
+			}
 
 			$type = $this->getType($value);
 
 			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);
 			}
 		}
@@ -88,7 +109,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) {