@@ -16,8 +16,12 @@ |
||
16 | 16 | } |
17 | 17 | |
18 | 18 | private function getValue($value, $mode) { |
19 | - if ((Maphper::FIND_LIKE | Maphper::FIND_ENDS) & $mode) $value = '%' . $value; |
|
20 | - if ((Maphper::FIND_LIKE | Maphper::FIND_STARTS) & $mode) $value .= '%'; |
|
19 | + if ((Maphper::FIND_LIKE | Maphper::FIND_ENDS) & $mode) { |
|
20 | + $value = '%' . $value; |
|
21 | + } |
|
22 | + if ((Maphper::FIND_LIKE | Maphper::FIND_STARTS) & $mode) { |
|
23 | + $value .= '%'; |
|
24 | + } |
|
21 | 25 | return $value; |
22 | 26 | } |
23 | 27 | } |
@@ -13,7 +13,9 @@ discard block |
||
13 | 13 | 'Maphper\Lib\Sql\GeneralOperator' |
14 | 14 | ]; |
15 | 15 | |
16 | - foreach ($defaultConditionals as $conditional) $this->addConditional(new $conditional); |
|
16 | + foreach ($defaultConditionals as $conditional) { |
|
17 | + $this->addConditional(new $conditional); |
|
18 | + } |
|
17 | 19 | } |
18 | 20 | |
19 | 21 | public function addConditional(WhereConditional $conditional) { |
@@ -27,11 +29,12 @@ discard block |
||
27 | 29 | foreach ($fields as $key => $value) { |
28 | 30 | $value = $this->convertDates($value); |
29 | 31 | |
30 | - if (is_object($value)) continue; |
|
32 | + if (is_object($value)) { |
|
33 | + continue; |
|
34 | + } |
|
31 | 35 | if (is_numeric($key) && is_array($value)) { |
32 | 36 | $result = $this->createSql($value, $key); |
33 | - } |
|
34 | - else { |
|
37 | + } else { |
|
35 | 38 | $result = $this->getConditional($key, $value, $mode); |
36 | 39 | } |
37 | 40 | $sql = array_merge($sql, (array)$result['sql']); |
@@ -42,24 +45,33 @@ discard block |
||
42 | 45 | } |
43 | 46 | |
44 | 47 | private function sqlArrayToString($sql, $mode) { |
45 | - if (\Maphper\Maphper::FIND_OR & $mode) $query = implode(' OR ', $sql); |
|
46 | - else $query = implode(' AND ', $sql); |
|
47 | - if (!empty($query)) $query = '(' . $query . ')'; |
|
48 | + if (\Maphper\Maphper::FIND_OR & $mode) { |
|
49 | + $query = implode(' OR ', $sql); |
|
50 | + } else { |
|
51 | + $query = implode(' AND ', $sql); |
|
52 | + } |
|
53 | + if (!empty($query)) { |
|
54 | + $query = '(' . $query . ')'; |
|
55 | + } |
|
48 | 56 | return $query; |
49 | 57 | } |
50 | 58 | |
51 | 59 | private function getConditional($key, $value, $mode) { |
52 | 60 | foreach ($this->conditionals as $conditional) { |
53 | - if ($conditional->matches($key, $value, $mode)) |
|
54 | - return $conditional->getSql($key, $value, $mode); |
|
61 | + if ($conditional->matches($key, $value, $mode)) { |
|
62 | + return $conditional->getSql($key, $value, $mode); |
|
63 | + } |
|
55 | 64 | } |
56 | 65 | throw new \Exception("Invalid WHERE query"); |
57 | 66 | } |
58 | 67 | |
59 | 68 | private function convertDates($value) { |
60 | 69 | if ($value instanceof \DateTime) { |
61 | - if ($value->format('H:i:s') == '00:00:00') $value = $value->format('Y-m-d'); |
|
62 | - else $value = $value->format('Y-m-d H:i:s'); |
|
70 | + if ($value->format('H:i:s') == '00:00:00') { |
|
71 | + $value = $value->format('Y-m-d'); |
|
72 | + } else { |
|
73 | + $value = $value->format('Y-m-d H:i:s'); |
|
74 | + } |
|
63 | 75 | } |
64 | 76 | return $value; |
65 | 77 | } |
@@ -16,8 +16,11 @@ discard block |
||
16 | 16 | } |
17 | 17 | |
18 | 18 | private function getOperator($mode) { |
19 | - if (\Maphper\Maphper::FIND_BIT & $mode) return '&'; |
|
20 | - else if (\Maphper\Maphper::FIND_NOT & $mode) return '!='; |
|
19 | + if (\Maphper\Maphper::FIND_BIT & $mode) { |
|
20 | + return '&'; |
|
21 | + } else if (\Maphper\Maphper::FIND_NOT & $mode) { |
|
22 | + return '!='; |
|
23 | + } |
|
21 | 24 | |
22 | 25 | return $this->getEqualsOperators($mode); |
23 | 26 | } |
@@ -25,10 +28,15 @@ discard block |
||
25 | 28 | private function getEqualsOperators($mode) { |
26 | 29 | $operator = ""; |
27 | 30 | |
28 | - if (\Maphper\Maphper::FIND_GREATER & $mode) $operator = '>'; |
|
29 | - else if (\Maphper\Maphper::FIND_LESS & $mode) $operator = '<'; |
|
31 | + if (\Maphper\Maphper::FIND_GREATER & $mode) { |
|
32 | + $operator = '>'; |
|
33 | + } else if (\Maphper\Maphper::FIND_LESS & $mode) { |
|
34 | + $operator = '<'; |
|
35 | + } |
|
30 | 36 | |
31 | - if (\Maphper\Maphper::FIND_EXACT & $mode) $operator .= '='; |
|
37 | + if (\Maphper\Maphper::FIND_EXACT & $mode) { |
|
38 | + $operator .= '='; |
|
39 | + } |
|
32 | 40 | |
33 | 41 | return $operator; |
34 | 42 | } |