Level-2 / Maphper

Maphper/Lib/Sql/WhereConditional.php

Indentation +2 added lines, -2 removed lines

@@ -2,6 +2,6 @@
 namespace Maphper\Lib\Sql;
 
 interface WhereConditional {
-    public function matches($key, $value, $mode);
-    public function getSql($key, $value, $mode);
+	public function matches($key, $value, $mode);
+	public function getSql($key, $value, $mode);
 }

Maphper/Lib/Sql/Between.php

Indentation +15 added lines, -15 removed lines

@@ -2,20 +2,20 @@
 namespace Maphper\Lib\Sql;
 
 class Between implements WhereConditional {
-    public function matches($key, $value, $mode) {
-        return is_array($value) && \Maphper\Maphper::FIND_BETWEEN & $mode;
-    }
+	public function matches($key, $value, $mode) {
+		return is_array($value) && \Maphper\Maphper::FIND_BETWEEN & $mode;
+	}
 
-    public function getSql($key, $value, $mode) {
-        return [
-            'sql' => [
-                $key . '>= :' . $key . 'from',
-                $key . ' <= :' . $key . 'to'
-            ],
-            'args' => [
-                $key . 'from' => $value[0],
-                $key . 'to' => $value[1]
-            ]
-        ];
-    }
+	public function getSql($key, $value, $mode) {
+		return [
+			'sql' => [
+				$key . '>= :' . $key . 'from',
+				$key . ' <= :' . $key . 'to'
+			],
+			'args' => [
+				$key . 'from' => $value[0],
+				$key . 'to' => $value[1]
+			]
+		];
+	}
 }

Maphper/Lib/Sql/Like.php

Indentation +15 added lines, -15 removed lines

@@ -3,21 +3,21 @@
 use Maphper\Maphper;
 
 class Like implements WhereConditional {
-    public function matches($key, $value, $mode) {
-        return (Maphper::FIND_LIKE | Maphper::FIND_STARTS |
-                Maphper::FIND_ENDS | Maphper::FIND_NOCASE) & $mode;
-    }
+	public function matches($key, $value, $mode) {
+		return (Maphper::FIND_LIKE | Maphper::FIND_STARTS |
+				Maphper::FIND_ENDS | Maphper::FIND_NOCASE) & $mode;
+	}
 
-    public function getSql($key, $value, $mode) {
-        return [
-            'sql' => [$key . ' LIKE :' . $key],
-            'args' => [$key => $this->getValue($value, $mode)]
-        ];
-    }
+	public function getSql($key, $value, $mode) {
+		return [
+			'sql' => [$key . ' LIKE :' . $key],
+			'args' => [$key => $this->getValue($value, $mode)]
+		];
+	}
 
-    private function getValue($value, $mode) {
-        if ((Maphper::FIND_LIKE | Maphper::FIND_ENDS) & $mode) $value = '%' . $value;
-        if ((Maphper::FIND_LIKE | Maphper::FIND_STARTS) & $mode) $value .= '%';
-        return $value;
-    }
+	private function getValue($value, $mode) {
+		if ((Maphper::FIND_LIKE | Maphper::FIND_ENDS) & $mode) $value = '%' . $value;
+		if ((Maphper::FIND_LIKE | Maphper::FIND_STARTS) & $mode) $value .= '%';
+		return $value;
+	}
 }

Braces +6 added lines, -2 removed lines

@@ -16,8 +16,12 @@
     }
 
     private function getValue($value, $mode) {
-        if ((Maphper::FIND_LIKE | Maphper::FIND_ENDS) & $mode) $value = '%' . $value;
-        if ((Maphper::FIND_LIKE | Maphper::FIND_STARTS) & $mode) $value .= '%';
+        if ((Maphper::FIND_LIKE | Maphper::FIND_ENDS) & $mode) {
+        	$value = '%' . $value;
+        }
+        if ((Maphper::FIND_LIKE | Maphper::FIND_STARTS) & $mode) {
+        	$value .= '%';
+        }
         return $value;
     }
 }

