Level-2 / Maphper

Maphper/DataSource/DatabaseOptions.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	}
 
 	public function getCacheMode() {
-		return (int) ($this->options['cachemode'] ?? 0);
+		return (int)($this->options['cachemode'] ?? 0);
 	}
 
 	public function read($option) {

Maphper/DataSource/DatabaseSelect.php

Spacing +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
 
     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);
+  		    if (isset($this->cache[$pkValue])) $this->cache[$pkValue] = (object)array_merge((array)$this->cache[$pkValue], (array)$data);
   		    else $this->cache[$pkValue] = $data;
         }
     }

Braces +52 added lines, -22 removed lines

@@ -24,12 +24,21 @@ 
 
     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 (!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 (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
+      if (!isset($this->idCache[$id])) {
+      	return true;
+      }
+      // Cache has not been set for first time
 
       return false;
     }
@@ -38,16 +47,21 @@ 
 		if ($this->cacheMode < 0 || $this->cacheUpdateRequired($id)) {
 			try {
 				$result = $this->selectQuery($this->selectBuilder->select($this->table, $pk . ' = :id', [':id' => $id], ['limit' => 1]));
-			}
-			catch (\Exception $e) {
+			} catch (\Exception $e) {
                 // 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 (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;
@@ -63,20 +77,24 @@ 
     if ($this->cacheMode < 0 || $this->cacheUpdateRequired($cacheId)) {
 			$query = $this->whereBuilder->createSql($fields);
 
-			if (!isset($options['order'])) $options['order'] = $this->defaultSort;
+			if (!isset($options['order'])) {
+				$options['order'] = $this->defaultSort;
+			}
 
 			try {
 				$result = $this->selectQuery($this->selectBuilder->select($this->table, $query['sql'], $query['args'], $options));
 				$this->databaseModify->addIndex(array_keys($query['args']));
 				$this->databaseModify->addIndex(explode(',', $options['order']));
-			}
-			catch (\Exception $e) {
+			} catch (\Exception $e) {
 				$this->errors[] = $e;
 				$result = [];
 			}
 		}
 
-    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;
@@ -88,7 +106,9 @@ 
 
     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];
+		if (is_array($field)) {
+			$field = $field[0];
+		}
 		$query = $this->whereBuilder->createSql($criteria);
 
 		try {
@@ -97,8 +117,7 @@ 
 			$result = $this->selectQuery($this->selectBuilder->aggregate($this->table, $function, $field, $query['sql'], $query['args'], $group));
 
 			return $this->determineAggregateResult($result, $group, $field);
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			return $group ? [] : 0;
 		}
 	}
@@ -106,11 +125,15 @@ 
     private function determineAggregateResult($result, $group, $field) {
         if ($group != null) {
             $ret = [];
-            foreach ($result as $res) $ret[$res->$field] = $res->val;
+            foreach ($result as $res) {
+            	$ret[$res->$field] = $res->val;
+            }
             return $ret;
+        } else if (isset($result[0])) {
+        	return $result[0]->val;
+        } else {
+        	return 0;
         }
-        else if (isset($result[0])) return $result[0]->val;
-        else return 0;
     }
 
     private function selectQuery(\Maphper\Lib\Query $query) {
@@ -118,17 +141,24 @@ 
     }
 
     public function clearResultCache() {
-        if ($this->cacheMode >= 0) $this->resultCache = [];
+        if ($this->cacheMode >= 0) {
+        	$this->resultCache = [];
+        }
     }
 
     public function clearIDCache() {
-        if ($this->cacheMode >= 0) $this->idCache = [];
+        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;
+  		    if (isset($this->cache[$pkValue])) {
+  		    	$this->cache[$pkValue] = (object) array_merge((array)$this->cache[$pkValue], (array)$data);
+  		    } else {
+  		    	$this->cache[$pkValue] = $data;
+  		    }
         }
     }
 

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]);
+		}
+	}
 }

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

Spacing +2 added lines, -2 removed lines

@@ -19,9 +19,9 @@
 		$this->primaryKey = is_array($primaryKey) ? $primaryKey : [$primaryKey];
 		$this->table = $table;
 
-		$this->fields = implode(',', array_map([$adapter, 'quote'], (array) $options->read('fields')));
+		$this->fields = implode(',', array_map([$adapter, 'quote'], (array)$options->read('fields')));
 
-		$defaultSort = $options->read('defaultSort') !== false ? $options->read('defaultSort')  : implode(', ', $this->primaryKey);
+		$defaultSort = $options->read('defaultSort') !== false ? $options->read('defaultSort') : implode(', ', $this->primaryKey);
 
         $databaseModify = new DatabaseModify($adapter, $options->getEditMode(), $table);