Level-2 / Maphper

Maphper/Lib/Sql/In.php

Indentation +20 added lines, -20 removed lines

@@ -2,28 +2,28 @@
 namespace Maphper\Lib\Sql;
 
 class In implements WhereConditional {
-    public function matches($key, $value, $mode) {
-        return !is_numeric($key) && is_array($value);
-    }
+	public function matches($key, $value, $mode) {
+		return !is_numeric($key) && is_array($value);
+	}
 
-    public function getSql($key, $value, $mode) {
-        $args = [];
-        $inSql = [];
-        $count = count($value);
-        $value = array_values($value); // fix numeric index being different than $i
-        for ($i = 0; $i < $count; $i++) {
-            $args[$key . $i] = $value[$i];
-            $inSql[] = ':' . $key . $i;
-        }
+	public function getSql($key, $value, $mode) {
+		$args = [];
+		$inSql = [];
+		$count = count($value);
+		$value = array_values($value); // fix numeric index being different than $i
+		for ($i = 0; $i < $count; $i++) {
+			$args[$key . $i] = $value[$i];
+			$inSql[] = ':' . $key . $i;
+		}
 
-        $notText = '';
-        if (\Maphper\Maphper::FIND_NOT & $mode) {
-            $notText = ' NOT';
-        }
+		$notText = '';
+		if (\Maphper\Maphper::FIND_NOT & $mode) {
+			$notText = ' NOT';
+		}
 
-        if (count($inSql) == 0) return ['args' => [], 'sql' => ''];
-        else $sql = [$key . $notText . ' IN ( ' .  implode(', ', $inSql) . ')'];
+		if (count($inSql) == 0) return ['args' => [], 'sql' => ''];
+		else $sql = [$key . $notText . ' IN ( ' .  implode(', ', $inSql) . ')'];
 
-        return ['args' => $args, 'sql' => $sql];
-    }
+		return ['args' => $args, 'sql' => $sql];
+	}
 }

Maphper/Maphper.php

Indentation +21 added lines, -21 removed lines

@@ -83,21 +83,21 @@ 
 	}
 
 	public function offsetSet($offset, $valueObj) {
-        if ($valueObj instanceof \Maphper\Relation) throw new \Exception();
+		if ($valueObj instanceof \Maphper\Relation) throw new \Exception();
 
-        //Extract private properties from the object
-        $visibilityOverride = new \Maphper\Lib\VisibilityOverride($valueObj);
-        $value = $visibilityOverride->getProperties($valueObj);
+		//Extract private properties from the object
+		$visibilityOverride = new \Maphper\Lib\VisibilityOverride($valueObj);
+		$value = $visibilityOverride->getProperties($valueObj);
 
-        $value = $this->processFilters($value);
-        $pk = $this->dataSource->getPrimaryKey();
-        if ($offset !== null) $value->{$pk[0]} = $offset;
-        $valueCopy = $this->removeRelations(clone $value, $pk);
-        $value = $this->entity->wrap($this->relations, $value);
-        $this->dataSource->save($value);
-        $visibilityOverride->write($value);
-        $value = $this->entity->create((array_merge((array)$value, (array)$valueCopy)), $this->relations);
-        $visibilityOverride->write($value);
+		$value = $this->processFilters($value);
+		$pk = $this->dataSource->getPrimaryKey();
+		if ($offset !== null) $value->{$pk[0]} = $offset;
+		$valueCopy = $this->removeRelations(clone $value, $pk);
+		$value = $this->entity->wrap($this->relations, $value);
+		$this->dataSource->save($value);
+		$visibilityOverride->write($value);
+		$value = $this->entity->create((array_merge((array)$value, (array)$valueCopy)), $this->relations);
+		$visibilityOverride->write($value);
 	}
 
 	private function removeRelations($obj, $pk) { // Prevent saving ManyMany twice except when pk isn't initially set
@@ -110,10 +110,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);
 	}
 
@@ -123,10 +123,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);
 	}
 

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