Level-2 / Maphper

maphper/lib/ArrayFilter.php

Braces +26 added lines, -14 removed lines

@@ -21,8 +21,11 @@ 
             foreach ($fields as $key => $val) {
                 $currentFieldResult = $this->getIfFieldMatches($key, $val, $data, $mode);
 
-                if (Maphper::FIND_OR & $mode && $currentFieldResult === true) return true;
-                else if (Maphper::FIND_OR ^ $mode && $currentFieldResult === false) return false;
+                if (Maphper::FIND_OR & $mode && $currentFieldResult === true) {
+                	return true;
+                } else if (Maphper::FIND_OR ^ $mode && $currentFieldResult === false) {
+                	return false;
+                }
             }
             return (bool)(Maphper::FIND_OR ^ $mode);
         };
@@ -31,12 +34,13 @@ 
     private function getIfFieldMatches($key, $val, $data, $mode) {
         if ($this->shouldRunDeepSearch($key, $val)) {
             return $this->getSearchFieldFunction($val, $key)($data);
+        } else if (!isset($data->$key)) {
+        	return false;
+        } else if ($this->isInArraySearch($mode, $key, $val)) {
+                    return in_array($data->$key, $val);
+        } else {
+                    return $this->processFilter($mode, $val, $data->$key);
         }
-        else if (!isset($data->$key)) return false;
-        else if ($this->isInArraySearch($mode, $key, $val))
-            return in_array($data->$key, $val);
-        else
-            return $this->processFilter($mode, $val, $data->$key);
     }
 
     private function shouldRunDeepSearch($key, $val) {
@@ -48,13 +52,21 @@ 
     }
 
     private function processFilter($mode, $expected, $actual) {
-        if (Maphper::FIND_NOT & $mode) return $expected != $actual;
-        else if ((Maphper::FIND_GREATER | Maphper::FIND_EXACT) === $mode) return $expected <= $actual;
-        else if ((Maphper::FIND_LESS | Maphper::FIND_EXACT) === $mode) return $expected >= $actual;
-        else if (Maphper::FIND_GREATER & $mode) return $expected < $actual;
-        else if (Maphper::FIND_LESS & $mode) return $expected > $actual;
-        else if (Maphper::FIND_BETWEEN & $mode) return $expected[0] <= $actual && $actual <= $expected[1];
-        else if (Maphper::FIND_NOCASE & $mode) return strtolower($expected) == strtolower($actual);
+        if (Maphper::FIND_NOT & $mode) {
+        	return $expected != $actual;
+        } else if ((Maphper::FIND_GREATER | Maphper::FIND_EXACT) === $mode) {
+        	return $expected <= $actual;
+        } else if ((Maphper::FIND_LESS | Maphper::FIND_EXACT) === $mode) {
+        	return $expected >= $actual;
+        } else if (Maphper::FIND_GREATER & $mode) {
+        	return $expected < $actual;
+        } else if (Maphper::FIND_LESS & $mode) {
+        	return $expected > $actual;
+        } else if (Maphper::FIND_BETWEEN & $mode) {
+        	return $expected[0] <= $actual && $actual <= $expected[1];
+        } else if (Maphper::FIND_NOCASE & $mode) {
+        	return strtolower($expected) == strtolower($actual);
+        }
         return $expected == $actual;
     }
 }

maphper/datasource/GeneralEditDatabase.php

Braces +29 added lines, -13 removed lines

@@ -25,23 +25,36 @@ 
 	}
 
     public function getType($val) {
-		if ($val instanceof \DateTime) 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 \DateTime) {
+			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) . ')';

maphper/datasource/sqliteadapter.php

Braces +14 added lines, -8 removed lines

@@ -24,7 +24,9 @@ 
 		$args = $query->getArgs();
 
         //Handle SQLite when PDO_ERRMODE is set to SILENT
-        if ($stmt === false) throw new \Exception('Invalid query');
+        if ($stmt === false) {
+        	throw new \Exception('Invalid query');
+        }
 
         $stmt->execute($args);
         if ($stmt->errorCode() !== '00000' && $stmt->errorInfo()[2] == 'database schema has changed') {
@@ -78,8 +80,7 @@ 
 
 				$this->pdo->query('INSERT INTO ' . $this->quote($tableTo) . '(' . $columns . ') SELECT ' . $columns . ' FROM ' . $this->quote($tableFrom));
 			}
-		}
-		catch (\PDOException $e) {
+		} catch (\PDOException $e) {
 			// No data to copy
 			echo $e->getMessage();
 		}
@@ -87,7 +88,9 @@ 
 
     private function alterColumns($table, array $primaryKey, $data) {
         foreach ($data as $key => $value) {
-			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) continue;
+			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) {
+				continue;
+			}
 
 			$type = $this->generalEditor->getType($value);
 
@@ -96,10 +99,14 @@ 
     }
 
     public function addIndex($table, array $fields) {
-		if (empty($fields)) return false;
+		if (empty($fields)) {
+			return false;
+		}
 
 		//SQLite doesn't support ASC/DESC indexes, remove the keywords
-		foreach ($fields as &$field) $field = str_ireplace([' desc', ' asc'], '', $field);
+		foreach ($fields as &$field) {
+			$field = str_ireplace([' desc', ' asc'], '', $field);
+		}
 		sort($fields);
 		$fields = array_map('strtolower', $fields);
 		$fields = array_map('trim', $fields);
@@ -108,8 +115,7 @@ 
 
 		try {
 			$this->pdo->query('CREATE INDEX IF NOT EXISTS  ' . $keyName . ' ON ' . $table . ' (' . implode(', ', $fields) . ')');
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 
 		}
 	}

maphper/relation/manymany.php

Braces +6 added lines, -3 removed lines

@@ -31,7 +31,9 @@ 
 	public function overwrite($parentObject, &$data) {
 		$this->results = $data;
 		$this->object = $parentObject;
-		foreach ($data as $dt) $this[] = $dt;
+		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.
@@ -86,8 +88,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};

maphper/relation/one.php

Braces +14 added lines, -5 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();
 
@@ -69,13 +73,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/datasource/mysqladapter.php

Braces +10 added lines, -5 removed lines

@@ -27,7 +27,9 @@ 
 
     private function alterColumns($table, array $primaryKey, $data) {
         foreach ($data as $key => $value) {
-			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) continue;
+			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) {
+				continue;
+			}
             
 			$type = $this->generalEditor->getType($value);
 			$this->tryAlteringColumn($table, $key, $type);
@@ -36,9 +38,10 @@ 
 
     private function tryAlteringColumn($table, $key, $type) {
         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);
         }
     }
@@ -60,7 +63,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) {

maphper/lib/Sql/WhereBuilder.php

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

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