Level-2 / Maphper

maphper/lib/selectbuilder.php

Braces +10 added lines, -4 removed lines

@@ -7,17 +7,23 @@
 
 		if (isset($options['offset'])) {
 			$offset = ' OFFSET ' . $options['offset'];
-			if (!$limit) $limit = ' LIMIT  1000';
+			if (!$limit) {
+				$limit = ' LIMIT  1000';
+			}
+		} else {
+			$offset = '';
 		}
-		else $offset = '';
 
 		$order = isset($options['order']) ? ' ORDER BY ' . $options['order'] : '';
 		return new Query('SELECT * FROM ' . $table . ' ' . $where . $order . $limit . $offset, $args);
 	}
 
 	public function aggregate($table, $function, $field, $where, $args, $group) {
-		if ($group == true) $groupBy = ' GROUP BY ' . $field;
-		else $groupBy = '';
+		if ($group == true) {
+			$groupBy = ' GROUP BY ' . $field;
+		} else {
+			$groupBy = '';
+		}
 		return new Query('SELECT ' . $function . '(' . $field . ') as val, ' . $field . '   FROM ' . $table . ($where != null ? ' WHERE ' . $where : '') . ' ' . $groupBy, $args);
 	}
 }

maphper/lib/Sql/WhereBuilder.php

Braces +51 added lines, -28 removed lines

@@ -9,71 +9,94 @@
 
 		foreach ($fields as $key => $value) {
             if ($value instanceof \DateTime) {
-    			if ($value->format('H:i:s')  == '00:00:00') $value = $value->format('Y-m-d');
-    			else $value = $value->format('Y-m-d H:i:s');
+    			if ($value->format('H:i:s')  == '00:00:00') {
+    				$value = $value->format('Y-m-d');
+    			} else {
+    				$value = $value->format('Y-m-d H:i:s');
+    			}
     		}
 
-            if (is_object($value)) continue;
+            if (is_object($value)) {
+            	continue;
+            }
 			if (is_numeric($key) && is_array($value)) {
 				$result = $this->createSql($value, $key);
-				foreach ($result['args'] as $arg_key => $arg) $args[$arg_key] = $arg;
-				foreach ($result['sql'] as $arg) $sql[] = $arg;
-			}
-			else if (\Maphper\Maphper::FIND_BETWEEN & $mode) {
+				foreach ($result['args'] as $arg_key => $arg) {
+					$args[$arg_key] = $arg;
+				}
+				foreach ($result['sql'] as $arg) {
+					$sql[] = $arg;
+				}
+			} else if (\Maphper\Maphper::FIND_BETWEEN & $mode) {
 				$sql[] = $key . '>= :' . $key . 'from';
 				$sql[] = $key . ' <= :' . $key . 'to';
 
 				$args[$key . 'from'] = $value[0];
 				$args[$key . 'to'] = $value[1];
-			}
-			else if (!is_numeric($key) && is_array($value)) {
+			} else if (!is_numeric($key) && is_array($value)) {
 				$inSql = [];
 				$count = count($value);
 				for ($i = 0; $i < $count; $i++) {
 					$args[$key . $i] = $value[$i];
 					$inSql[] = ':' . $key . $i;
 				}
-				if (count($inSql) == 0) return [];
-				else $sql[] = $key . ' IN ( ' .  implode(', ', $inSql) . ')';
-			}
-			else if ($value === NULL) {
+				if (count($inSql) == 0) {
+					return [];
+				} else {
+					$sql[] = $key . ' IN ( ' .  implode(', ', $inSql) . ')';
+				}
+			} else if ($value === NULL) {
 				$nullSql = $key . ' IS ';
-				if (\Maphper\Maphper::FIND_NOT & $mode) $nullSql .= 'NOT ';
+				if (\Maphper\Maphper::FIND_NOT & $mode) {
+					$nullSql .= 'NOT ';
+				}
 				$sql[] = $nullSql . 'NULL';
-			}
-			else {
+			} else {
 
 				if (\Maphper\Maphper::FIND_LIKE & $mode) {
 					$operator = 'LIKE';
 					$value = '%' . $value . '%';
-				}
-				else if (\Maphper\Maphper::FIND_STARTS & $mode) {
+				} else if (\Maphper\Maphper::FIND_STARTS & $mode) {
 					$operator = 'LIKE';
 					$value = $value . '%';
+				} else {
+					$operator = $this->getOperator($mode);
 				}
-				else $operator = $this->getOperator($mode);
 
 				$args[$key] = $value;
 				$sql[] = $key . ' ' . $operator . ' :' . $key;
 			}
 		}
 
