Level-2 / Maphper

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/datasource/mysqladapter.php

Indentation +16 added lines, -16 removed lines

@@ -3,14 +3,14 @@ 
 class MysqlAdapter implements DatabaseAdapter {
 	private $pdo;
 	private $stmtCache;
-    private $generalEditor;
+	private $generalEditor;
 
 	public function __construct(\PDO $pdo) {
 		$this->pdo = $pdo;
 		//Set to strict mode to detect 'out of range' errors, action at a distance but it needs to be set for all INSERT queries
 		$this->pdo->query('SET sql_mode = STRICT_ALL_TABLES');
-        $this->stmtCache = new StmtCache($pdo);
-        $this->generalEditor = new GeneralEditDatabase($this->pdo, ['short_string_max_len' => 191]);
+		$this->stmtCache = new StmtCache($pdo);
+		$this->generalEditor = new GeneralEditDatabase($this->pdo, ['short_string_max_len' => 191]);
 	}
 
 	public function quote($str) {
@@ -20,32 +20,32 @@ 
 	public function query(\Maphper\Lib\Query $query) {
 		$stmt = $this->stmtCache->getCachedStmt($query->getSql());
 		$args = $query->getArgs();
-        $stmt->execute($args);
+		$stmt->execute($args);
 
 		return $stmt;
 	}
 
-    private function alterColumns($table, array $primaryKey, $data) {
-        foreach ($data as $key => $value) {
+	private function alterColumns($table, array $primaryKey, $data) {
+		foreach ($data as $key => $value) {
 			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) continue;
             
 			$type = $this->generalEditor->getType($value);
 			$this->tryAlteringColumn($table, $key, $type);
 		}
-    }
+	}
 
-    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) {
-            $this->pdo->query('ALTER TABLE ' . $table . ' MODIFY ' . $this->quote($key) . ' ' . $type);
-        }
-    }
+	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) {
+			$this->pdo->query('ALTER TABLE ' . $table . ' MODIFY ' . $this->quote($key) . ' ' . $type);
+		}
+	}
 
 	public function alterDatabase($table, array $primaryKey, $data) {
 		$this->generalEditor->createTable($table, $primaryKey, $data);
-        $this->alterColumns($table, $primaryKey, $data);
+		$this->alterColumns($table, $primaryKey, $data);
 	}
 
 	public function lastInsertId() {

maphper/relation/one.php

Indentation +8 added lines, -8 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,11 +48,11 @@ 
 		//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;
 		}
@@ -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/datasource/DatabaseCrud.php

Indentation +50 added lines, -50 removed lines

