Level-2 / Maphper

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

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 +13 added lines, -13 removed lines

@@ -88,25 +88,25 @@
 		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}) &&
-                $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}) &&
+				$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/Maphper.php

Indentation +9 added lines, -9 removed lines

@@ -96,7 +96,7 @@ 
 		$value = $this->entity->wrap($this->relations, $value);
 		$this->dataSource->save($value);
 		$visibilityOverride->write($value);
-        $this->entity->create((array_merge((array)$value, (array)$valueCopy)), $this->relations);
+		$this->entity->create((array_merge((array)$value, (array)$valueCopy)), $this->relations);
 	}
 
 	private function removeRelations($obj, $pk) { // Prevent saving ManyMany twice except when pk isn't initially set
@@ -107,10 +107,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);
 	}
 
@@ -120,10 +120,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);
 	}