-		if (\Maphper\Maphper::FIND_OR & $mode) $query = implode(' OR  ', $sql);
-		else $query = implode(' AND ', $sql);
-		if (!empty($query)) $query = '(' . $query . ')';
+		if (\Maphper\Maphper::FIND_OR & $mode) {
+			$query = implode(' OR  ', $sql);
+		} else {
+			$query = implode(' AND ', $sql);
+		}
+		if (!empty($query)) {
+			$query = '(' . $query . ')';
+		}
 		return ['args' => $args, 'sql' => $query];
 	}
 
     private function getOperator($mode) {
         $operator = "";
 
-        if (\Maphper\Maphper::FIND_NOCASE & $mode) $operator = 'LIKE';
-        else if (\Maphper\Maphper::FIND_BIT & $mode) $operator = '&';
-        else if (\Maphper\Maphper::FIND_GREATER & $mode) $operator = '>';
-        else if (\Maphper\Maphper::FIND_LESS & $mode) $operator = '<';
-        else if (\Maphper\Maphper::FIND_NOT & $mode) $operator = '!=';
+        if (\Maphper\Maphper::FIND_NOCASE & $mode) {
+        	$operator = 'LIKE';
+        } else if (\Maphper\Maphper::FIND_BIT & $mode) {
+        	$operator = '&';
+        } else if (\Maphper\Maphper::FIND_GREATER & $mode) {
+        	$operator = '>';
+        } else if (\Maphper\Maphper::FIND_LESS & $mode) {
+        	$operator = '<';
+        } else if (\Maphper\Maphper::FIND_NOT & $mode) {
+        	$operator = '!=';
+        }
 
-        if (\Maphper\Maphper::FIND_EXACT & $mode) $operator .= '=';
+        if (\Maphper\Maphper::FIND_EXACT & $mode) {
+        	$operator .= '=';
+        }
 
         return $operator;
     }

maphper/datasource/database.php

Braces +49 added lines, -26 removed lines

@@ -39,7 +39,9 @@ 
 	}
 
     private function optimizeColumns() {
-        if (self::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) $this->adapter->optimiseColumns($this->table);
+        if (self::EDIT_OPTIMISE & $this->alterDb && rand(0,500) == 1) {
+        	$this->adapter->optimiseColumns($this->table);
+        }
     }
 
 	public function getPrimaryKey() {
@@ -55,19 +57,23 @@ 
 		if (!isset($this->cache[$id])) {
 			try {
 				$result = $this->selectQuery($this->selectBuilder->select($this->table, $this->getPrimaryKey()[0] . ' = :id', [':id' => $id], ['limit' => 1]));
-			}
-			catch (\Exception $e) {
+			} catch (\Exception $e) {
 			}
 
-			if (isset($result[0])) 	$this->cache[$id] = $result[0];
-			else return null;
+			if (isset($result[0])) {
+				$this->cache[$id] = $result[0];
+			} else {
+				return null;
+			}
 		}
 		return $this->cache[$id];
 	}
 
 	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 {
@@ -76,8 +82,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;
 		}
 	}
@@ -85,15 +90,21 @@ 
     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 addIndex($args) {
-		if (self::EDIT_INDEX & $this->alterDb) $this->adapter->addIndex($this->table, $args);
+		if (self::EDIT_INDEX & $this->alterDb) {
+			$this->adapter->addIndex($this->table, $args);
+		}
 	}
 
 	public function findByField(array $fields, $options = []) {
@@ -101,14 +112,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->addIndex(array_keys($query['args']));
 				$this->addIndex(explode(',', $options['order']));
-			}
-			catch (\Exception $e) {
+			} catch (\Exception $e) {
 				$this->errors[] = $e;
 				$this->resultCache[$cacheId] = [];
 			}
@@ -144,10 +156,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->getTryAgain($tryagain)) throw $e;
+			if ($result->errorCode() !== '00000') {
+				throw new \Exception('Could not insert into ' . $this->table);
+			}
+		} catch (\Exception $e) {
+			if (!$this->getTryAgain($tryagain)) {
+				throw $e;
+			}
 
 			$this->adapter->alterDatabase($this->table, $this->primaryKey, $data);
 			$this->save($data, false);
@@ -164,28 +179,34 @@ 
     }
 
     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->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 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;
+		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;
 		try {
 			$result = $this->adapter->query($this->crudBuilder->insert($table, $data));
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			$error = 1;
 		}
 
@@ -198,7 +219,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;
     }