Level-2 / Maphper

Maphper/MultiPk.php

Braces +5 added lines, -2 removed lines

@@ -25,8 +25,11 @@
 
 	public function offsetGet($key) {
 		$depth = $this->getDepth()+1;
-		if (count($this->primaryKey)-1 == $depth) return $this->mapper->filter([$this->primaryKey[$depth] => $key])->item(0);
-		else return new MultiPk($this->mapper, $key, $this->primaryKey, $this);
+		if (count($this->primaryKey)-1 == $depth) {
+			return $this->mapper->filter([$this->primaryKey[$depth] => $key])->item(0);
+		} else {
+			return new MultiPk($this->mapper, $key, $this->primaryKey, $this);
+		}
 	}
 
 	public function offsetSet($key, $value) {

Maphper/DataSource/DatabaseOptions.php

Braces +6 added lines, -2 removed lines

@@ -10,7 +10,9 @@ 
 	}
 
 	public function getAdapter() {
-		if (!($this->db instanceof \PDO)) return $this->db;
+		if (!($this->db instanceof \PDO)) {
+			return $this->db;
+		}
 
 		$adapter = '\\Maphper\\DataSource\\' . ucfirst($this->db->getAttribute(\PDO::ATTR_DRIVER_NAME)) . 'Adapter';
 
@@ -18,7 +20,9 @@ 
 	}
 
 	public function getEditMode() {
-		if (!isset($this->options['editmode'])) return false;
+		if (!isset($this->options['editmode'])) {
+			return false;
+		}
 
 		return $this->options['editmode'] === true ? Database::EDIT_STRUCTURE | Database::EDIT_INDEX | Database::EDIT_OPTIMISE : $this->options['editmode'];
 	}

Maphper/DataSource/DatabaseCrud.php

Braces +17 added lines, -9 removed lines

@@ -53,10 +53,13 @@ 
             $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);
-		}
-		catch (\Exception $e) {
-			if (!$this->databaseModify->getTryInsertAgain($tryagain)) throw $e;
+			if ($result->errorCode() !== '00000') {
+				throw new \Exception('Could not insert into ' . $this->table);
+			}
+		} catch (\Exception $e) {
+			if (!$this->databaseModify->getTryInsertAgain($tryagain)) {
+				throw $e;
+			}
 
 			$this->adapter->alterDatabase($this->table, $this->primaryKey, $data);
 			$this->save($data, false);
@@ -69,21 +72,24 @@ 
 	}
 
     private function updatePK($data, $new) {
-        if ($new && count($this->primaryKey) == 1) $data->{$this->primaryKey[0]} = $this->adapter->lastInsertId();
+        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');
+        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;
 		try {
 			$result = $this->adapter->query($this->crudBuilder->insert($table, $data));
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			$error = 1;
 		}
 
@@ -96,7 +102,9 @@ 
 
     private function tryUpdate($table, array $primaryKey, $data) {
         $result = $this->adapter->query($this->crudBuilder->update($table, $primaryKey, $data));
-        if ($result->rowCount() === 0) $this->checkIfUpdateWorked($data);
+        if ($result->rowCount() === 0) {
+        	$this->checkIfUpdateWorked($data);
+        }
 
         return $result;
     }

Maphper/DataSource/GeneralEditDatabase.php

Braces +29 added lines, -13 removed lines

@@ -25,23 +25,36 @@ 
 	}
 
     public function getType($val) {
-		if ($val instanceof \DateTime) 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'];
+		if ($val instanceof \DateTime) {
+			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'];
-		else if (is_double($val)) return $this->dataTypes['decimal'] . '(9,' . strlen($val) - strrpos($val, '.') - 1 . ')';
-        else return false;
+        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;
+        }
     }
 
     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'];
