Level-2 / Maphper

Maphper/DataSource/Mock.php

Indentation +90 added lines, -90 removed lines

@@ -2,100 +2,100 @@
 namespace Maphper\DataSource;
 use Maphper\Maphper;
 class Mock implements \Maphper\DataSource {
-    private $data;
-    private $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 findById($id) {
-        return isset($this->data[$id]) ? (array)$this->data[$id] : [];
-    }
-
-    public function findByField(array $fields, $options = []) {
-        $arrayFilter = new \Maphper\Lib\ArrayFilter(iterator_to_array($this->data->getIterator()));
-        $filteredArray = $arrayFilter->filter($fields);
-        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 $data;
+	private $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 findById($id) {
+		return isset($this->data[$id]) ? (array)$this->data[$id] : [];
+	}
+
+	public function findByField(array $fields, $options = []) {
+		$arrayFilter = new \Maphper\Lib\ArrayFilter(iterator_to_array($this->data->getIterator()));
+		$filteredArray = $arrayFilter->filter($fields);
+		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 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) {
-            if (count($this->id) > 1) $id = $this->getMultiPkSaveId($val);
-            else $id = $val->{$this->id[0]};
-
-            unset($this->data[$id]);
-        }
-    }
-
-    public function save($data) {
-        if (count($this->id) > 1) return $this->saveMultiPk($data);
-        else return $this->saveSinglePk($data);
-    }
-
-    private function saveSinglePk($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);
-    }
-
-    private function saveMultiPk($data) {
-        $saveId = $this->getMultiPkSaveId($data);
-
-        $this->data[$saveId] = (object)array_merge($this->findById($saveId), (array)$data);
-    }
-
-    private function getMultiPkSaveId($data) {
-        $keyVals = [];
-        foreach ($this->id as $keyName) {
-            $keyVals[] = $data->$keyName;
-        }
-        return implode(',', $keyVals);
-    }
-
-    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;
-        };
-    }
+		foreach ($this->findByField($fields, $options) as $val) {
+			if (count($this->id) > 1) $id = $this->getMultiPkSaveId($val);
+			else $id = $val->{$this->id[0]};
+
+			unset($this->data[$id]);
+		}
+	}
+
+	public function save($data) {
+		if (count($this->id) > 1) return $this->saveMultiPk($data);
+		else return $this->saveSinglePk($data);
+	}
+
+	private function saveSinglePk($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);
+	}
+
+	private function saveMultiPk($data) {
+		$saveId = $this->getMultiPkSaveId($data);
+
+		$this->data[$saveId] = (object)array_merge($this->findById($saveId), (array)$data);
+	}
+
+	private function getMultiPkSaveId($data) {
+		$keyVals = [];
+		foreach ($this->id as $keyName) {
+			$keyVals[] = $data->$keyName;
+		}
+		return implode(',', $keyVals);
+	}
+
+	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;
+		};
+	}
 }

Maphper/DataSource/GeneralEditDatabase.php

Indentation +32 added lines, -32 removed lines

