Level-2 / Maphper

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

Indentation +21 added lines, -21 removed lines

@@ -83,21 +83,21 @@ 
 	}
 
 	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);
-        $value = $visibilityOverride->getProperties($valueObj);
+		//Extract private properties from the object
+		$visibilityOverride = new \Maphper\Lib\VisibilityOverride($valueObj);
+		$value = $visibilityOverride->getProperties($valueObj);
 
-        $value = $this->processFilters($value);
-        $pk = $this->dataSource->getPrimaryKey();
-        if ($offset !== null) $value->{$pk[0]} = $offset;
-        $valueCopy = $this->removeRelations(clone $value, $pk);
-        $value = $this->entity->wrap($this->relations, $value);
-        $this->dataSource->save($value);
-        $visibilityOverride->write($value);
-        $value = $this->entity->create((array_merge((array)$value, (array)$valueCopy)), $this->relations);
-        $visibilityOverride->write($value);
+		$value = $this->processFilters($value);
+		$pk = $this->dataSource->getPrimaryKey();
+		if ($offset !== null) $value->{$pk[0]} = $offset;
+		$valueCopy = $this->removeRelations(clone $value, $pk);
+		$value = $this->entity->wrap($this->relations, $value);
+		$this->dataSource->save($value);
+		$visibilityOverride->write($value);
+		$value = $this->entity->create((array_merge((array)$value, (array)$valueCopy)), $this->relations);
+		$visibilityOverride->write($value);
 	}
 
 	private function removeRelations($obj, $pk) { // Prevent saving ManyMany twice except when pk isn't initially set
@@ -110,10 +110,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);
 	}
 
@@ -123,10 +123,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);
 	}
 

Braces +31 added lines, -12 removed lines

@@ -60,7 +60,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;
 	}
@@ -77,13 +79,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);
@@ -91,7 +97,9 @@ 
 
         $value = $this->processFilters($value);
         $pk = $this->dataSource->getPrimaryKey();
-        if ($offset !== null) $value->{$pk[0]} = $offset;
+        if ($offset !== null) {
+        	$value->{$pk[0]} = $offset;
+        }
         $valueCopy = $this->removeRelations(clone $value, $pk);
         $value = $this->entity->wrap($this->relations, $value);
         $this->dataSource->save($value);
@@ -101,15 +109,20 @@ 
 	}
 
 	private function removeRelations($obj, $pk) { // Prevent saving ManyMany twice except when pk isn't initially set
-		foreach ($this->relations as $name => $relation)
-			if ($relation instanceOf \Maphper\Relation\ManyMany && isset($obj->$name) && !empty($obj->{$pk[0]})) unset($obj->$name);
+		foreach ($this->relations as $name => $relation) {
+					if ($relation instanceOf \Maphper\Relation\ManyMany && isset($obj->$name) && !empty($obj->{$pk[0]})) unset($obj->$name);
+		}
 
-		if (empty($obj->{$pk[0]})) unset($obj->{$pk[0]});
+		if (empty($obj->{$pk[0]})) {
+			unset($obj->{$pk[0]});
+		}
 		return $obj;
 	}
 
 	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]);
@@ -122,7 +135,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);
@@ -133,11 +148,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) {