@@ -2,30 +2,30 @@ 
 namespace Maphper\DataSource;
 
 class DatabaseCrud {
-    private $crudBuilder;
-    private $whereBuilder;
-    private $adapter;
-    private $databaseModify;
-    private $databaseSelect;
-    private $table;
-    private $primaryKey;
-
-    public function __construct(DatabaseAdapter $adapter, DatabaseModify $databaseModify, DatabaseSelect $databaseSelect, $table, $primaryKey) {
-        $this->adapter = $adapter;
-        $this->databaseModify = $databaseModify;
-        $this->databaseSelect = $databaseSelect;
-        $this->crudBuilder = new \Maphper\Lib\CrudBuilder();
-        $this->whereBuilder = new \Maphper\Lib\Sql\WhereBuilder();
-        $this->table = $table;
-        $this->primaryKey = $primaryKey;
-    }
-
-    public function deleteById($id) {
-        $this->adapter->query($this->crudBuilder->delete($this->table, $this->primaryKey[0] . ' = :id', [':id' => $id]));
-        $this->databaseSelect->deleteIDFromCache($id);
+	private $crudBuilder;
+	private $whereBuilder;
+	private $adapter;
+	private $databaseModify;
+	private $databaseSelect;
+	private $table;
+	private $primaryKey;
+
+	public function __construct(DatabaseAdapter $adapter, DatabaseModify $databaseModify, DatabaseSelect $databaseSelect, $table, $primaryKey) {
+		$this->adapter = $adapter;
+		$this->databaseModify = $databaseModify;
+		$this->databaseSelect = $databaseSelect;
+		$this->crudBuilder = new \Maphper\Lib\CrudBuilder();
+		$this->whereBuilder = new \Maphper\Lib\Sql\WhereBuilder();
+		$this->table = $table;
+		$this->primaryKey = $primaryKey;
 	}
 
-    public function deleteByField(array $fields, array $options = []) {
+	public function deleteById($id) {
+		$this->adapter->query($this->crudBuilder->delete($this->table, $this->primaryKey[0] . ' = :id', [':id' => $id]));
+		$this->databaseSelect->deleteIDFromCache($id);
+	}
+
+	public function deleteByField(array $fields, array $options = []) {
 		$query = $this->whereBuilder->createSql($fields);
 		$this->adapter->query($this->crudBuilder->delete($this->table, $query['sql'], $query['args'], $options['limit'], null, $options['order']));
 		$this->databaseModify->addIndex(array_keys($query['args']));
@@ -35,22 +35,22 @@ 
 		$this->databaseSelect->clearResultCache();
 	}
 
-    private function getIfNew($data) {
-        $new = false;
-        foreach ($this->primaryKey as $k) {
-            if (empty($data->$k)) {
-                $data->$k = null;
-                $new = true;
-            }
-        }
-        return $new;
-    }
+	private function getIfNew($data) {
+		$new = false;
+		foreach ($this->primaryKey as $k) {
+			if (empty($data->$k)) {
+				$data->$k = null;
+				$new = true;
+			}
+		}
+		return $new;
+	}
 
-    public function save($data, $tryagain = true) {
-        $new = $this->getIfNew($data);
+	public function save($data, $tryagain = true) {
+		$new = $this->getIfNew($data);
 
 		try {
-            $result = $this->insert($this->table, $this->primaryKey, $data);
+			$result = $this->insert($this->table, $this->primaryKey, $data);
 
 			//If there was an error but PDO is silent, trigger the catch block anyway
 			if ($result->errorCode() !== '00000') throw new \Exception('Could not insert into ' . $this->table);
@@ -68,15 +68,15 @@ 
 		$this->databaseSelect->updateCache($data, $data->{$this->primaryKey[0]});
 	}
 
-    private function updatePK($data, $new) {
-        if ($new && count($this->primaryKey) == 1) $data->{$this->primaryKey[0]} = $this->adapter->lastInsertId();
-    }
+	private function updatePK($data, $new) {
+		if ($new && count($this->primaryKey) == 1) $data->{$this->primaryKey[0]} = $this->adapter->lastInsertId();
+	}
 
-    private function checkIfUpdateWorked($data) {
-        $updateWhere = $this->whereBuilder->createSql($data);
-        $matched = $this->databaseSelect->findByField($updateWhere['args']);
-        if (count($matched) == 0) throw new \InvalidArgumentException('Record inserted into table ' . $this->table . ' fails table constraints');
-    }
+	private function checkIfUpdateWorked($data) {
+		$updateWhere = $this->whereBuilder->createSql($data);
+		$matched = $this->databaseSelect->findByField($updateWhere['args']);
+		if (count($matched) == 0) throw new \InvalidArgumentException('Record inserted into table ' . $this->table . ' fails table constraints');
+	}
 
 	private function insert($table, array $primaryKey, $data) {
 		$error = 0;
@@ -88,16 +88,16 @@ 
 		}
 
  		if ($error || $result->errorCode() !== '00000') {
-            $result = $this->tryUpdate($table, $primaryKey, $data);
-        }
+			$result = $this->tryUpdate($table, $primaryKey, $data);
+		}
 
 		return $result;
 	}
 
-    private function tryUpdate($table, array $primaryKey, $data) {
-        $result = $this->adapter->query($this->crudBuilder->update($table, $primaryKey, $data));
-        if ($result->rowCount() === 0) $this->checkIfUpdateWorked($data);
+	private function tryUpdate($table, array $primaryKey, $data) {
+		$result = $this->adapter->query($this->crudBuilder->update($table, $primaryKey, $data));
+		if ($result->rowCount() === 0) $this->checkIfUpdateWorked($data);
 
-        return $result;
-    }
+		return $result;
+	}
 }

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