Level-2 / Maphper

maphper/datasource/database.php

Indentation +48 added lines, -48 removed lines

@@ -6,7 +6,7 @@ 
 	const EDIT_OPTIMISE = 4;
 
 	private $table;
-    private $options;
+	private $options;
 	private $cache = [];
 	private $primaryKey;
 	private $fields = '*';
@@ -15,7 +15,7 @@ 
 	private $alterDb = false;
 	private $adapter;
 	private $crudBuilder;
-    private $selectBuilder;
+	private $selectBuilder;
 
 	public function __construct($db, $table, $primaryKey = 'id', array $options = []) {
 		$this->options = new DatabaseOptions($db, $options);
@@ -36,9 +36,9 @@ 
 		$this->optimizeColumns();
 	}
 
-    private function optimizeColumns() {
-        if (self::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) $this->adapter->optimiseColumns($this->table);
-    }
+	private function optimizeColumns() {
+		if (self::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) $this->adapter->optimiseColumns($this->table);
+	}
 
 	public function getPrimaryKey() {
 		return $this->primaryKey;
@@ -80,15 +80,15 @@ 
 		}
 	}
 
-    private function determineAggregateResult($result, $group, $field) {
-        if ($group != null) {
-            $ret = [];
-            foreach ($result as $res) $ret[$res->$field] = $res->val;
-            return $ret;
-        }
-        else if (isset($result[0])) return $result[0]->val;
-        else return 0;
-    }
+	private function determineAggregateResult($result, $group, $field) {
+		if ($group != null) {
+			$ret = [];
+			foreach ($result as $res) $ret[$res->$field] = $res->val;
+			return $ret;
+		}
+		else if (isset($result[0])) return $result[0]->val;
+		else return 0;
+	}
 
 	private function addIndex($args) {
 		if (self::EDIT_INDEX & $this->alterDb) $this->adapter->addIndex($this->table, $args);
@@ -118,7 +118,7 @@ 
 
 	public function deleteByField(array $fields, array $options = []) {
 		$query = $this->selectBuilder->createSql($fields, \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND);
-        $query['sql'] = array_filter($query['sql']);
+		$query['sql'] = array_filter($query['sql']);
 		$this->adapter->query($this->crudBuilder->delete($this->table, $query['sql'], $query['args'], $options['limit'], null, $options['order']));
 		$this->addIndex(array_keys($query['args']));
 
@@ -127,22 +127,22 @@ 
 		$this->resultCache = [];
 	}
 
-    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);
+		$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);
@@ -160,26 +160,26 @@ 
 		$this->updateCache($data);
 	}
 
-    private function getTryAgain($tryagain) {
-        return $tryagain && self::EDIT_STRUCTURE & $this->alterDb;
-    }
+	private function getTryAgain($tryagain) {
+		return $tryagain && self::EDIT_STRUCTURE & $this->alterDb;
+	}
 
-    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->crudBuilder->update($this->table, $this->primaryKey, $data);
-        $matched = $this->findByField($updateWhere->getArgs());
+	private function checkIfUpdateWorked($data) {
+		$updateWhere = $this->crudBuilder->update($this->table, $this->primaryKey, $data);
+		$matched = $this->findByField($updateWhere->getArgs());
 
-        if (count($matched) == 0) throw new \InvalidArgumentException('Record inserted into table ' . $this->table . ' fails table constraints');
-    }
+		if (count($matched) == 0) throw new \InvalidArgumentException('Record inserted into table ' . $this->table . ' fails table constraints');
+	}
 
-    private function updateCache($data) {
-        $pkValue = $data->{$this->primaryKey[0]};
+	private function updateCache($data) {
+		$pkValue = $data->{$this->primaryKey[0]};
 		if (isset($this->cache[$pkValue])) $this->cache[$pkValue] = (object) array_merge((array)$this->cache[$pkValue], (array)$data);
 		else $this->cache[$pkValue] = $data;
-    }
+	}
 
 	private function insert($table, array $primaryKey, $data) {
 		$error = 0;
@@ -191,16 +191,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/datasource/mock.php

Indentation +90 added lines, -90 removed lines

@@ -2,112 +2,112 @@
 namespace Maphper\DataSource;
 use Maphper\Maphper;
 class Mock implements \Maphper\DataSource {
-    private $data;
-    private $id;
+	private $data;
+	private $id;
 
-    public function __construct(\ArrayObject $data, $id) {
-        $this->data = $data;
-        $this->id = is_array($id) ? $id : [$id];
-    }
+	public function __construct(\ArrayObject $data, $id) {
+		$this->data = $data;
+		$this->id = is_array($id) ? $id : [$id];
+	}
 
-    public function getPrimaryKey() {
-        return $this->id;
-    }
+	public function getPrimaryKey() {
+		return $this->id;
+	}
 
-    public function findById($id) {
-        return isset($this->data[$id]) ? (array)$this->data[$id] : [];
-    }
+	public function findById($id) {
+		return isset($this->data[$id]) ? (array)$this->data[$id] : [];
+	}
 
-    public function findByField(array $fields, $options = []) {
-        $array = iterator_to_array($this->data->getIterator());
-        $filteredArray = array_filter($array, $this->getSearchFieldFunction($fields, \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND));
-        // Need to reset indexes
-        $filteredArray = array_values($filteredArray);
-        if (isset($options['order'])) {
-            list($columns, $order) = explode(' ', $options['order']);
-            usort($filteredArray, $this->getOrderFunction($order, $columns));
-        }
-        if (isset($options['offset'])) $filteredArray = array_slice($filteredArray, $options['offset']);
-        if (isset($options['limit'])) $filteredArray = array_slice($filteredArray, 0, $options['limit']);
-        return $filteredArray;
-    }
+	public function findByField(array $fields, $options = []) {
+		$array = iterator_to_array($this->data->getIterator());
+		$filteredArray = array_filter($array, $this->getSearchFieldFunction($fields, \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND));
+		// Need to reset indexes
+		$filteredArray = array_values($filteredArray);
+		if (isset($options['order'])) {
+			list($columns, $order) = explode(' ', $options['order']);
+			usort($filteredArray, $this->getOrderFunction($order, $columns));
+		}
+		if (isset($options['offset'])) $filteredArray = array_slice($filteredArray, $options['offset']);
+		if (isset($options['limit'])) $filteredArray = array_slice($filteredArray, 0, $options['limit']);
+		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);
+	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 !(Maphper::FIND_OR & $mode);
-        };
-    }
+				if (Maphper::FIND_OR & $mode && $currentFieldResult === true) return true;
+				else if (!(Maphper::FIND_OR & $mode) && $currentFieldResult === false) return false;
+			}
+			return !(Maphper::FIND_OR & $mode);
+		};
+	}
 
