Level-2 / Maphper

maphper/lib/ArrayFilter.php

Braces +26 added lines, -14 removed lines

@@ -21,8 +21,11 @@ 
             foreach ($fields as $key => $val) {
                 $currentFieldResult = $this->getIfFieldMatches($key, $val, $data, $mode);
 
-                if (Maphper::FIND_OR & $mode && $currentFieldResult === true) return true;
-                else if (!(Maphper::FIND_OR & $mode) && $currentFieldResult === false) return false;
+                if (Maphper::FIND_OR & $mode && $currentFieldResult === true) {
+                	return true;
+                } else if (!(Maphper::FIND_OR & $mode) && $currentFieldResult === false) {
+                	return false;
+                }
             }
             return !(Maphper::FIND_OR & $mode);
         };
@@ -31,22 +34,31 @@ 
     private function getIfFieldMatches($key, $val, $data, $mode) {
         if (is_numeric($key) && is_array($val)) {
             return $this->getSearchFieldFunction($val, $key)($data);
+        } else if (!isset($data->$key)) {
+        	return false;
+        } else if (!(Maphper::FIND_BETWEEN & $mode) && !is_numeric($key) && is_array($val)) {
+                    return in_array($data->$key, $val);
+        } else {
+                    return $this->processFilter($mode, $val, $data->$key);
         }
-        else if (!isset($data->$key)) return false;
-        else if (!(Maphper::FIND_BETWEEN & $mode) && !is_numeric($key) && is_array($val))
-            return in_array($data->$key, $val);
-        else
-            return $this->processFilter($mode, $val, $data->$key);
     }
 
     private function processFilter($mode, $expected, $actual) {
-        if (Maphper::FIND_NOT & $mode) return $expected != $actual;
-        else if (Maphper::FIND_GREATER & $mode && Maphper::FIND_EXACT & $mode) return $expected <= $actual;
-        else if (Maphper::FIND_LESS & $mode && Maphper::FIND_EXACT & $mode) return $expected >= $actual;
-        else if (Maphper::FIND_GREATER & $mode) return $expected < $actual;
-        else if (Maphper::FIND_LESS & $mode) return $expected > $actual;
-        else if (Maphper::FIND_BETWEEN & $mode) return $expected[0] <= $actual && $actual <= $expected[1];
-        else if (Maphper::FIND_NOCASE & $mode) return strtolower($expected) == strtolower($actual);
+        if (Maphper::FIND_NOT & $mode) {
+        	return $expected != $actual;
+        } else if (Maphper::FIND_GREATER & $mode && Maphper::FIND_EXACT & $mode) {
+        	return $expected <= $actual;
+        } else if (Maphper::FIND_LESS & $mode && Maphper::FIND_EXACT & $mode) {
+        	return $expected >= $actual;
+        } else if (Maphper::FIND_GREATER & $mode) {
+        	return $expected < $actual;
+        } else if (Maphper::FIND_LESS & $mode) {
+        	return $expected > $actual;
+        } else if (Maphper::FIND_BETWEEN & $mode) {
+        	return $expected[0] <= $actual && $actual <= $expected[1];
+        } else if (Maphper::FIND_NOCASE & $mode) {
+        	return strtolower($expected) == strtolower($actual);
+        }
         return $expected == $actual;
     }
 }

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

maphper/lib/Sql/Like.php

Braces +6 added lines, -2 removed lines

@@ -9,8 +9,12 @@
     }
 
     public function getSql($key, $value, $mode) {
-        if (Maphper::FIND_LIKE & $mode || Maphper::FIND_STARTS & $mode) $value = '%' . $value;
-        if (Maphper::FIND_LIKE & $mode || Maphper::FIND_ENDS & $mode) $value .= '%';
+        if (Maphper::FIND_LIKE & $mode || Maphper::FIND_STARTS & $mode) {
+        	$value = '%' . $value;
+        }
+        if (Maphper::FIND_LIKE & $mode || Maphper::FIND_ENDS & $mode) {
+        	$value .= '%';
+        }
 
         return [
             'sql' => [$key . ' LIKE :' . $key],

maphper/lib/Sql/WhereBuilder.php

Braces +23 added lines, -11 removed lines

@@ -13,7 +13,9 @@ 
             'Maphper\Lib\Sql\GeneralOperator'
         ];
 
-        foreach ($defaultConditionals as $conditional) $this->addConditional(new $conditional);
+        foreach ($defaultConditionals as $conditional) {
+        	$this->addConditional(new $conditional);
+        }
     }
 
     public function addConditional(WhereConditional $conditional) {
@@ -28,35 +30,45 @@ 
         foreach ($fields as $key => $value) {
             $value = $this->convertDates($value);
 
-            if (is_object($value)) continue;
+            if (is_object($value)) {
+            	continue;
+            }
 			if (is_numeric($key) && is_array($value)) {
 				$result = $this->createSql($value, $key);
-			}
-            else {
+			} else {
                 $result = $this->getConditional($key, $value, $mode);
             }
             $sql = array_merge($sql, $result['sql']);
             $args = array_merge($args, $result['args']);
         }
 
-        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 getConditional($key, $value, $mode) {
         foreach ($this->conditionals as $conditional) {
-            if ($conditional->matches($key, $value, $mode))
-                return $conditional->getSql($key, $value, $mode);
+            if ($conditional->matches($key, $value, $mode)) {
+                            return $conditional->getSql($key, $value, $mode);
+            }
         }
         throw new \Exception("Invalid WHERE query");
     }
 
     private function convertDates($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');
+            }
         }
         return $value;
     }

maphper/lib/Sql/In.php

Braces +5 added lines, -2 removed lines

@@ -14,8 +14,11 @@
             $args[$key . $i] = $value[$i];
             $inSql[] = ':' . $key . $i;
         }
-        if (count($inSql) == 0) return [];
-        else $sql = [$key . ' IN ( ' .  implode(', ', $inSql) . ')'];
+        if (count($inSql) == 0) {
+        	return [];
+        } else {
+        	$sql = [$key . ' IN ( ' .  implode(', ', $inSql) . ')'];
+        }
 
         return ['args' => $args, 'sql' => $sql];
     }

maphper/lib/Sql/GeneralOperator.php

Braces +12 added lines, -5 removed lines

@@ -18,12 +18,19 @@
     private function getOperator($mode) {
         $operator = "";
 
-        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_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/lib/Sql/NullConditional.php

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
 
     public function getSql($key, $value, $mode) {
         $nullSql = $key . ' IS ';
-        if (\Maphper\Maphper::FIND_NOT & $mode) $nullSql .= 'NOT ';
+        if (\Maphper\Maphper::FIND_NOT & $mode) {
+        	$nullSql .= 'NOT ';
+        }
         $sql = [$nullSql . 'NULL'];
 
         return ['args' => [], 'sql' => $sql];