Level-2 / Maphper

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/Relation/One.php

Indentation +9 added lines, -9 removed lines

@@ -9,7 +9,7 @@ 
 	private $siblings = [];
 
 	public function __construct(\Maphper\Maphper $mapper, $parentField, $localField, array $criteria = []) {
-        if ($criteria) $mapper = $mapper->filter($this->criteira);
+		if ($criteria) $mapper = $mapper->filter($this->criteira);
 		$this->mapper = $mapper;
 		$this->parentField = $parentField;
 		$this->localField = $localField;
@@ -48,17 +48,17 @@ 
 		//Fetch the results so they're in the cache for the corresponding maphper object
 		$results = $this->mapper->filter([$this->localField => $recordsToLoad]);
 
-        $this->loadDataIntoSiblings($results);
+		$this->loadDataIntoSiblings($results);
 	}
 
-    private function loadDataIntoSiblings($results) {
-        $cache = [];
+	private function loadDataIntoSiblings($results) {
+		$cache = [];
 		foreach ($results as $result) {
 			$cache[$result->{$this->localField}] = $result;
 		}
 
 		foreach ($this->siblings as $sibling) {
-            if (isset($cache[$sibling->parentObject->{$this->parentField}])) $sibling->data = $cache[$sibling->parentObject->{$this->parentField}];
+			if (isset($cache[$sibling->parentObject->{$this->parentField}])) $sibling->data = $cache[$sibling->parentObject->{$this->parentField}];
 		}
 		/*
 		foreach ($this->siblings as $sibling) {
@@ -66,7 +66,7 @@ 
 			else $sibling->data = $sibling->mapper->filter([$sibling->localField => $sibling->parentObject->{$this->parentField}])->item(0);
 		}
 		*/
-    }
+	}
 
 	public function __call($func, array $args = []) {
 		if ($this->lazyLoad() == null) return '';
@@ -75,7 +75,7 @@ 
 
 	public function __get($name) {
 		if ($this->lazyLoad()) return $this->lazyLoad()->$name;
-        else return null;
+		else return null;
 	}
 
 	public function __isset($name) {
@@ -83,9 +83,9 @@ 
 	}
 
 	public function overwrite($parentObject, &$data) {
-        $this->mapper[] = $data;
+		$this->mapper[] = $data;
 
-        if (!isset($parentObject->{$this->parentField}) || $parentObject->{$this->parentField} != $data->{$this->localField}) {
+		if (!isset($parentObject->{$this->parentField}) || $parentObject->{$this->parentField} != $data->{$this->localField}) {
 			$parentObject->{$this->parentField} = $data->{$this->localField};
 			//Trigger an update of the parent object
 			return true;

Braces +20 added lines, -7 removed lines

@@ -9,7 +9,9 @@ 
 	private $siblings = [];
 
 	public function __construct(\Maphper\Maphper $mapper, $parentField, $localField, array $criteria = []) {
-        if ($criteria) $mapper = $mapper->filter($this->criteira);
+        if ($criteria) {
+        	$mapper = $mapper->filter($this->criteira);
+        }
 		$this->mapper = $mapper;
 		$this->parentField = $parentField;
 		$this->localField = $localField;
@@ -29,7 +31,9 @@ 
 	private function lazyLoad() {
 		if (!isset($this->data)) {
 
-			if ($this->parentObject == null) throw new \Exception('Error, no object set');
+			if ($this->parentObject == null) {
+				throw new \Exception('Error, no object set');
+			}
 
 			$this->eagerLoad();
 
@@ -41,8 +45,10 @@ 
 		$recordsToLoad = [];
 		//Get a list of records by FK to eager load
 		foreach ($this->siblings as $sibling) {
-			if ($sibling->parentField === $this->parentField) // Ensure that it is only loading records from the same type of relation
+			if ($sibling->parentField === $this->parentField) {
+				// Ensure that it is only loading records from the same type of relation
 				$recordsToLoad[] = $sibling->parentObject->{$sibling->parentField};
+			}
 		}
 
 		$recordsToLoad = array_unique($recordsToLoad);
@@ -59,7 +65,9 @@ 
 		}
 
 		foreach ($this->siblings as $sibling) {
-            if (isset($cache[$sibling->parentObject->{$this->parentField}])) $sibling->data = $cache[$sibling->parentObject->{$this->parentField}];
+            if (isset($cache[$sibling->parentObject->{$this->parentField}])) {
+            	$sibling->data = $cache[$sibling->parentObject->{$this->parentField}];
+            }
 		}
 		/*
 		foreach ($this->siblings as $sibling) {
@@ -70,13 +78,18 @@ 
     }
 
 	public function __call($func, array $args = []) {
-		if ($this->lazyLoad() == null) return '';
+		if ($this->lazyLoad() == null) {
+			return '';
+		}
 		return call_user_func_array([$this->lazyLoad(), $func], $args);
 	}
 
 	public function __get($name) {
-		if ($this->lazyLoad()) return $this->lazyLoad()->$name;
-        else return null;
+		if ($this->lazyLoad()) {
+			return $this->lazyLoad()->$name;
+		} 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() {

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/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')];
 				}
 			}
 		}
@@ -103,7 +103,7 @@ 
 
     private function offsetSetAutotraverse($value, $relatedField, $valueField) {
         $record = new \stdClass;
-        $record->{$this->parentField} =  $value->{$this->localField};
+        $record->{$this->parentField} = $value->{$this->localField};
         $record->$valueField = $this->object->{$relatedField};
         $this->intermediateMapper[] = $record;
     }

Braces +9 added lines, -4 removed lines

@@ -32,8 +32,12 @@ 
 		list($relatedField, $valueField, $mapper) = $this->getOtherFieldNameInfo();
 		$this->results = $data;
 		$this->object = $parentObject;
-		if (empty($parentObject->{$relatedField})) return;
-		foreach ($data as $dt) $this[] = $dt;
+		if (empty($parentObject->{$relatedField})) {
+			return;
+		}
+		foreach ($data as $dt) {
+			$this[] = $dt;
+		}
 	}
 
 	//bit hacky, breaking encapsulation, but simplest way to work out the info for the other side of the many:many relationship.
@@ -88,8 +92,9 @@ 
 
 	public function offsetSet($name, $value) {
 		list($relatedField, $valueField, $mapper) = $this->getOtherFieldNameInfo();
-		if ($this->autoTraverse) $this->offsetSetAutotraverse($value, $relatedField, $valueField);
-		else if ($this->doUpdateInterMapper($value, $relatedField, $valueField)) {
+		if ($this->autoTraverse) {
+			$this->offsetSetAutotraverse($value, $relatedField, $valueField);
+		} else if ($this->doUpdateInterMapper($value, $relatedField, $valueField)) {
             $record = $value;
 			$record->{$this->parentField} = $value->{$this->intermediateName}->{$this->localField};
 			$record->$valueField = $this->object->{$relatedField};

Indentation +14 added lines, -14 removed lines

@@ -90,26 +90,26 @@
 		list($relatedField, $valueField, $mapper) = $this->getOtherFieldNameInfo();
 		if ($this->autoTraverse) $this->offsetSetAutotraverse($value, $relatedField, $valueField);
 		else if ($this->doUpdateInterMapper($value, $relatedField, $valueField)) {
-            $record = $value;
+			$record = $value;
 			$record->{$this->parentField} = $value->{$this->intermediateName}->{$this->localField};
 			$record->$valueField = $this->object->{$relatedField};
 			$this->intermediateMapper[] = $record;
 		}
 	}
 
-    private function doUpdateInterMapper($record, $relatedField, $valueField) {
-        return !(isset($record->{$this->parentField}) && isset($record->{$this->intermediateName}) &&
-            isset($record->$valueField) && isset($this->object->{$relatedField}) &&
-            $record->{$this->parentField} == $record->{$this->intermediateName}->{$this->localField} &&
-            $record->$valueField == $this->object->{$relatedField});
-    }
-
-    private function offsetSetAutotraverse($value, $relatedField, $valueField) {
-        $record = new \stdClass;
-        $record->{$this->parentField} =  $value->{$this->localField};
-        $record->$valueField = $this->object->{$relatedField};
-        $this->intermediateMapper[] = $record;
-    }
+	private function doUpdateInterMapper($record, $relatedField, $valueField) {
+		return !(isset($record->{$this->parentField}) && isset($record->{$this->intermediateName}) &&
+			isset($record->$valueField) && isset($this->object->{$relatedField}) &&
+			$record->{$this->parentField} == $record->{$this->intermediateName}->{$this->localField} &&
+			$record->$valueField == $this->object->{$relatedField});
+	}
+
+	private function offsetSetAutotraverse($value, $relatedField, $valueField) {
+		$record = new \stdClass;
+		$record->{$this->parentField} =  $value->{$this->localField};
+		$record->$valueField = $this->object->{$relatedField};
+		$this->intermediateMapper[] = $record;
+	}
 
 	public function offsetUnset($id) {
 		//$this->relation->mapper->filter([$relatedField => $this->object->$valueField, $this->relation->parentField => $id])->delete();

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/Lib/Sql/In.php

Indentation +20 added lines, -20 removed lines

@@ -2,28 +2,28 @@
 namespace Maphper\Lib\Sql;
 
 class In implements WhereConditional {
-    public function matches($key, $value, $mode) {
-        return !is_numeric($key) && is_array($value);
-    }
+	public function matches($key, $value, $mode) {
+		return !is_numeric($key) && is_array($value);
+	}
 
-    public function getSql($key, $value, $mode) {
-        $args = [];
-        $inSql = [];
-        $count = count($value);
-        $value = array_values($value); // fix numeric index being different than $i
-        for ($i = 0; $i < $count; $i++) {
-            $args[$key . $i] = $value[$i];
-            $inSql[] = ':' . $key . $i;
-        }
+	public function getSql($key, $value, $mode) {
+		$args = [];
+		$inSql = [];
+		$count = count($value);
+		$value = array_values($value); // fix numeric index being different than $i
+		for ($i = 0; $i < $count; $i++) {
+			$args[$key . $i] = $value[$i];
+			$inSql[] = ':' . $key . $i;
+		}
 
-        $notText = '';
-        if (\Maphper\Maphper::FIND_NOT & $mode) {
-            $notText = ' NOT';
-        }
+		$notText = '';
+		if (\Maphper\Maphper::FIND_NOT & $mode) {
+			$notText = ' NOT';
+		}
 
-        if (count($inSql) == 0) return ['args' => [], 'sql' => ''];
-        else $sql = [$key . $notText . ' IN ( ' .  implode(', ', $inSql) . ')'];
+		if (count($inSql) == 0) return ['args' => [], 'sql' => ''];
+		else $sql = [$key . $notText . ' IN ( ' .  implode(', ', $inSql) . ')'];
 
-        return ['args' => $args, 'sql' => $sql];
-    }
+		return ['args' => $args, 'sql' => $sql];
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
         }
 
         if (count($inSql) == 0) return ['args' => [], 'sql' => ''];
-        else $sql = [$key . $notText . ' IN ( ' .  implode(', ', $inSql) . ')'];
+        else $sql = [$key . $notText . ' IN ( ' . implode(', ', $inSql) . ')'];
 
         return ['args' => $args, 'sql' => $sql];
     }

Braces +5 added lines, -2 removed lines

@@ -21,8 +21,11 @@
             $notText = ' NOT';
         }
 
-        if (count($inSql) == 0) return ['args' => [], 'sql' => ''];
-        else $sql = [$key . $notText . ' IN ( ' .  implode(', ', $inSql) . ')'];
+        if (count($inSql) == 0) {
+        	return ['args' => [], 'sql' => ''];
+        } else {
+        	$sql = [$key . $notText . ' IN ( ' .  implode(', ', $inSql) . ')'];
+        }
 
         return ['args' => $args, 'sql' => $sql];
     }

Maphper/DataSource/Mock.php

Indentation +90 added lines, -90 removed lines

@@ -2,100 +2,100 @@
 namespace Maphper\DataSource;
 use Maphper\Maphper;
 class Mock implements \Maphper\DataSource {
-    private $data;
-    private $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 findById($id) {
-        return isset($this->data[$id]) ? (array)$this->data[$id] : [];
-    }
-
-    public function findByField(array $fields, $options = []) {
-        $arrayFilter = new \Maphper\Lib\ArrayFilter(iterator_to_array($this->data->getIterator()));
-        $filteredArray = $arrayFilter->filter($fields);
-        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 $data;
+	private $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 findById($id) {
+		return isset($this->data[$id]) ? (array)$this->data[$id] : [];
+	}
+
+	public function findByField(array $fields, $options = []) {
+		$arrayFilter = new \Maphper\Lib\ArrayFilter(iterator_to_array($this->data->getIterator()));
+		$filteredArray = $arrayFilter->filter($fields);
+		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 findAggregate($function, $field, $group = null, array $criteria = [], array $options = []) {
-        return $function($this->findByField($criteria));
-    }
+		return $function($this->findByField($criteria));
+	}
 
   	public function deleteById($id) {
-        unset($this->data[$id]);
-    }
+		unset($this->data[$id]);
+	}
 
   	public function deleteByField(array $fields, array $options) {
-        foreach ($this->findByField($fields, $options) as $val) {
-            if (count($this->id) > 1) $id = $this->getMultiPkSaveId($val);
-            else $id = $val->{$this->id[0]};
-
-            unset($this->data[$id]);
-        }
-    }
-
-    public function save($data) {
-        if (count($this->id) > 1) return $this->saveMultiPk($data);
-        else return $this->saveSinglePk($data);
-    }
-
-    private function saveSinglePk($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);
-    }
-
-    private function saveMultiPk($data) {
-        $saveId = $this->getMultiPkSaveId($data);
-
-        $this->data[$saveId] = (object)array_merge($this->findById($saveId), (array)$data);
-    }
-
-    private function getMultiPkSaveId($data) {
-        $keyVals = [];
-        foreach ($this->id as $keyName) {
-            $keyVals[] = $data->$keyName;
-        }
-        return implode(',', $keyVals);
-    }
-
-    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;
-        };
-    }
+		foreach ($this->findByField($fields, $options) as $val) {
+			if (count($this->id) > 1) $id = $this->getMultiPkSaveId($val);
+			else $id = $val->{$this->id[0]};
+
+			unset($this->data[$id]);
+		}
+	}
+
+	public function save($data) {
+		if (count($this->id) > 1) return $this->saveMultiPk($data);
+		else return $this->saveSinglePk($data);
+	}
+
+	private function saveSinglePk($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);
+	}
+
+	private function saveMultiPk($data) {
+		$saveId = $this->getMultiPkSaveId($data);
+
+		$this->data[$saveId] = (object)array_merge($this->findById($saveId), (array)$data);
+	}
+
+	private function getMultiPkSaveId($data) {
+		$keyVals = [];
+		foreach ($this->id as $keyName) {
+			$keyVals[] = $data->$keyName;
+		}
+		return implode(',', $keyVals);
+	}
+
+	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;
+		};
+	}
 }

Braces +24 added lines, -11 removed lines

@@ -25,8 +25,12 @@ 
             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']);
+        if (isset($options['offset'])) {
+        	$filteredArray = array_slice($filteredArray, $options['offset']);
+        }
+        if (isset($options['limit'])) {
+        	$filteredArray = array_slice($filteredArray, 0, $options['limit']);
+        }
         return $filteredArray;
     }
 
@@ -40,23 +44,28 @@ 
 
   	public function deleteByField(array $fields, array $options) {
         foreach ($this->findByField($fields, $options) as $val) {
-            if (count($this->id) > 1) $id = $this->getMultiPkSaveId($val);
-            else $id = $val->{$this->id[0]};
+            if (count($this->id) > 1) {
+            	$id = $this->getMultiPkSaveId($val);
+            } else {
+            	$id = $val->{$this->id[0]};
+            }
 
             unset($this->data[$id]);
         }
     }
 
     public function save($data) {
-        if (count($this->id) > 1) return $this->saveMultiPk($data);
-        else return $this->saveSinglePk($data);
+        if (count($this->id) > 1) {
+        	return $this->saveMultiPk($data);
+        } else {
+        	return $this->saveSinglePk($data);
+        }
     }
 
     private function saveSinglePk($data) {
         if (isset($data->{$this->id[0]})) {
             $id = $data->{$this->id[0]};
-        }
-        else {
+        } else {
             $id = count($this->data);
             $data->{$this->id[0]} = $id;
         }
@@ -90,12 +99,16 @@ 
             if ($aColumn === $bColumn) {
               $sortVal = 0;
               continue;
+            } else {
+            	$sortVal = ($aColumn < $bColumn) ? -1 : 1;
             }
-            else $sortVal = ($aColumn < $bColumn) ? -1 : 1;
             break;
           }
-          if ($order === 'desc') return -$sortVal;
-          else return $sortVal;
+          if ($order === 'desc') {
+          	return -$sortVal;
+          } else {
+          	return $sortVal;
+          }
         };
     }
 }

Maphper/DataSource/DatabaseOptions.php

Braces +6 added lines, -2 removed lines

@@ -10,7 +10,9 @@ 
 	}
 
 	public function getAdapter() {
-		if ($this->db instanceof \Maphper\DataSource) return $this->db;
+		if ($this->db instanceof \Maphper\DataSource) {
+			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'];
 	}

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	}
 
 	public function getCacheMode() {
-		return (int) ($this->options['cachemode'] ?? 0);
+		return (int)($this->options['cachemode'] ?? 0);
 	}
 
 	public function read($option) {

Maphper/DataSource/GeneralEditDatabase.php

Indentation +32 added lines, -32 removed lines

@@ -2,55 +2,55 @@
 namespace Maphper\DataSource;
 
 class GeneralEditDatabase {
-    private $pdo;
-    private $dataTypes = [
-        'datetime' => 'DATETIME',
-        'int' => 'INT(11)',
-        'decimal' => 'DECIMAL',
-        'short_string' => 'VARCHAR',
-        'long_string' => 'LONGBLOG',
-        'short_string_max_len' => 255,
-        'other' => 'VARCHAR(255)',
+	private $pdo;
+	private $dataTypes = [
+		'datetime' => 'DATETIME',
+		'int' => 'INT(11)',
+		'decimal' => 'DECIMAL',
+		'short_string' => 'VARCHAR',
+		'long_string' => 'LONGBLOG',
+		'short_string_max_len' => 255,
+		'other' => 'VARCHAR(255)',
 
-        'pk_default' => 'INT(11) NOT NULL AUTO_INCREMENT'
-    ];
+		'pk_default' => 'INT(11) NOT NULL AUTO_INCREMENT'
+	];
 
-    public function __construct(\PDO $pdo, array $dataTypes) {
-        $this->pdo = $pdo;
-        $this->dataTypes = array_merge($this->dataTypes, $dataTypes);
-    }
+	public function __construct(\PDO $pdo, array $dataTypes) {
+		$this->pdo = $pdo;
+		$this->dataTypes = array_merge($this->dataTypes, $dataTypes);
+	}
 
-    public function quote($str) {
+	public function quote($str) {
 		return '`' . str_replace('.', '`.`', trim($str, '`')) . '`';
 	}
 
-    public function getType($val) {
+	public function getType($val) {
 		if ($val instanceof \DateTimeInterface) return $this->dataTypes['datetime'];
 		else if ($result = $this->doNumberTypes($val)) return $result;
 		else if ($result = $this->doStringTypes($val)) return $result;
 		else return $this->dataTypes['other'];
 	}
 
-    private function doNumberTypes($val) {
-        if (is_int($val)) return $this->dataTypes['int'];
+	private function doNumberTypes($val) {
+		if (is_int($val)) return $this->dataTypes['int'];
 		else if (is_double($val)) return $this->dataTypes['decimal'] . '(9,' . (strlen($val) - strrpos($val, '.') - 1) . ')';
-        else return false;
-    }
+		else return false;
+	}
 
-    private function doStringTypes($val) {
-        if (!is_string($val)) return false;
-        if (strlen($val) <= $this->dataTypes['short_string_max_len'])
-            return $this->dataTypes['short_string'] . '(' . $this->dataTypes['short_string_max_len'] . ')';
+	private function doStringTypes($val) {
+		if (!is_string($val)) return false;
+		if (strlen($val) <= $this->dataTypes['short_string_max_len'])
+			return $this->dataTypes['short_string'] . '(' . $this->dataTypes['short_string_max_len'] . ')';
 		else return $this->dataTypes['long_string'];
-    }
+	}
 
-    public function isNotSavableType($value, $key, $primaryKey) {
-        return is_array($value) || (is_object($value) && !($value instanceof \DateTimeInterface)) ||
-                in_array($key, $primaryKey);
-    }
+	public function isNotSavableType($value, $key, $primaryKey) {
+		return is_array($value) || (is_object($value) && !($value instanceof \DateTimeInterface)) ||
+				in_array($key, $primaryKey);
+	}
 
-    //Alter the database so that it can store $data
-    public function createTable($table, array $primaryKey, $data) {
+	//Alter the database so that it can store $data
+	public function createTable($table, array $primaryKey, $data) {
 		$parts = [];
 		foreach ($primaryKey as $key) {
 			$pk = $data->$key;

Braces +29 added lines, -13 removed lines

@@ -25,23 +25,36 @@ 
 	}
 
     public function getType($val) {
-		if ($val instanceof \DateTimeInterface) return $this->dataTypes['datetime'];
-		else if ($result = $this->doNumberTypes($val)) return $result;
-		else if ($result = $this->doStringTypes($val)) return $result;
-		else return $this->dataTypes['other'];
+		if ($val instanceof \DateTimeInterface) {
+			return $this->dataTypes['datetime'];
+		} else if ($result = $this->doNumberTypes($val)) {
+			return $result;
+		} else if ($result = $this->doStringTypes($val)) {
+			return $result;
+		} else {
+			return $this->dataTypes['other'];
+		}
 	}
 
     private function doNumberTypes($val) {
-        if (is_int($val)) return $this->dataTypes['int'];
-		else if (is_double($val)) return $this->dataTypes['decimal'] . '(9,' . (strlen($val) - strrpos($val, '.') - 1) . ')';
-        else return false;
+        if (is_int($val)) {
+        	return $this->dataTypes['int'];
+        } else if (is_double($val)) {
+			return $this->dataTypes['decimal'] . '(9,' . (strlen($val) - strrpos($val, '.') - 1) . ')';
+		} else {
+        	return false;
+        }
     }
 
     private function doStringTypes($val) {
-        if (!is_string($val)) return false;
-        if (strlen($val) <= $this->dataTypes['short_string_max_len'])
-            return $this->dataTypes['short_string'] . '(' . $this->dataTypes['short_string_max_len'] . ')';
-		else return $this->dataTypes['long_string'];
+        if (!is_string($val)) {
+        	return false;
+        }
+        if (strlen($val) <= $this->dataTypes['short_string_max_len']) {
+                    return $this->dataTypes['short_string'] . '(' . $this->dataTypes['short_string_max_len'] . ')';
+        } else {
+			return $this->dataTypes['long_string'];
+		}
     }
 
     public function isNotSavableType($value, $key, $primaryKey) {
@@ -54,8 +67,11 @@ 
 		$parts = [];
 		foreach ($primaryKey as $key) {
 			$pk = $data->$key;
-			if ($pk == null) $parts[] = $key . ' ' . $this->dataTypes['pk_default'];
-			else $parts[] = $key . ' ' . $this->getType($pk) . ' NOT NULL';
+			if ($pk == null) {
+				$parts[] = $key . ' ' . $this->dataTypes['pk_default'];
+			} else {
+				$parts[] = $key . ' ' . $this->getType($pk) . ' NOT NULL';
+			}
 		}
 
 		$pkField = implode(', ', $parts) . ', PRIMARY KEY(' . implode(', ', $primaryKey) . ')';