@@ -2,55 +2,55 @@
 namespace Maphper\DataSource;
 
 class GeneralEditDatabase {
-    private $pdo;
-    private $dataTypes = [
-        'datetime' => 'DATETIME',
-        'int' => 'INT(11)',
-        'decimal' => 'DECIMAL',
-        'short_string' => 'VARCHAR',
-        'long_string' => 'LONGBLOG',
-        'short_string_max_len' => 255,
-        'other' => 'VARCHAR(255)',
+	private $pdo;
+	private $dataTypes = [
+		'datetime' => 'DATETIME',
+		'int' => 'INT(11)',
+		'decimal' => 'DECIMAL',
+		'short_string' => 'VARCHAR',
+		'long_string' => 'LONGBLOG',
+		'short_string_max_len' => 255,
+		'other' => 'VARCHAR(255)',
 
-        'pk_default' => 'INT(11) NOT NULL AUTO_INCREMENT'
-    ];
+		'pk_default' => 'INT(11) NOT NULL AUTO_INCREMENT'
+	];
 
-    public function __construct(\PDO $pdo, array $dataTypes) {
-        $this->pdo = $pdo;
-        $this->dataTypes = array_merge($this->dataTypes, $dataTypes);
-    }
+	public function __construct(\PDO $pdo, array $dataTypes) {
+		$this->pdo = $pdo;
+		$this->dataTypes = array_merge($this->dataTypes, $dataTypes);
+	}
 
-    public function quote($str) {
+	public function quote($str) {
 		return '`' . str_replace('.', '`.`', trim($str, '`')) . '`';
 	}
 
-    public function getType($val) {
+	public function getType($val) {
 		if ($val instanceof \DateTimeInterface) return $this->dataTypes['datetime'];
 		else if ($result = $this->doNumberTypes($val)) return $result;
 		else if ($result = $this->doStringTypes($val)) return $result;
 		else return $this->dataTypes['other'];
 	}
 
-    private function doNumberTypes($val) {
-        if (is_int($val)) return $this->dataTypes['int'];
+	private function doNumberTypes($val) {
+		if (is_int($val)) return $this->dataTypes['int'];
 		else if (is_double($val)) return $this->dataTypes['decimal'] . '(9,' . (strlen($val) - strrpos($val, '.') - 1) . ')';
-        else return false;
-    }
+		else return false;
+	}
 
-    private function doStringTypes($val) {
-        if (!is_string($val)) return false;
-        if (strlen($val) <= $this->dataTypes['short_string_max_len'])
-            return $this->dataTypes['short_string'] . '(' . $this->dataTypes['short_string_max_len'] . ')';
+	private function doStringTypes($val) {
+		if (!is_string($val)) return false;
+		if (strlen($val) <= $this->dataTypes['short_string_max_len'])
+			return $this->dataTypes['short_string'] . '(' . $this->dataTypes['short_string_max_len'] . ')';
 		else return $this->dataTypes['long_string'];
-    }
+	}
 
-    public function isNotSavableType($value, $key, $primaryKey) {
-        return is_array($value) || (is_object($value) && !($value instanceof \DateTimeInterface)) ||
-                in_array($key, $primaryKey);
-    }
+	public function isNotSavableType($value, $key, $primaryKey) {
+		return is_array($value) || (is_object($value) && !($value instanceof \DateTimeInterface)) ||
+				in_array($key, $primaryKey);
+	}
 
-    //Alter the database so that it can store $data
-    public function createTable($table, array $primaryKey, $data) {
+	//Alter the database so that it can store $data
+	public function createTable($table, array $primaryKey, $data) {
 		$parts = [];
 		foreach ($primaryKey as $key) {
 			$pk = $data->$key;

Maphper/Lib/DateInjector.php

Indentation +15 added lines, -15 removed lines

@@ -18,15 +18,15 @@ 
 		return $obj;
 	}
 
-    private function tryToGetDateObjFromString($obj) {
-        try {
-            $date = new \DateTimeImmutable($obj);
+	private function tryToGetDateObjFromString($obj) {
+		try {
+			$date = new \DateTimeImmutable($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/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 \DateTimeInterface);
-    }
+	public function isReturnableDataType($v) {
+		return is_scalar($v) || is_null($v) || (is_object($v) && $v instanceof \DateTimeInterface);
+	}
 
 	public function getProperties() {
 		return ($this->readClosure)();

Maphper/DataSource/Database.php

Indentation +7 added lines, -7 removed lines

@@ -9,8 +9,8 @@ 
 	private $table;
 
 	private $fields = '*';
-    private $databaseSelect;
-    private $databaseCrud;
+	private $databaseSelect;
+	private $databaseCrud;
 
 	public function __construct($db, $table, $primaryKey = 'id', array $options = []) {
 		$options = new DatabaseOptions($db, $options);
@@ -23,10 +23,10 @@ 
 
 		$defaultSort = $options->read('defaultSort') !== false ? $options->read('defaultSort')  : implode(', ', $this->primaryKey);
 
-        $databaseModify = new DatabaseModify($adapter, $options->getEditMode(), $table);
+		$databaseModify = new DatabaseModify($adapter, $options->getEditMode(), $table);
 
-        $this->databaseSelect = new DatabaseSelect($adapter, $databaseModify, $table, $defaultSort, $options->getCacheMode());
-        $this->databaseCrud = new DatabaseCrud($adapter, $databaseModify, $this->databaseSelect, $table, $this->primaryKey);
+		$this->databaseSelect = new DatabaseSelect($adapter, $databaseModify, $table, $defaultSort, $options->getCacheMode());
+		$this->databaseCrud = new DatabaseCrud($adapter, $databaseModify, $this->databaseSelect, $table, $this->primaryKey);
 
 		$databaseModify->optimizeColumns();
 	}
@@ -52,7 +52,7 @@ 
 	}
 
 	public function findByField(array $fields, $options = []) {
-        return $this->databaseSelect->findByField($fields, $options);
+		return $this->databaseSelect->findByField($fields, $options);
 	}
 
 	public function deleteByField(array $fields, array $options = []) {
@@ -60,6 +60,6 @@ 
 	}
 
 	public function save($data) {
-        $this->databaseCrud->save($data, true);
+		$this->databaseCrud->save($data, true);
 	}
 }

Maphper/DataSource/DatabaseSelect.php

Indentation +83 added lines, -83 removed lines

@@ -2,41 +2,41 @@ 
 namespace Maphper\DataSource;
 
 class DatabaseSelect {
-    private $resultCache = [];
-    private $idCache = [];
-    private $idCacheTime = [];
-    private $selectBuilder;
-    private $whereBuilder;
-    private $adapter;
-    private $databaseModify;
-    private $defaultSort;
-    private $table;
-
-    public function __construct(DatabaseAdapter $adapter, DatabaseModify $databaseModify, $table, $defaultSort, $cacheMode) {
-        $this->adapter = $adapter;
-        $this->databaseModify = $databaseModify;
-        $this->selectBuilder = new \Maphper\Lib\SelectBuilder();
-        $this->whereBuilder = new \Maphper\Lib\Sql\WhereBuilder();
-        $this->defaultSort = $defaultSort;
-        $this->cacheMode = $cacheMode;
-        $this->table = $table;
-    }
-
-    public function getColumns($table) {
-      return $this->adapter->getColumns($table);
-    }
-
-    private function cacheUpdateRequired($id) {
-      if ($this->cacheMode > 0) {
-        if (!isset($this->idCacheTime[$id])) return true; // Cache time has not been set for first time
-
-        if (time() - $this->idCacheTime[$id] > $this->cacheMode) return true; // Cache time has expired
-      }
-
-      if (!isset($this->idCache[$id])) return true; // Cache has not been set for first time
-
-      return false;
-    }
+	private $resultCache = [];
+	private $idCache = [];
+	private $idCacheTime = [];
+	private $selectBuilder;
+	private $whereBuilder;
+	private $adapter;
+	private $databaseModify;
+	private $defaultSort;
+	private $table;
+
+	public function __construct(DatabaseAdapter $adapter, DatabaseModify $databaseModify, $table, $defaultSort, $cacheMode) {
+		$this->adapter = $adapter;
+		$this->databaseModify = $databaseModify;
+		$this->selectBuilder = new \Maphper\Lib\SelectBuilder();
+		$this->whereBuilder = new \Maphper\Lib\Sql\WhereBuilder();
+		$this->defaultSort = $defaultSort;
+		$this->cacheMode = $cacheMode;
+		$this->table = $table;
+	}
+
+	public function getColumns($table) {
+	  return $this->adapter->getColumns($table);
+	}
+
+	private function cacheUpdateRequired($id) {
+	  if ($this->cacheMode > 0) {
+		if (!isset($this->idCacheTime[$id])) return true; // Cache time has not been set for first time
+
+		if (time() - $this->idCacheTime[$id] > $this->cacheMode) return true; // Cache time has expired
+	  }
+
+	  if (!isset($this->idCache[$id])) return true; // Cache has not been set for first time
+
+	  return false;
+	}
 
   public function findById($id, $pk) {
 		if ($this->cacheMode < 0 || $this->cacheUpdateRequired($id)) {
@@ -44,19 +44,19 @@ 
 				$result = $this->selectQuery($this->selectBuilder->select($this->table, $pk . ' = :id', [':id' => $id], ['limit' => 1]));
 			}
 			catch (\Exception $e) {
-                // Don't issue an error if it cannot be found since we return null
+				// Don't issue an error if it cannot be found since we return null
 			}
 
 			if (isset($result[0])) $result = $result[0];
 			else return null;
 		}
 
-    if ($this->cacheMode < 0) return $result; // Cache mode is off
+	if ($this->cacheMode < 0) return $result; // Cache mode is off
 
-    if ($this->cacheUpdateRequired()) {
-      $this->idCache[$id] = $result;
-      $this->idCacheTime[$id] = time();
-    }
+	if ($this->cacheUpdateRequired()) {
+	  $this->idCache[$id] = $result;
+	  $this->idCacheTime[$id] = time();
+	}
 
 		return $this->idCache[$id];
 	}
@@ -64,7 +64,7 @@ 
   public function findByField(array $fields, $options = []) {
 		$cacheId = md5(serialize(func_get_args()));
 
-    if ($this->cacheMode < 0 || $this->cacheUpdateRequired($cacheId)) {
+	if ($this->cacheMode < 0 || $this->cacheUpdateRequired($cacheId)) {
 			$query = $this->whereBuilder->createSql($fields);
 
 			if (!isset($options['order'])) $options['order'] = $this->defaultSort;
@@ -80,17 +80,17 @@ 
 			}
 		}
 
-    if ($this->cacheMode < 0) return $result; // Cache mode is off
+	if ($this->cacheMode < 0) return $result; // Cache mode is off
 
-    if ($this->cacheUpdateRequired($cacheId)) {
-      $this->idCache[$cacheId] = $result;
-      $this->idCacheTime[$cacheId] = time();
-    }
+	if ($this->cacheUpdateRequired($cacheId)) {
+	  $this->idCache[$cacheId] = $result;
+	  $this->idCacheTime[$cacheId] = time();
+	}
 
 		return $this->idCache[$cacheId];
 	}
 
-    public function findAggregate($function, $field, $group = null, array $criteria = [], array $options = []) {
+	public function findAggregate($function, $field, $group = null, array $criteria = [], array $options = []) {
 		//Cannot count/sum/max multiple fields, pick the first one. This should only come into play when trying to count() a mapper with multiple primary keys
 		if (is_array($field)) $field = $field[0];
 		$query = $this->whereBuilder->createSql($criteria);
@@ -107,39 +107,39 @@ 
 		}
 	}
 
-    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 selectQuery(\Maphper\Lib\Query $query) {
-        return $this->adapter->query($query)->fetchAll(\PDO::FETCH_OBJ);
-    }
-
-    public function clearResultCache() {
-        if ($this->cacheMode >= 0) $this->resultCache = [];
-    }
-
-    public function clearIDCache() {
-        if ($this->cacheMode >= 0) $this->idCache = [];
-    }
-
-    public function updateCache($data, $pkValue) {
-        if ($this->cacheMode >= 0) {
-  		    if (isset($this->cache[$pkValue])) $this->cache[$pkValue] = (object) array_merge((array)$this->cache[$pkValue], (array)$data);
-  		    else $this->cache[$pkValue] = $data;
-        }
-    }
-
-    public function deleteIDFromCache($id) {
-        if ($this->cacheMode >= 0) {
-          unset($this->idCache[$id]);
-          unset($this->idCacheTime[$id]);
-        }
-    }
+	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 selectQuery(\Maphper\Lib\Query $query) {
+		return $this->adapter->query($query)->fetchAll(\PDO::FETCH_OBJ);
+	}
+
+	public function clearResultCache() {
+		if ($this->cacheMode >= 0) $this->resultCache = [];
+	}
+
+	public function clearIDCache() {
+		if ($this->cacheMode >= 0) $this->idCache = [];
+	}
+
+	public function updateCache($data, $pkValue) {
+		if ($this->cacheMode >= 0) {
+  			if (isset($this->cache[$pkValue])) $this->cache[$pkValue] = (object) array_merge((array)$this->cache[$pkValue], (array)$data);
+  			else $this->cache[$pkValue] = $data;
+		}
+	}
+
+	public function deleteIDFromCache($id) {
+		if ($this->cacheMode >= 0) {
+		  unset($this->idCache[$id]);
+		  unset($this->idCacheTime[$id]);
+		}
+	}
 }