Maphper/Lib/Sql/GeneralOperator.php

Indentation +22 added lines, -22 removed lines

@@ -3,33 +3,33 @@
 use Maphper\Maphper;
 
 class GeneralOperator implements WhereConditional {
-    public function matches($key, $value, $mode) {
-        return (Maphper::FIND_BIT ^ Maphper::FIND_GREATER ^ Maphper::FIND_LESS ^ Maphper::FIND_NOT & $mode)
-                || Maphper::FIND_EXACT & $mode;
-    }
+	public function matches($key, $value, $mode) {
+		return (Maphper::FIND_BIT ^ Maphper::FIND_GREATER ^ Maphper::FIND_LESS ^ Maphper::FIND_NOT & $mode)
+				|| Maphper::FIND_EXACT & $mode;
+	}
 
-    public function getSql($key, $value, $mode) {
-        return [
-            'sql' => [$key . ' ' . $this->getOperator($mode) . ' :' . $key],
-            'args' => [$key => $value]
-        ];
-    }
+	public function getSql($key, $value, $mode) {
+		return [
+			'sql' => [$key . ' ' . $this->getOperator($mode) . ' :' . $key],
+			'args' => [$key => $value]
+		];
+	}
 
-    private function getOperator($mode) {
-        if (\Maphper\Maphper::FIND_BIT & $mode) return '&';
-        else if (\Maphper\Maphper::FIND_NOT & $mode) return '!=';
+	private function getOperator($mode) {
+		if (\Maphper\Maphper::FIND_BIT & $mode) return '&';
+		else if (\Maphper\Maphper::FIND_NOT & $mode) return '!=';
 
-        return $this->getEqualsOperators($mode);
-    }
+		return $this->getEqualsOperators($mode);
+	}
 
-    private function getEqualsOperators($mode) {
-        $operator = "";
+	private function getEqualsOperators($mode) {
+		$operator = "";
 
-        if (\Maphper\Maphper::FIND_GREATER & $mode) $operator = '>';
-        else if (\Maphper\Maphper::FIND_LESS & $mode) $operator = '<';
+		if (\Maphper\Maphper::FIND_GREATER & $mode) $operator = '>';
+		else if (\Maphper\Maphper::FIND_LESS & $mode) $operator = '<';
 
-        if (\Maphper\Maphper::FIND_EXACT & $mode) $operator .= '=';
+		if (\Maphper\Maphper::FIND_EXACT & $mode) $operator .= '=';
 
-        return $operator;
-    }
+		return $operator;
+	}
 }

Braces +13 added lines, -5 removed lines

@@ -16,8 +16,11 @@ 
     }
 
     private function getOperator($mode) {
-        if (\Maphper\Maphper::FIND_BIT & $mode) return '&';
-        else if (\Maphper\Maphper::FIND_NOT & $mode) return '!=';
+        if (\Maphper\Maphper::FIND_BIT & $mode) {
+        	return '&';
+        } else if (\Maphper\Maphper::FIND_NOT & $mode) {
+        	return '!=';
+        }
 
         return $this->getEqualsOperators($mode);
     }
@@ -25,10 +28,15 @@ 
     private function getEqualsOperators($mode) {
         $operator = "";
 
-        if (\Maphper\Maphper::FIND_GREATER & $mode) $operator = '>';
-        else if (\Maphper\Maphper::FIND_LESS & $mode) $operator = '<';
+        if (\Maphper\Maphper::FIND_GREATER & $mode) {
+        	$operator = '>';
+        } else if (\Maphper\Maphper::FIND_LESS & $mode) {
+        	$operator = '<';
+        }
 
-        if (\Maphper\Maphper::FIND_EXACT & $mode) $operator .= '=';
+        if (\Maphper\Maphper::FIND_EXACT & $mode) {
+        	$operator .= '=';
+        }
 
         return $operator;
     }

Maphper/Lib/Sql/WhereBuilder.php

Indentation +62 added lines, -62 removed lines

