@@ -86,77 +86,60 @@ |
||
| 86 | 86 | { |
| 87 | 87 | if ($rule instanceof EqualRule) { |
| 88 | 88 | $value = $rule->getValue(); |
| 89 | - } |
|
| 90 | - elseif ($rule instanceof InRule) { |
|
| 89 | + } elseif ($rule instanceof InRule) { |
|
| 91 | 90 | $value = $rule->getPossibilities(); |
| 92 | 91 | if (is_object($value) && method_exists('toArray', $value)) { |
| 93 | 92 | $value = $value->toArray(); |
| 94 | 93 | } |
| 95 | - } |
|
| 96 | - elseif ($rule instanceof NotInRule) { |
|
| 94 | + } elseif ($rule instanceof NotInRule) { |
|
| 97 | 95 | $operator = 'NOT IN'; |
| 98 | 96 | $value = $rule->getPossibilities(); |
| 99 | 97 | if (is_object($value) && method_exists('toArray', $value)) { |
| 100 | 98 | $value = $value->toArray(); |
| 101 | 99 | } |
| 102 | - } |
|
| 103 | - elseif ($rule instanceof AboveRule) { |
|
| 100 | + } elseif ($rule instanceof AboveRule) { |
|
| 104 | 101 | $value = $rule->getLowerLimit(); |
| 105 | - } |
|
| 106 | - elseif ($rule instanceof BelowRule) { |
|
| 102 | + } elseif ($rule instanceof BelowRule) { |
|
| 107 | 103 | $value = $rule->getUpperLimit(); |
| 108 | - } |
|
| 109 | - elseif ($rule instanceof AboveOrEqualRule) { |
|
| 104 | + } elseif ($rule instanceof AboveOrEqualRule) { |
|
| 110 | 105 | $value = $rule->getMinimum(); |
| 111 | - } |
|
| 112 | - elseif ($rule instanceof BelowOrEqualRule) { |
|
| 106 | + } elseif ($rule instanceof BelowOrEqualRule) { |
|
| 113 | 107 | $value = $rule->getMaximum(); |
| 114 | - } |
|
| 115 | - elseif ($rule instanceof NotEqualRule) { |
|
| 108 | + } elseif ($rule instanceof NotEqualRule) { |
|
| 116 | 109 | $value = $rule->getValue(); |
| 117 | - } |
|
| 118 | - elseif ($rule instanceof RegexpRule) { |
|
| 110 | + } elseif ($rule instanceof RegexpRule) { |
|
| 119 | 111 | $value = RegexpRule::php2mariadbPCRE( $rule->getPattern() ); |
| 120 | - } |
|
| 121 | - else { |
|
| 112 | + } else { |
|
| 122 | 113 | throw new \InvalidArgumentException( |
| 123 | 114 | "Unhandled operator '$operator' during SQL query generation" |
| 124 | 115 | ); |
| 125 | 116 | } |
| 126 | 117 | |
| 127 | 118 | if (gettype($value) == 'integer') { |
| 128 | - } |
|
| 129 | - elseif (gettype($value) == 'double') { |
|
| 119 | + } elseif (gettype($value) == 'double') { |
|
| 130 | 120 | // TODO disable locale to handle separators |
| 131 | - } |
|
| 132 | - elseif ($value instanceof \DateTime) { |
|
| 121 | + } elseif ($value instanceof \DateTime) { |
|
| 133 | 122 | $value = "'" . $value->format('Y-m-d H:i:s') . "'"; |
| 134 | - } |
|
| 135 | - elseif (gettype($value) == 'string') { |
|
| 123 | + } elseif (gettype($value) == 'string') { |
|
| 136 | 124 | $value = $this->addParameter($value); |
| 137 | - } |
|
| 138 | - elseif (gettype($value) == 'array') { |
|
| 125 | + } elseif (gettype($value) == 'array') { |
|
| 139 | 126 | $sql_part = []; |
| 140 | 127 | foreach ($value as $possibility) { |
| 141 | 128 | $sql_part[] = $this->addParameter($possibility); |
| 142 | 129 | } |
| 143 | 130 | $value = '(' . implode(', ', $sql_part) . ')'; |
| 144 | - } |
|
| 145 | - elseif ($value === null) { |
|
| 131 | + } elseif ($value === null) { |
|
| 146 | 132 | $value = "NULL"; |
| 147 | 133 | if ($rule instanceof EqualRule) { |
| 148 | 134 | $operator = 'IS'; |
| 149 | - } |
|
| 150 | - elseif ($rule instanceof NotEqualRule) { |
|
| 135 | + } elseif ($rule instanceof NotEqualRule) { |
|
| 151 | 136 | $operator = 'IS NOT'; |
| 152 | - } |
|
| 153 | - else { |
|
| 137 | + } else { |
|
| 154 | 138 | throw new \InvalidArgumentException( |
| 155 | 139 | "NULL is only handled for equality / difference" |
| 156 | 140 | ); |
| 157 | 141 | } |
| 158 | - } |
|
| 159 | - else { |
|
| 142 | + } else { |
|
| 160 | 143 | throw new \InvalidArgumentException( |
| 161 | 144 | "Unhandled type of value: ".gettype($value). ' | ' .var_export($value, true) |
| 162 | 145 | ); |