Level-2 / Maphper

maphper/lib/visibilityoverride.php

Indentation +5 added lines, -5 removed lines

@@ -11,9 +11,9 @@ 
 			$this->writeClosure = function ($field, $value) use ($object) { $object->$field = $value; };
 		}
 		else {
-            $visOverride = $this;
+			$visOverride = $this;
 			$this->readClosure = function() use ($visOverride) {
-                return (object) array_filter(get_object_vars($this), [$visOverride, 'isReturnableDataType']);
+				return (object) array_filter(get_object_vars($this), [$visOverride, 'isReturnableDataType']);
 			};
 			$this->readClosure = $this->readClosure->bindTo($object, $object);
 
@@ -23,9 +23,9 @@ 
 
 	}
 
-    public function isReturnableDataType($v) {
-        return is_scalar($v) || is_null($v) || (is_object($v) && $v instanceof \DateTime);
-    }
+	public function isReturnableDataType($v) {
+		return is_scalar($v) || is_null($v) || (is_object($v) && $v instanceof \DateTime);
+	}
 
 	public function getProperties() {
 		return ($this->readClosure)();

maphper/lib/entity.php

Indentation +8 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
 	private $parent;
 
 	public function __construct(\Maphper\Maphper $parent, $className = null) {
-        $this->parent = $parent;
+		$this->parent = $parent;
 		$this->className = $className;
 	}
 
@@ -25,12 +25,12 @@ 
 		return $object;
 	}
 
-    private function addRelationData($object, $name, $relation, $siblings) {
-        if (isset($object->$name) && !($object->$name instanceof \Maphper\Relation) ) {
-            //After overwriting the relation, does the parent object ($object) need overwriting as well?
-            if ($relation->overwrite($object, $object->$name)) $this->parent[] = $object;
-        }
+	private function addRelationData($object, $name, $relation, $siblings) {
+		if (isset($object->$name) && !($object->$name instanceof \Maphper\Relation) ) {
+			//After overwriting the relation, does the parent object ($object) need overwriting as well?
+			if ($relation->overwrite($object, $object->$name)) $this->parent[] = $object;
+		}
 
-        $object->$name = $relation->getData($object, $siblings);
-    }
+		$object->$name = $relation->getData($object, $siblings);
+	}
 }

maphper/lib/Sql/WhereBuilder.php

Indentation +43 added lines, -43 removed lines

@@ -2,68 +2,68 @@
 namespace Maphper\Lib\Sql;
 
 class WhereBuilder {
-    private $conditionals = [];
+	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'
-        ];
+	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);
-    }
+		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);
-            $sql = array_merge($sql, (array)$result['sql']);
-            $args = array_merge($args, $result['args']);
-        }
+			$sql = array_merge($sql, (array)$result['sql']);
+			$args = array_merge($args, $result['args']);
+		}
 
 		return ['args' => $args, 'sql' => $this->sqlArrayToString($sql, $mode)];
 	}
 
-    /*
+	/*
      * 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;
-    }
+		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 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 \DateTime) {
-            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;
-    }
+	private function convertDates($value) {
+		if ($value instanceof \DateTime) {
+			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/ArrayFilter.php

Indentation +54 added lines, -54 removed lines

@@ -3,58 +3,58 @@
 use Maphper\Maphper;
 
 class ArrayFilter {
-    private $array;
-
-    public function __construct(array $array) {
-        $this->array = $array;
-    }
-
-    public function filter($fields) {
-        $filteredArray = array_filter($this->array, $this->getSearchFieldFunction($fields, \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND));
-        // Need to reset indexes
-        $filteredArray = array_values($filteredArray);
-        return $filteredArray;
-    }
-
-    private function getSearchFieldFunction($fields, $mode) {
-        return function ($data) use ($fields, $mode) {
-            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;
-            }
-            return (bool)(Maphper::FIND_OR ^ $mode);
-        };
-    }
-
-    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);
-    }
-
-    private function shouldRunDeepSearch($key, $val) {
-        return is_numeric($key) && is_array($val);
-    }
-
-    private function isInArraySearch($mode, $key, $val) {
-        return !(Maphper::FIND_BETWEEN & $mode) && !is_numeric($key) && is_array($val);
-    }
-
-    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);
-        return $expected == $actual;
-    }
+	private $array;
+
+	public function __construct(array $array) {
+		$this->array = $array;
+	}
+
+	public function filter($fields) {
+		$filteredArray = array_filter($this->array, $this->getSearchFieldFunction($fields, \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND));
+		// Need to reset indexes
+		$filteredArray = array_values($filteredArray);
+		return $filteredArray;
+	}
+
+	private function getSearchFieldFunction($fields, $mode) {
+		return function ($data) use ($fields, $mode) {
+			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;
+			}
+			return (bool)(Maphper::FIND_OR ^ $mode);
+		};
+	}
+
+	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);
+	}
+
+	private function shouldRunDeepSearch($key, $val) {
+		return is_numeric($key) && is_array($val);
+	}
+
+	private function isInArraySearch($mode, $key, $val) {
+		return !(Maphper::FIND_BETWEEN & $mode) && !is_numeric($key) && is_array($val);
+	}
+
+	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);
+		return $expected == $actual;
+	}
 }