@@ -2,87 +2,87 @@
 namespace Maphper\Lib\Sql;
 
 class WhereBuilder {
-    private $conditionals = [];
-
-    public function __construct() {
-        $defaultConditionals = [
-            'Maphper\Lib\Sql\Between',
-            'Maphper\Lib\Sql\In',
-            'Maphper\Lib\Sql\NullConditional',
-            'Maphper\Lib\Sql\Like',
-            'Maphper\Lib\Sql\GeneralOperator'
-        ];
-
-        foreach ($defaultConditionals as $conditional) $this->addConditional(new $conditional);
-    }
+	private $conditionals = [];
+
+	public function __construct() {
+		$defaultConditionals = [
+			'Maphper\Lib\Sql\Between',
+			'Maphper\Lib\Sql\In',
+			'Maphper\Lib\Sql\NullConditional',
+			'Maphper\Lib\Sql\Like',
+			'Maphper\Lib\Sql\GeneralOperator'
+		];
+
+		foreach ($defaultConditionals as $conditional) $this->addConditional(new $conditional);
+	}
 
-    public function addConditional(WhereConditional $conditional) {
-        $this->conditionals[] = $conditional;
-    }
+	public function addConditional(WhereConditional $conditional) {
+		$this->conditionals[] = $conditional;
+	}
 
 	public function createSql($fields, $mode = \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND) {
 		$args = [];
 		$sql = [];
 
-        foreach ($fields as $key => $value) {
-            $value = $this->convertDates($value);
+		foreach ($fields as $key => $value) {
+			$value = $this->convertDates($value);
 
-            if (is_object($value)) continue;
+			if (is_object($value)) continue;
 			$result = $this->getResult($key, $value, $mode);
-            $result = $this->fixDuplicateArgs($args, $result);
-            $sql = array_merge($sql, (array)$result['sql']);
-            $args = array_merge($args, $result['args']);
-        }
+			$result = $this->fixDuplicateArgs($args, $result);
+			$sql = array_merge($sql, (array)$result['sql']);
+			$args = array_merge($args, $result['args']);
+		}
 
 		return ['args' => $args, 'sql' => $this->sqlArrayToString($sql, $mode)];
 	}
 
-    // Returns result with duplicate issues removed
-    private function fixDuplicateArgs($origArgs, $result) {
-        $duplicates = array_intersect_key($result['args'], $origArgs); // Holds all keys in results already in the args
-        if (count($duplicates) === 0) return $result;
+	// Returns result with duplicate issues removed
+	private function fixDuplicateArgs($origArgs, $result) {
+		$duplicates = array_intersect_key($result['args'], $origArgs); // Holds all keys in results already in the args
+		if (count($duplicates) === 0) return $result;
 
-        foreach ($duplicates as $argKey => $argVal) {
-            $valHash = substr(md5($argVal), 0, 5);
-            $newKey = $argKey . $valHash;
+		foreach ($duplicates as $argKey => $argVal) {
+			$valHash = substr(md5($argVal), 0, 5);
+			$newKey = $argKey . $valHash;
 
-            // Replace occurences of duplicate key with key + hash as arg
-            $result['sql'] = str_replace(':' . $argKey, ':' . $newKey, $result['sql']);
-            unset($result['args'][$argKey]);
-            $result['args'][$newKey] = $argVal;
-        }
+			// Replace occurences of duplicate key with key + hash as arg
+			$result['sql'] = str_replace(':' . $argKey, ':' . $newKey, $result['sql']);
+			unset($result['args'][$argKey]);
+			$result['args'][$newKey] = $argVal;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /*
+	/*
      * Either get sql from a conditional or call createSql again because the mode needs to be changed
      */
-    private function getResult($key, $value, $mode) {
-        if (is_numeric($key) && is_array($value)) return $this->createSql($value, $key);
-        return $this->getConditional($key, $value, $mode);
-    }
+	private function getResult($key, $value, $mode) {
+		if (is_numeric($key) && is_array($value)) return $this->createSql($value, $key);
+		return $this->getConditional($key, $value, $mode);
+	}
 
-    private function sqlArrayToString($sql, $mode) {
-        if (\Maphper\Maphper::FIND_OR & $mode) $query = implode(' OR  ', $sql);
+	private function sqlArrayToString($sql, $mode) {
+		if (\Maphper\Maphper::FIND_OR & $mode) $query = implode(' OR  ', $sql);
 		else $query = implode(' AND ', $sql);
 		if (!empty($query)) $query = '(' . $query . ')';
-        return $query;
-    }
-
-    private function getConditional($key, $value, $mode) {
-        foreach ($this->conditionals as $conditional) {
-            if ($conditional->matches($key, $value, $mode))
-                return $conditional->getSql($key, $value, $mode);
-        }
-        throw new \Exception("Invalid WHERE query");
-    }
-
-    private function convertDates($value) {
-        if ($value instanceof \DateTimeInterface) {
-            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');
-        }
-        return $value;
-    }
+		return $query;
+	}
+
+	private function getConditional($key, $value, $mode) {
+		foreach ($this->conditionals as $conditional) {
+			if ($conditional->matches($key, $value, $mode))
+				return $conditional->getSql($key, $value, $mode);
+		}
+		throw new \Exception("Invalid WHERE query");
+	}
+
+	private function convertDates($value) {
+		if ($value instanceof \DateTimeInterface) {
+			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');
+		}
+		return $value;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 
     private function convertDates($value) {
         if ($value instanceof \DateTimeInterface) {
-            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');
         }
         return $value;

Braces +28 added lines, -11 removed lines

@@ -13,7 +13,9 @@ 
             'Maphper\Lib\Sql\GeneralOperator'
         ];
 
-        foreach ($defaultConditionals as $conditional) $this->addConditional(new $conditional);
+        foreach ($defaultConditionals as $conditional) {
+        	$this->addConditional(new $conditional);
+        }
     }
 
     public function addConditional(WhereConditional $conditional) {
@@ -27,7 +29,9 @@ 
         foreach ($fields as $key => $value) {
             $value = $this->convertDates($value);
 
-            if (is_object($value)) continue;
+            if (is_object($value)) {
+            	continue;
+            }
 			$result = $this->getResult($key, $value, $mode);
             $result = $this->fixDuplicateArgs($args, $result);
             $sql = array_merge($sql, (array)$result['sql']);
@@ -40,7 +44,9 @@ 
     // Returns result with duplicate issues removed
     private function fixDuplicateArgs($origArgs, $result) {
         $duplicates = array_intersect_key($result['args'], $origArgs); // Holds all keys in results already in the args
-        if (count($duplicates) === 0) return $result;
+        if (count($duplicates) === 0) {
+        	return $result;
+        }
 
         foreach ($duplicates as $argKey => $argVal) {
             $valHash = substr(md5($argVal), 0, 5);
@@ -59,29 +65,40 @@ 
      * Either get sql from a conditional or call createSql again because the mode needs to be changed
      */
     private function getResult($key, $value, $mode) {
-        if (is_numeric($key) && is_array($value)) return $this->createSql($value, $key);
+        if (is_numeric($key) && is_array($value)) {
+        	return $this->createSql($value, $key);
+        }
         return $this->getConditional($key, $value, $mode);
     }
 
     private function sqlArrayToString($sql, $mode) {
-        if (\Maphper\Maphper::FIND_OR & $mode) $query = implode(' OR  ', $sql);
-		else $query = implode(' AND ', $sql);
-		if (!empty($query)) $query = '(' . $query . ')';
+        if (\Maphper\Maphper::FIND_OR & $mode) {
+        	$query = implode(' OR  ', $sql);
+        } else {
+			$query = implode(' AND ', $sql);
+		}
+		if (!empty($query)) {
+			$query = '(' . $query . ')';
+		}
         return $query;
     }
 
     private function getConditional($key, $value, $mode) {
         foreach ($this->conditionals as $conditional) {
-            if ($conditional->matches($key, $value, $mode))
-                return $conditional->getSql($key, $value, $mode);
+            if ($conditional->matches($key, $value, $mode)) {
+                            return $conditional->getSql($key, $value, $mode);
+            }
         }
         throw new \Exception("Invalid WHERE query");
     }
 
     private function convertDates($value) {
         if ($value instanceof \DateTimeInterface) {
-            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');
+            }
         }
         return $value;
     }

Maphper/Lib/DateInjector.php

Indentation +15 added lines, -15 removed lines

@@ -18,15 +18,15 @@ 
 		return $obj;
 	}
 
-    private function tryToGetDateObjFromString($obj) {
-        try {
-            $date = new \DateTime($obj);
+	private function tryToGetDateObjFromString($obj) {
+		try {
+			$date = new \DateTime($obj);
 			if ($this->dateMatchesFormats($date, $obj)) $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;
-    }
+		}
+		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 dateMatchesFormats($date, $str) {
 		foreach ($this->dateFormats as list($format, $len)) {
@@ -35,17 +35,17 @@ 
 		return false;
 	}
 
-    private function isIterable($obj) {
-        return is_array($obj) || (is_object($obj) && ($obj instanceof \Iterator));
-    }
+	private function isIterable($obj) {
+		return is_array($obj) || (is_object($obj) && ($obj instanceof \Iterator));
+	}
 
-    private function isPossiblyDateString($obj) {
-        return is_string($obj) && isset($obj[0]) && is_numeric($obj[0]) && strlen($obj) <= 20;
-    }
+	private function isPossiblyDateString($obj) {
+		return is_string($obj) && isset($obj[0]) && is_numeric($obj[0]) && strlen($obj) <= 20;
+	}
 
 	private function checkCache($obj, $reset) {
 		if ($reset) $this->processCache = new \SplObjectStorage();
-        if (!is_object($obj)) return false;
+		if (!is_object($obj)) return false;
 
 		if ($this->processCache->contains($obj)) return $obj;
 		else $this->processCache->attach($obj, true);

Braces +27 added lines, -11 removed lines

@@ -11,26 +11,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 ($this->isIterable($obj)) foreach ($obj as &$o) $o = $this->replaceDates($o, false);
-		if ($this->isPossiblyDateString($obj)) $obj = $this->tryToGetDateObjFromString($obj);
+		if ($this->isIterable($obj)) {
+			foreach ($obj as &$o) $o = $this->replaceDates($o, false);
+		}
+		if ($this->isPossiblyDateString($obj)) {
+			$obj = $this->tryToGetDateObjFromString($obj);
+		}
 		return $obj;
 	}
 
     private function tryToGetDateObjFromString($obj) {
         try {
             $date = new \DateTime($obj);
-			if ($this->dateMatchesFormats($date, $obj)) $obj = $date;
-        }
-        catch (\Exception $e) {	//Doesn't need to do anything as the try/catch is working out whether $obj is a date
+			if ($this->dateMatchesFormats($date, $obj)) {
+				$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 dateMatchesFormats($date, $str) {
 		foreach ($this->dateFormats as list($format, $len)) {
-			if ($date->format($format) == substr($str, 0, $len)) return true;
+			if ($date->format($format) == substr($str, 0, $len)) {
+				return true;
+			}
 		}
 		return false;
 	}
@@ -44,11 +53,18 @@ 
     }
 
 	private function checkCache($obj, $reset) {
-		if ($reset) $this->processCache = new \SplObjectStorage();
-        if (!is_object($obj)) return false;
+		if ($reset) {
+			$this->processCache = new \SplObjectStorage();
+		}
+        if (!is_object($obj)) {
+        	return false;
+        }
 
-		if ($this->processCache->contains($obj)) return $obj;
-		else $this->processCache->attach($obj, true);
+		if ($this->processCache->contains($obj)) {
+			return $obj;
+		} else {
+			$this->processCache->attach($obj, true);
+		}
 
 		return false;
 	}

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