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

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

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

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;

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

Maphper/Relation/ManyMany.php

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