+        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) {
@@ -54,8 +67,11 @@ 
 		$parts = [];
 		foreach ($primaryKey as $key) {
 			$pk = $data->$key;
-			if ($pk == null) $parts[] = $key . ' ' . $this->dataTypes['pk_default'];
-			else $parts[] = $key . ' ' . $this->getType($pk) . ' NOT NULL';
+			if ($pk == null) {
+				$parts[] = $key . ' ' . $this->dataTypes['pk_default'];
+			} else {
+				$parts[] = $key . ' ' . $this->getType($pk) . ' NOT NULL';
+			}
 		}
 
 		$pkField = implode(', ', $parts) . ', PRIMARY KEY(' . implode(', ', $primaryKey) . ')';

Maphper/DataSource/StmtCache.php

Braces +6 added lines, -3 removed lines

@@ -10,10 +10,13 @@
 
     public function getCachedStmt($sql) {
 		$queryId = $this->getQueryId($sql);
-		if (isset($this->queryCache[$queryId])) $stmt = $this->queryCache[$queryId];
-		else {
+		if (isset($this->queryCache[$queryId])) {
+			$stmt = $this->queryCache[$queryId];
+		} else {
 			$stmt = $this->pdo->prepare($sql, [\PDO::ATTR_CURSOR => \PDO::CURSOR_FWDONLY]);
-			if ($stmt) $this->queryCache[$queryId] = $stmt;
+			if ($stmt) {
+				$this->queryCache[$queryId] = $stmt;
+			}
 		}
 		return $stmt;
 	}

Maphper/DataSource/DatabaseModify.php

Braces +6 added lines, -2 removed lines

@@ -13,11 +13,15 @@
     }
 
     public function addIndex($args) {
-		if (Database::EDIT_INDEX & $this->alterDb) $this->adapter->addIndex($this->table, $args);
+		if (Database::EDIT_INDEX & $this->alterDb) {
+			$this->adapter->addIndex($this->table, $args);
+		}
 	}
 
     public function optimizeColumns() {
-        if (Database::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) $this->adapter->optimiseColumns($this->table);
+        if (Database::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) {
+        	$this->adapter->optimiseColumns($this->table);
+        }
     }
 
     public function getTryInsertAgain($tryagain) {

Maphper/DataSource/SqliteAdapter.php

Braces +14 added lines, -8 removed lines

@@ -24,7 +24,9 @@ 
 		$args = $query->getArgs();
 
         //Handle SQLite when PDO_ERRMODE is set to SILENT
-        if ($stmt === false) throw new \Exception('Invalid query');
+        if ($stmt === false) {
+        	throw new \Exception('Invalid query');
+        }
 
         $stmt->execute($args);
         if ($stmt->errorCode() !== '00000' && $stmt->errorInfo()[2] == 'database schema has changed') {
@@ -78,8 +80,7 @@ 
 
 				$this->pdo->query('INSERT INTO ' . $this->quote($tableTo) . '(' . $columns . ') SELECT ' . $columns . ' FROM ' . $this->quote($tableFrom));
 			}
-		}
-		catch (\PDOException $e) {
+		} catch (\PDOException $e) {
 			// No data to copy
 			echo $e->getMessage();
 		}
@@ -87,7 +88,9 @@ 
 
     private function alterColumns($table, array $primaryKey, $data) {
         foreach ($data as $key => $value) {
-			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) continue;
+			if ($this->generalEditor->isNotSavableType($value, $key, $primaryKey)) {
+				continue;
+			}
 
 			$type = $this->generalEditor->getType($value);
 
@@ -96,10 +99,14 @@ 
     }
 
     public function addIndex($table, array $fields) {
-		if (empty($fields)) return false;
+		if (empty($fields)) {
+			return false;
+		}
 
 		//SQLite doesn't support ASC/DESC indexes, remove the keywords
-		foreach ($fields as &$field) $field = str_ireplace([' desc', ' asc'], '', $field);
+		foreach ($fields as &$field) {
+			$field = str_ireplace([' desc', ' asc'], '', $field);
+		}
 		sort($fields);
 		$fields = array_map('strtolower', $fields);
 		$fields = array_map('trim', $fields);
@@ -108,8 +115,7 @@ 
 
 		try {
 			$this->pdo->query('CREATE INDEX IF NOT EXISTS  ' . $keyName . ' ON ' . $table . ' (' . implode(', ', $fields) . ')');
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 
 		}
 	}

Maphper/DataSource/DatabaseSelect.php

Braces +26 added lines, -15 removed lines

@@ -24,13 +24,15 @@ 
 		if (!isset($this->idCache[$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])) 	$this->idCache[$id] = $result[0];
-			else return null;
+			if (isset($result[0])) {
+				$this->idCache[$id] = $result[0];
+			} else {
+				return null;
+			}
 		}
 		return $this->idCache[$id];
 	}
@@ -40,14 +42,15 @@ 
 		if (!isset($this->resultCache[$cacheId])) {
 			$query = $this->whereBuilder->createSql($fields);
 
-			if (!isset($options['order'])) $options['order'] = $this->defaultSort;
+			if (!isset($options['order'])) {
+				$options['order'] = $this->defaultSort;
+			}
 
 			try {
 				$this->resultCache[$cacheId] = $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;
 				$this->resultCache[$cacheId] = [];
 			}
@@ -57,7 +60,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 {
@@ -66,8 +71,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;
 		}
 	}
@@ -75,11 +79,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) {
@@ -95,8 +103,11 @@ 
     }
 
     public function updateCache($data, $pkValue) {
-		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;
+		}
     }
 
     public function deleteIDFromCache($id) {

Maphper/DataSource/Mock.php

Braces +17 added lines, -8 removed lines

@@ -25,8 +25,12 @@ 
             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']);
+        if (isset($options['offset'])) {
+        	$filteredArray = array_slice($filteredArray, $options['offset']);
+        }
+        if (isset($options['limit'])) {
+        	$filteredArray = array_slice($filteredArray, 0, $options['limit']);
+        }
         return $filteredArray;
     }
 
@@ -39,14 +43,15 @@ 
     }
 
   	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 {
+        } else {
             $id = count($this->data);
             $data->{$this->id[0]} = $id;
         }
@@ -66,12 +71,16 @@ 
             if ($aColumn === $bColumn) {
               $sortVal = 0;
               continue;
+            } else {
+            	$sortVal = ($aColumn < $bColumn) ? -1 : 1;
             }
-            else $sortVal = ($aColumn < $bColumn) ? -1 : 1;
             break;
           }
-          if ($order === 'desc') return -$sortVal;
-          else return $sortVal;
+          if ($order === 'desc') {
+          	return -$sortVal;
+          } else {
+          	return $sortVal;
+          }
         };
     }
 }