@@ -92,7 +92,9 @@ |
||
92 | 92 | foreach ($array as $key => $value) { |
93 | 93 | $stmt->bindValue(":" . SQLBind::keyAdj($key), $value); |
94 | 94 | } |
95 | - } else $stmt = $this->_db->prepare($sql); |
|
95 | + } else { |
|
96 | + $stmt = $this->_db->prepare($sql); |
|
97 | + } |
|
96 | 98 | |
97 | 99 | return $stmt; |
98 | 100 | } |
@@ -76,50 +76,50 @@ |
||
76 | 76 | if ($s) $s .= '+'; |
77 | 77 | $ch = $fmt[$i]; |
78 | 78 | switch ($ch) { |
79 | - case 'Y': |
|
80 | - case 'y': |
|
81 | - $s .= "datename(yyyy,$col)"; |
|
82 | - break; |
|
83 | - case 'M': |
|
84 | - $s .= "convert(char(3),$col,0)"; |
|
85 | - break; |
|
86 | - case 'm': |
|
87 | - $s .= "replace(str(month($col),2),' ','0')"; |
|
88 | - break; |
|
89 | - case 'Q': |
|
90 | - case 'q': |
|
91 | - $s .= "datename(quarter,$col)"; |
|
92 | - break; |
|
93 | - case 'D': |
|
94 | - case 'd': |
|
95 | - $s .= "replace(str(day($col),2),' ','0')"; |
|
96 | - break; |
|
97 | - case 'h': |
|
98 | - $s .= "substring(convert(char(14),$col,0),13,2)"; |
|
99 | - break; |
|
100 | - |
|
101 | - case 'H': |
|
102 | - $s .= "replace(str(datepart(hh,$col),2),' ','0')"; |
|
103 | - break; |
|
104 | - |
|
105 | - case 'i': |
|
106 | - $s .= "replace(str(datepart(mi,$col),2),' ','0')"; |
|
107 | - break; |
|
108 | - case 's': |
|
109 | - $s .= "replace(str(datepart(ss,$col),2),' ','0')"; |
|
110 | - break; |
|
111 | - case 'a': |
|
112 | - case 'A': |
|
113 | - $s .= "substring(convert(char(19),$col,0),18,2)"; |
|
114 | - break; |
|
115 | - |
|
116 | - default: |
|
117 | - if ($ch == '\\') { |
|
118 | - $i++; |
|
119 | - $ch = substr($fmt, $i, 1); |
|
120 | - } |
|
121 | - $s .= $this->qstr($ch); |
|
122 | - break; |
|
79 | + case 'Y': |
|
80 | + case 'y': |
|
81 | + $s .= "datename(yyyy,$col)"; |
|
82 | + break; |
|
83 | + case 'M': |
|
84 | + $s .= "convert(char(3),$col,0)"; |
|
85 | + break; |
|
86 | + case 'm': |
|
87 | + $s .= "replace(str(month($col),2),' ','0')"; |
|
88 | + break; |
|
89 | + case 'Q': |
|
90 | + case 'q': |
|
91 | + $s .= "datename(quarter,$col)"; |
|
92 | + break; |
|
93 | + case 'D': |
|
94 | + case 'd': |
|
95 | + $s .= "replace(str(day($col),2),' ','0')"; |
|
96 | + break; |
|
97 | + case 'h': |
|
98 | + $s .= "substring(convert(char(14),$col,0),13,2)"; |
|
99 | + break; |
|
100 | + |
|
101 | + case 'H': |
|
102 | + $s .= "replace(str(datepart(hh,$col),2),' ','0')"; |
|
103 | + break; |
|
104 | + |
|
105 | + case 'i': |
|
106 | + $s .= "replace(str(datepart(mi,$col),2),' ','0')"; |
|
107 | + break; |
|
108 | + case 's': |
|
109 | + $s .= "replace(str(datepart(ss,$col),2),' ','0')"; |
|
110 | + break; |
|
111 | + case 'a': |
|
112 | + case 'A': |
|
113 | + $s .= "substring(convert(char(19),$col,0),18,2)"; |
|
114 | + break; |
|
115 | + |
|
116 | + default: |
|
117 | + if ($ch == '\\') { |
|
118 | + $i++; |
|
119 | + $ch = substr($fmt, $i, 1); |
|
120 | + } |
|
121 | + $s .= $this->qstr($ch); |
|
122 | + break; |
|
123 | 123 | } |
124 | 124 | } |
125 | 125 | return $s; |
@@ -68,12 +68,16 @@ |
||
68 | 68 | */ |
69 | 69 | function sqlDate($fmt, $col = false) |
70 | 70 | { |
71 | - if (!$col) $col = "getdate()"; |
|
71 | + if (!$col) { |
|
72 | + $col = "getdate()"; |
|
73 | + } |
|
72 | 74 | $s = ''; |
73 | 75 | |
74 | 76 | $len = strlen($fmt); |
75 | 77 | for ($i = 0; $i < $len; $i++) { |
76 | - if ($s) $s .= '+'; |
|
78 | + if ($s) { |
|
79 | + $s .= '+'; |
|
80 | + } |
|
77 | 81 | $ch = $fmt[$i]; |
78 | 82 | switch ($ch) { |
79 | 83 | case 'Y': |
@@ -76,59 +76,59 @@ |
||
76 | 76 | for ($i = 0; $i < $len; $i++) { |
77 | 77 | $ch = $fmt[$i]; |
78 | 78 | switch ($ch) { |
79 | - case 'Y': |
|
80 | - case 'y': |
|
81 | - $s .= 'YYYY'; |
|
82 | - break; |
|
83 | - case 'Q': |
|
84 | - case 'q': |
|
85 | - $s .= 'Q'; |
|
86 | - break; |
|
87 | - |
|
88 | - case 'M': |
|
89 | - $s .= 'Mon'; |
|
90 | - break; |
|
91 | - |
|
92 | - case 'm': |
|
93 | - $s .= 'MM'; |
|
94 | - break; |
|
95 | - case 'D': |
|
96 | - case 'd': |
|
97 | - $s .= 'DD'; |
|
98 | - break; |
|
99 | - |
|
100 | - case 'H': |
|
101 | - $s.= 'HH24'; |
|
102 | - break; |
|
103 | - |
|
104 | - case 'h': |
|
105 | - $s .= 'HH'; |
|
106 | - break; |
|
107 | - |
|
108 | - case 'i': |
|
109 | - $s .= 'MI'; |
|
110 | - break; |
|
111 | - |
|
112 | - case 's': |
|
113 | - $s .= 'SS'; |
|
114 | - break; |
|
115 | - |
|
116 | - case 'a': |
|
117 | - case 'A': |
|
118 | - $s .= 'AM'; |
|
119 | - break; |
|
120 | - |
|
121 | - default: |
|
122 | - // handle escape characters... |
|
123 | - if ($ch == '\\') { |
|
124 | - $i++; |
|
125 | - $ch = substr($fmt, $i, 1); |
|
126 | - } |
|
127 | - if (strpos('-/.:;, ', $ch) !== false) { |
|
128 | - $s .= $ch; |
|
129 | - } else { |
|
130 | - $s .= '"' . $ch . '"'; |
|
131 | - } |
|
79 | + case 'Y': |
|
80 | + case 'y': |
|
81 | + $s .= 'YYYY'; |
|
82 | + break; |
|
83 | + case 'Q': |
|
84 | + case 'q': |
|
85 | + $s .= 'Q'; |
|
86 | + break; |
|
87 | + |
|
88 | + case 'M': |
|
89 | + $s .= 'Mon'; |
|
90 | + break; |
|
91 | + |
|
92 | + case 'm': |
|
93 | + $s .= 'MM'; |
|
94 | + break; |
|
95 | + case 'D': |
|
96 | + case 'd': |
|
97 | + $s .= 'DD'; |
|
98 | + break; |
|
99 | + |
|
100 | + case 'H': |
|
101 | + $s.= 'HH24'; |
|
102 | + break; |
|
103 | + |
|
104 | + case 'h': |
|
105 | + $s .= 'HH'; |
|
106 | + break; |
|
107 | + |
|
108 | + case 'i': |
|
109 | + $s .= 'MI'; |
|
110 | + break; |
|
111 | + |
|
112 | + case 's': |
|
113 | + $s .= 'SS'; |
|
114 | + break; |
|
115 | + |
|
116 | + case 'a': |
|
117 | + case 'A': |
|
118 | + $s .= 'AM'; |
|
119 | + break; |
|
120 | + |
|
121 | + default: |
|
122 | + // handle escape characters... |
|
123 | + if ($ch == '\\') { |
|
124 | + $i++; |
|
125 | + $ch = substr($fmt, $i, 1); |
|
126 | + } |
|
127 | + if (strpos('-/.:;, ', $ch) !== false) { |
|
128 | + $s .= $ch; |
|
129 | + } else { |
|
130 | + $s .= '"' . $ch . '"'; |
|
131 | + } |
|
132 | 132 | } |
133 | 133 | } |
134 | 134 | return $s . "')"; |
@@ -69,7 +69,9 @@ |
||
69 | 69 | */ |
70 | 70 | function sqlDate($fmt, $col = false) |
71 | 71 | { |
72 | - if (!$col) $col = $this->sysTimeStamp; |
|
72 | + if (!$col) { |
|
73 | + $col = $this->sysTimeStamp; |
|
74 | + } |
|
73 | 75 | $s = 'TO_CHAR(' . $col . ",'"; |
74 | 76 | |
75 | 77 | $len = strlen($fmt); |
@@ -82,59 +82,59 @@ |
||
82 | 82 | for ($i = 0; $i < $len; $i++) { |
83 | 83 | $ch = $fmt[$i]; |
84 | 84 | switch ($ch) { |
85 | - case 'Y': |
|
86 | - case 'y': |
|
87 | - $s .= '%Y'; |
|
88 | - break; |
|
89 | - case 'Q': |
|
90 | - case 'q': |
|
91 | - $s .= "'),Quarter($col)"; |
|
92 | - |
|
93 | - if ($len > $i + 1) $s .= ",DATE_FORMAT($col,'"; |
|
94 | - else $s .= ",('"; |
|
95 | - $concat = true; |
|
96 | - break; |
|
97 | - case 'M': |
|
98 | - $s .= '%b'; |
|
99 | - break; |
|
100 | - |
|
101 | - case 'm': |
|
102 | - $s .= '%m'; |
|
103 | - break; |
|
104 | - case 'D': |
|
105 | - case 'd': |
|
106 | - $s .= '%d'; |
|
107 | - break; |
|
108 | - |
|
109 | - case 'H': |
|
110 | - $s .= '%H'; |
|
111 | - break; |
|
112 | - |
|
113 | - case 'h': |
|
114 | - $s .= '%I'; |
|
115 | - break; |
|
116 | - |
|
117 | - case 'i': |
|
118 | - $s .= '%i'; |
|
119 | - break; |
|
120 | - |
|
121 | - case 's': |
|
122 | - $s .= '%s'; |
|
123 | - break; |
|
124 | - |
|
125 | - case 'a': |
|
126 | - case 'A': |
|
127 | - $s .= '%p'; |
|
128 | - break; |
|
129 | - |
|
130 | - default: |
|
131 | - |
|
132 | - if ($ch == '\\') { |
|
133 | - $i++; |
|
134 | - $ch = substr($fmt, $i, 1); |
|
135 | - } |
|
136 | - $s .= $ch; |
|
137 | - break; |
|
85 | + case 'Y': |
|
86 | + case 'y': |
|
87 | + $s .= '%Y'; |
|
88 | + break; |
|
89 | + case 'Q': |
|
90 | + case 'q': |
|
91 | + $s .= "'),Quarter($col)"; |
|
92 | + |
|
93 | + if ($len > $i + 1) $s .= ",DATE_FORMAT($col,'"; |
|
94 | + else $s .= ",('"; |
|
95 | + $concat = true; |
|
96 | + break; |
|
97 | + case 'M': |
|
98 | + $s .= '%b'; |
|
99 | + break; |
|
100 | + |
|
101 | + case 'm': |
|
102 | + $s .= '%m'; |
|
103 | + break; |
|
104 | + case 'D': |
|
105 | + case 'd': |
|
106 | + $s .= '%d'; |
|
107 | + break; |
|
108 | + |
|
109 | + case 'H': |
|
110 | + $s .= '%H'; |
|
111 | + break; |
|
112 | + |
|
113 | + case 'h': |
|
114 | + $s .= '%I'; |
|
115 | + break; |
|
116 | + |
|
117 | + case 'i': |
|
118 | + $s .= '%i'; |
|
119 | + break; |
|
120 | + |
|
121 | + case 's': |
|
122 | + $s .= '%s'; |
|
123 | + break; |
|
124 | + |
|
125 | + case 'a': |
|
126 | + case 'A': |
|
127 | + $s .= '%p'; |
|
128 | + break; |
|
129 | + |
|
130 | + default: |
|
131 | + |
|
132 | + if ($ch == '\\') { |
|
133 | + $i++; |
|
134 | + $ch = substr($fmt, $i, 1); |
|
135 | + } |
|
136 | + $s .= $ch; |
|
137 | + break; |
|
138 | 138 | } |
139 | 139 | } |
140 | 140 | $s.="')"; |
@@ -75,7 +75,9 @@ discard block |
||
75 | 75 | */ |
76 | 76 | function sqlDate($fmt, $col = false) |
77 | 77 | { |
78 | - if (!$col) $col = $this->sysTimeStamp; |
|
78 | + if (!$col) { |
|
79 | + $col = $this->sysTimeStamp; |
|
80 | + } |
|
79 | 81 | $s = 'DATE_FORMAT(' . $col . ",'"; |
80 | 82 | $concat = false; |
81 | 83 | $len = strlen($fmt); |
@@ -90,8 +92,11 @@ discard block |
||
90 | 92 | case 'q': |
91 | 93 | $s .= "'),Quarter($col)"; |
92 | 94 | |
93 | - if ($len > $i + 1) $s .= ",DATE_FORMAT($col,'"; |
|
94 | - else $s .= ",('"; |
|
95 | + if ($len > $i + 1) { |
|
96 | + $s .= ",DATE_FORMAT($col,'"; |
|
97 | + } else { |
|
98 | + $s .= ",('"; |
|
99 | + } |
|
95 | 100 | $concat = true; |
96 | 101 | break; |
97 | 102 | case 'M': |
@@ -138,7 +143,9 @@ discard block |
||
138 | 143 | } |
139 | 144 | } |
140 | 145 | $s.="')"; |
141 | - if ($concat) $s = "CONCAT($s)"; |
|
146 | + if ($concat) { |
|
147 | + $s = "CONCAT($s)"; |
|
148 | + } |
|
142 | 149 | return $s; |
143 | 150 | } |
144 | 151 |
@@ -27,7 +27,9 @@ discard block |
||
27 | 27 | } |
28 | 28 | |
29 | 29 | if ($path != "") { |
30 | - if ($path[0] == "/") $path = substr($path, 1); |
|
30 | + if ($path[0] == "/") { |
|
31 | + $path = substr($path, 1); |
|
32 | + } |
|
31 | 33 | |
32 | 34 | $pathAr = explode("/", $path); |
33 | 35 | |
@@ -44,7 +46,9 @@ discard block |
||
44 | 46 | } |
45 | 47 | } |
46 | 48 | $this->_jsonObject = $newjsonObject; |
47 | - } else $this->_jsonObject = $jsonObject; |
|
49 | + } else { |
|
50 | + $this->_jsonObject = $jsonObject; |
|
51 | + } |
|
48 | 52 | |
49 | 53 | $this->_current = 0; |
50 | 54 | } |
@@ -23,27 +23,27 @@ |
||
23 | 23 | $lastError = json_last_error(); |
24 | 24 | $lastErrorDesc = ""; |
25 | 25 | switch ($lastError) { |
26 | - case JSON_ERROR_NONE: |
|
27 | - $lastErrorDesc = 'No errors'; |
|
28 | - break; |
|
29 | - case JSON_ERROR_DEPTH: |
|
30 | - $lastErrorDesc = 'Maximum stack depth exceeded'; |
|
31 | - break; |
|
32 | - case JSON_ERROR_STATE_MISMATCH: |
|
33 | - $lastErrorDesc = 'Underflow or the modes mismatch'; |
|
34 | - break; |
|
35 | - case JSON_ERROR_CTRL_CHAR: |
|
36 | - $lastErrorDesc = 'Unexpected control character found'; |
|
37 | - break; |
|
38 | - case JSON_ERROR_SYNTAX: |
|
39 | - $lastErrorDesc = 'Syntax error, malformed JSON'; |
|
40 | - break; |
|
41 | - case JSON_ERROR_UTF8: |
|
42 | - $lastErrorDesc = 'Malformed UTF-8 characters, possibly incorrectly encoded'; |
|
43 | - break; |
|
44 | - default: |
|
45 | - $lastErrorDesc = 'Unknown error'; |
|
46 | - break; |
|
26 | + case JSON_ERROR_NONE: |
|
27 | + $lastErrorDesc = 'No errors'; |
|
28 | + break; |
|
29 | + case JSON_ERROR_DEPTH: |
|
30 | + $lastErrorDesc = 'Maximum stack depth exceeded'; |
|
31 | + break; |
|
32 | + case JSON_ERROR_STATE_MISMATCH: |
|
33 | + $lastErrorDesc = 'Underflow or the modes mismatch'; |
|
34 | + break; |
|
35 | + case JSON_ERROR_CTRL_CHAR: |
|
36 | + $lastErrorDesc = 'Unexpected control character found'; |
|
37 | + break; |
|
38 | + case JSON_ERROR_SYNTAX: |
|
39 | + $lastErrorDesc = 'Syntax error, malformed JSON'; |
|
40 | + break; |
|
41 | + case JSON_ERROR_UTF8: |
|
42 | + $lastErrorDesc = 'Malformed UTF-8 characters, possibly incorrectly encoded'; |
|
43 | + break; |
|
44 | + default: |
|
45 | + $lastErrorDesc = 'Unknown error'; |
|
46 | + break; |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | if ($lastError != JSON_ERROR_NONE) { |
@@ -26,7 +26,9 @@ |
||
26 | 26 | |
27 | 27 | $this->_array = array(); |
28 | 28 | |
29 | - if (!$array) return; |
|
29 | + if (!$array) { |
|
30 | + return; |
|
31 | + } |
|
30 | 32 | |
31 | 33 | if (is_array($array)) { |
32 | 34 | foreach ($array as $key => $value) { |
@@ -141,38 +141,38 @@ discard block |
||
141 | 141 | |
142 | 142 | $result = ""; |
143 | 143 | switch ($relation) { |
144 | - case Relation::EQUAL: { |
|
145 | - $result = $field . "=" . $value; |
|
146 | - break; |
|
147 | - } |
|
148 | - case Relation::GREATER_THAN: { |
|
149 | - $result = $field . ">" . $value; |
|
150 | - break; |
|
151 | - } |
|
152 | - case Relation::LESS_THAN: { |
|
153 | - $result = $field . "<" . $value; |
|
154 | - break; |
|
155 | - } |
|
156 | - case Relation::GREATER_OR_EQUAL_THAN: { |
|
157 | - $result = $field . ">=" . $value; |
|
158 | - break; |
|
159 | - } |
|
160 | - case Relation::LESS_OR_EQUAL_THAN: { |
|
161 | - $result = $field . "<=" . $value; |
|
162 | - break; |
|
163 | - } |
|
164 | - case Relation::NOT_EQUAL: { |
|
165 | - $result = $field . "!=" . $value; |
|
166 | - break; |
|
167 | - } |
|
168 | - case Relation::STARTS_WITH: { |
|
169 | - $result = " starts-with($field, $value) "; |
|
170 | - break; |
|
171 | - } |
|
172 | - case Relation::CONTAINS: { |
|
173 | - $result = " contains($field, $value) "; |
|
174 | - break; |
|
175 | - } |
|
144 | + case Relation::EQUAL: { |
|
145 | + $result = $field . "=" . $value; |
|
146 | + break; |
|
147 | + } |
|
148 | + case Relation::GREATER_THAN: { |
|
149 | + $result = $field . ">" . $value; |
|
150 | + break; |
|
151 | + } |
|
152 | + case Relation::LESS_THAN: { |
|
153 | + $result = $field . "<" . $value; |
|
154 | + break; |
|
155 | + } |
|
156 | + case Relation::GREATER_OR_EQUAL_THAN: { |
|
157 | + $result = $field . ">=" . $value; |
|
158 | + break; |
|
159 | + } |
|
160 | + case Relation::LESS_OR_EQUAL_THAN: { |
|
161 | + $result = $field . "<=" . $value; |
|
162 | + break; |
|
163 | + } |
|
164 | + case Relation::NOT_EQUAL: { |
|
165 | + $result = $field . "!=" . $value; |
|
166 | + break; |
|
167 | + } |
|
168 | + case Relation::STARTS_WITH: { |
|
169 | + $result = " starts-with($field, $value) "; |
|
170 | + break; |
|
171 | + } |
|
172 | + case Relation::CONTAINS: { |
|
173 | + $result = " contains($field, $value) "; |
|
174 | + break; |
|
175 | + } |
|
176 | 176 | } |
177 | 177 | return $result; |
178 | 178 | } |
@@ -200,40 +200,40 @@ discard block |
||
200 | 200 | $field = " $name "; |
201 | 201 | $valueparam = " [[" . $paramName . "]] "; |
202 | 202 | switch ($relation) { |
203 | - case Relation::EQUAL: { |
|
204 | - $result = $field . "=" . $valueparam; |
|
205 | - break; |
|
206 | - } |
|
207 | - case Relation::GREATER_THAN: { |
|
208 | - $result = $field . ">" . $valueparam; |
|
209 | - break; |
|
210 | - } |
|
211 | - case Relation::LESS_THAN: { |
|
212 | - $result = $field . "<" . $valueparam; |
|
213 | - break; |
|
214 | - } |
|
215 | - case Relation::GREATER_OR_EQUAL_THAN: { |
|
216 | - $result = $field . ">=" . $valueparam; |
|
217 | - break; |
|
218 | - } |
|
219 | - case Relation::LESS_OR_EQUAL_THAN: { |
|
220 | - $result = $field . "<=" . $valueparam; |
|
221 | - break; |
|
222 | - } |
|
223 | - case Relation::NOT_EQUAL: { |
|
224 | - $result = $field . "!=" . $valueparam; |
|
225 | - break; |
|
226 | - } |
|
227 | - case Relation::STARTS_WITH: { |
|
228 | - $param[$paramName] = $value . "%"; |
|
229 | - $result = $field . " like " . $valueparam; |
|
230 | - break; |
|
231 | - } |
|
232 | - case Relation::CONTAINS: { |
|
233 | - $param[$paramName] = "%" . $value . "%"; |
|
234 | - $result = $field . " like " . $valueparam; |
|
235 | - break; |
|
236 | - } |
|
203 | + case Relation::EQUAL: { |
|
204 | + $result = $field . "=" . $valueparam; |
|
205 | + break; |
|
206 | + } |
|
207 | + case Relation::GREATER_THAN: { |
|
208 | + $result = $field . ">" . $valueparam; |
|
209 | + break; |
|
210 | + } |
|
211 | + case Relation::LESS_THAN: { |
|
212 | + $result = $field . "<" . $valueparam; |
|
213 | + break; |
|
214 | + } |
|
215 | + case Relation::GREATER_OR_EQUAL_THAN: { |
|
216 | + $result = $field . ">=" . $valueparam; |
|
217 | + break; |
|
218 | + } |
|
219 | + case Relation::LESS_OR_EQUAL_THAN: { |
|
220 | + $result = $field . "<=" . $valueparam; |
|
221 | + break; |
|
222 | + } |
|
223 | + case Relation::NOT_EQUAL: { |
|
224 | + $result = $field . "!=" . $valueparam; |
|
225 | + break; |
|
226 | + } |
|
227 | + case Relation::STARTS_WITH: { |
|
228 | + $param[$paramName] = $value . "%"; |
|
229 | + $result = $field . " like " . $valueparam; |
|
230 | + break; |
|
231 | + } |
|
232 | + case Relation::CONTAINS: { |
|
233 | + $param[$paramName] = "%" . $value . "%"; |
|
234 | + $result = $field . " like " . $valueparam; |
|
235 | + break; |
|
236 | + } |
|
237 | 237 | } |
238 | 238 | |
239 | 239 | return $result; |
@@ -268,38 +268,38 @@ discard block |
||
268 | 268 | |
269 | 269 | foreach ($field as $valueparam) { |
270 | 270 | switch ($relation) { |
271 | - case Relation::EQUAL: { |
|
272 | - $result[$pos] &= ($valueparam == $value); |
|
273 | - break; |
|
274 | - } |
|
275 | - case Relation::GREATER_THAN: { |
|
276 | - $result[$pos] &= ($valueparam > $value); |
|
277 | - break; |
|
278 | - } |
|
279 | - case Relation::LESS_THAN: { |
|
280 | - $result[$pos] &= ($valueparam < $value); |
|
281 | - break; |
|
282 | - } |
|
283 | - case Relation::GREATER_OR_EQUAL_THAN: { |
|
284 | - $result[$pos] &= ($valueparam >= $value); |
|
285 | - break; |
|
286 | - } |
|
287 | - case Relation::LESS_OR_EQUAL_THAN: { |
|
288 | - $result[$pos] &= ($valueparam <= $value); |
|
289 | - break; |
|
290 | - } |
|
291 | - case Relation::NOT_EQUAL: { |
|
292 | - $result[$pos] &= ($valueparam != $value); |
|
293 | - break; |
|
294 | - } |
|
295 | - case Relation::STARTS_WITH: { |
|
296 | - $result[$pos] &= (strpos($valueparam, $value) === 0); |
|
297 | - break; |
|
298 | - } |
|
299 | - case Relation::CONTAINS: { |
|
300 | - $result[$pos] &= (strpos($valueparam, $value) !== false); |
|
301 | - break; |
|
302 | - } |
|
271 | + case Relation::EQUAL: { |
|
272 | + $result[$pos] &= ($valueparam == $value); |
|
273 | + break; |
|
274 | + } |
|
275 | + case Relation::GREATER_THAN: { |
|
276 | + $result[$pos] &= ($valueparam > $value); |
|
277 | + break; |
|
278 | + } |
|
279 | + case Relation::LESS_THAN: { |
|
280 | + $result[$pos] &= ($valueparam < $value); |
|
281 | + break; |
|
282 | + } |
|
283 | + case Relation::GREATER_OR_EQUAL_THAN: { |
|
284 | + $result[$pos] &= ($valueparam >= $value); |
|
285 | + break; |
|
286 | + } |
|
287 | + case Relation::LESS_OR_EQUAL_THAN: { |
|
288 | + $result[$pos] &= ($valueparam <= $value); |
|
289 | + break; |
|
290 | + } |
|
291 | + case Relation::NOT_EQUAL: { |
|
292 | + $result[$pos] &= ($valueparam != $value); |
|
293 | + break; |
|
294 | + } |
|
295 | + case Relation::STARTS_WITH: { |
|
296 | + $result[$pos] &= (strpos($valueparam, $value) === 0); |
|
297 | + break; |
|
298 | + } |
|
299 | + case Relation::CONTAINS: { |
|
300 | + $result[$pos] &= (strpos($valueparam, $value) !== false); |
|
301 | + break; |
|
302 | + } |
|
303 | 303 | } |
304 | 304 | } |
305 | 305 | } |
@@ -264,7 +264,9 @@ |
||
264 | 264 | |
265 | 265 | $field = $array->getField($name); |
266 | 266 | |
267 | - if (!is_array($field)) $field = array($field); |
|
267 | + if (!is_array($field)) { |
|
268 | + $field = array($field); |
|
269 | + } |
|
268 | 270 | |
269 | 271 | foreach ($field as $valueparam) { |
270 | 272 | switch ($relation) { |
@@ -310,7 +310,9 @@ |
||
310 | 310 | |
311 | 311 | protected function quickSortExec($seq, $field) |
312 | 312 | { |
313 | - if (!count($seq)) return $seq; |
|
313 | + if (!count($seq)) { |
|
314 | + return $seq; |
|
315 | + } |
|
314 | 316 | |
315 | 317 | $k = $seq [0]; |
316 | 318 | $x = $y = array(); |