-    private function getIfFieldMatches($key, $val, $data, $mode) {
-        if (is_numeric($key) && is_array($val)) {
-            return $this->getSearchFieldFunction($val, $key)($data);
-        }
-        else if (!isset($data->$key)) return false;
-        else if (!(Maphper::FIND_BETWEEN & $mode) && !is_numeric($key) && is_array($val))
-            return in_array($data->$key, $val);
-        else
-            return $this->processFilter($mode, $val, $data->$key);
-    }
+	private function getIfFieldMatches($key, $val, $data, $mode) {
+		if (is_numeric($key) && is_array($val)) {
+			return $this->getSearchFieldFunction($val, $key)($data);
+		}
+		else if (!isset($data->$key)) return false;
+		else if (!(Maphper::FIND_BETWEEN & $mode) && !is_numeric($key) && is_array($val))
+			return in_array($data->$key, $val);
+		else
+			return $this->processFilter($mode, $val, $data->$key);
+	}
 
   	public function findAggregate($function, $field, $group = null, array $criteria = [], array $options = []) {
-        return $function($this->findByField($criteria));
-    }
+		return $function($this->findByField($criteria));
+	}
 
   	public function deleteById($id) {
-        unset($this->data[$id]);
-    }
+		unset($this->data[$id]);
+	}
 
   	public function deleteByField(array $fields, array $options) {
-        foreach ($this->findByField($fields, $options) as $val) unset($this->data[$val->{$this->id[0]}]);
-    }
+		foreach ($this->findByField($fields, $options) as $val) unset($this->data[$val->{$this->id[0]}]);
+	}
 
-    public function save($data) {
-        if (isset($data->{$this->id[0]})) {
-            $id = $data->{$this->id[0]};
-        }
-        else {
-            $id = count($this->data);
-            $data->{$this->id[0]} = $id;
-        }
+	public function save($data) {
+		if (isset($data->{$this->id[0]})) {
+			$id = $data->{$this->id[0]};
+		}
+		else {
+			$id = count($this->data);
+			$data->{$this->id[0]} = $id;
+		}
 
-        $this->data[$id] = (object)array_merge($this->findById($id), (array)$data);
-    }
+		$this->data[$id] = (object)array_merge($this->findById($id), (array)$data);
+	}
 
-    public function getErrors() {
-        return [];
-    }
+	public function getErrors() {
+		return [];
+	}
 
-    private function getOrderFunction($order, $columns) {
-        return function($a, $b) use ($order, $columns) {
-          foreach (explode(',', $columns) as $column) {
-            $aColumn = $a->$column;
-            $bColumn = $b->$column;
-            if ($aColumn === $bColumn) {
-              $sortVal = 0;
-              continue;
-            }
-            else $sortVal = ($aColumn < $bColumn) ? -1 : 1;
-            break;
-          }
-          if ($order === 'desc') return -$sortVal;
-          else return $sortVal;
-        };
-    }
+	private function getOrderFunction($order, $columns) {
+		return function($a, $b) use ($order, $columns) {
+		  foreach (explode(',', $columns) as $column) {
+			$aColumn = $a->$column;
+			$bColumn = $b->$column;
+			if ($aColumn === $bColumn) {
+			  $sortVal = 0;
+			  continue;
+			}
+			else $sortVal = ($aColumn < $bColumn) ? -1 : 1;
+			break;
+		  }
+		  if ($order === 'desc') return -$sortVal;
+		  else return $sortVal;
+		};
+	}
 
-    private function processFilter($mode, $expected, $actual) {
-        if (Maphper::FIND_NOT & $mode) return $expected != $actual;
-        else if (Maphper::FIND_GREATER & $mode && Maphper::FIND_EXACT & $mode) return $expected <= $actual;
-        else if (Maphper::FIND_LESS & $mode && 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 function processFilter($mode, $expected, $actual) {
+		if (Maphper::FIND_NOT & $mode) return $expected != $actual;
+		else if (Maphper::FIND_GREATER & $mode && Maphper::FIND_EXACT & $mode) return $expected <= $actual;
+		else if (Maphper::FIND_LESS & $mode && 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;
+	}
 }

maphper/lib/crudbuilder.php

Indentation +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 	public function delete($table, array $criteria, $args, $limit = null, $offset = null, $order = null) {
 		$limit = $limit ? ' LIMIT ' . $limit : '';
 		$offset = $offset ? ' OFFSET ' . $offset : '';
-        $order = $order ? ' ORDER BY ' . $order : '';
+		$order = $order ? ' ORDER BY ' . $order : '';
 		return new Query('DELETE FROM ' . $table . ' WHERE ' . (!empty($criteria) ? implode(' AND ', $criteria) : '1 = 1 ') . $order . $limit . $offset, $args);
 	}