@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | /** |
278 | 278 | * Returns the left and right template delimiters. |
279 | 279 | * |
280 | - * @return array containing the left and the right delimiters |
|
280 | + * @return string[] containing the left and the right delimiters |
|
281 | 281 | */ |
282 | 282 | public function getDelimiters() |
283 | 283 | { |
@@ -362,7 +362,7 @@ discard block |
||
362 | 362 | * Adds a preprocessor to the compiler, it will be called |
363 | 363 | * before the template is compiled. |
364 | 364 | * |
365 | - * @param mixed $callback either a valid callback to the preprocessor or a simple name if the autoload is set to |
|
365 | + * @param string $callback either a valid callback to the preprocessor or a simple name if the autoload is set to |
|
366 | 366 | * true |
367 | 367 | * @param bool $autoload if set to true, the preprocessor is auto-loaded from one of the plugin directories, else |
368 | 368 | * you must provide a valid callback |
@@ -1321,7 +1321,7 @@ discard block |
||
1321 | 1321 | * |
1322 | 1322 | * @param array $params parameter array |
1323 | 1323 | * |
1324 | - * @return array tokens |
|
1324 | + * @return Compiler tokens |
|
1325 | 1325 | */ |
1326 | 1326 | public function getParamTokens(array $params) |
1327 | 1327 | { |
@@ -769,13 +769,13 @@ discard block |
||
769 | 769 | $search = array('{<\?.*?\?>}', '{<%.*?%>}'); |
770 | 770 | } |
771 | 771 | switch ($this->securityPolicy->getPhpHandling()) { |
772 | - case SecurityPolicy::PHP_ALLOW: |
|
773 | - break; |
|
774 | - case SecurityPolicy::PHP_ENCODE: |
|
775 | - $tpl = preg_replace_callback($search, array($this, 'phpTagEncodingHelper'), $tpl); |
|
776 | - break; |
|
777 | - case SecurityPolicy::PHP_REMOVE: |
|
778 | - $tpl = preg_replace($search, '', $tpl); |
|
772 | + case SecurityPolicy::PHP_ALLOW: |
|
773 | + break; |
|
774 | + case SecurityPolicy::PHP_ENCODE: |
|
775 | + $tpl = preg_replace_callback($search, array($this, 'phpTagEncodingHelper'), $tpl); |
|
776 | + break; |
|
777 | + case SecurityPolicy::PHP_REMOVE: |
|
778 | + $tpl = preg_replace($search, '', $tpl); |
|
779 | 779 | } |
780 | 780 | } |
781 | 781 | } |
@@ -875,51 +875,51 @@ discard block |
||
875 | 875 | } |
876 | 876 | |
877 | 877 | switch ($type) { |
878 | - case Core::CLASS_PLUGIN: |
|
879 | - case Core::CLASS_PLUGIN + Core::BLOCK_PLUGIN: |
|
880 | - if (class_exists('Plugin' . $plugin) !== false) { |
|
881 | - $output .= "if (class_exists('" . "Plugin" . $plugin . "')===false)". |
|
882 | - "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n"; |
|
883 | - } else { |
|
884 | - $output .= "if (class_exists('" . Core::NAMESPACE_PLUGINS_BLOCKS . "Plugin" . $plugin . "')===false)". |
|
885 | - "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n"; |
|
886 | - } |
|
887 | - break; |
|
888 | - case Core::CLASS_PLUGIN + Core::FUNC_PLUGIN: |
|
889 | - if (class_exists('Plugin' . $plugin) !== false) { |
|
890 | - $output .= "if (class_exists('" . "Plugin" . $plugin . "')===false)". |
|
891 | - "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n"; |
|
892 | - } else { |
|
893 | - $output .= "if (class_exists('" . Core::NAMESPACE_PLUGINS_FUNCTIONS . "Plugin" . $plugin . "')===false)". |
|
894 | - "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n"; |
|
895 | - } |
|
896 | - break; |
|
897 | - case Core::FUNC_PLUGIN: |
|
898 | - if (function_exists('Plugin' . $plugin) !== false) { |
|
899 | - $output .= "if (function_exists('" . "Plugin" . $plugin . "')===false)". |
|
878 | + case Core::CLASS_PLUGIN: |
|
879 | + case Core::CLASS_PLUGIN + Core::BLOCK_PLUGIN: |
|
880 | + if (class_exists('Plugin' . $plugin) !== false) { |
|
881 | + $output .= "if (class_exists('" . "Plugin" . $plugin . "')===false)". |
|
882 | + "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n"; |
|
883 | + } else { |
|
884 | + $output .= "if (class_exists('" . Core::NAMESPACE_PLUGINS_BLOCKS . "Plugin" . $plugin . "')===false)". |
|
885 | + "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n"; |
|
886 | + } |
|
887 | + break; |
|
888 | + case Core::CLASS_PLUGIN + Core::FUNC_PLUGIN: |
|
889 | + if (class_exists('Plugin' . $plugin) !== false) { |
|
890 | + $output .= "if (class_exists('" . "Plugin" . $plugin . "')===false)". |
|
900 | 891 | "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n"; |
901 | - } else { |
|
902 | - $output .= "if (function_exists('" . Core::NAMESPACE_PLUGINS_FUNCTIONS . "Plugin" . $plugin . "')===false)". |
|
892 | + } else { |
|
893 | + $output .= "if (class_exists('" . Core::NAMESPACE_PLUGINS_FUNCTIONS . "Plugin" . $plugin . "')===false)". |
|
903 | 894 | "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n"; |
904 | - } |
|
905 | - break; |
|
906 | - case Core::SMARTY_MODIFIER: |
|
907 | - $output .= "if (function_exists('smarty_modifier_$plugin')===false)". |
|
908 | - "\n\t\$this->getLoader()->loadPlugin('$plugin');\n"; |
|
909 | - break; |
|
910 | - case Core::SMARTY_FUNCTION: |
|
911 | - $output .= "if (function_exists('smarty_function_$plugin')===false)". |
|
912 | - "\n\t\$this->getLoader()->loadPlugin('$plugin');\n"; |
|
913 | - break; |
|
914 | - case Core::SMARTY_BLOCK: |
|
915 | - $output .= "if (function_exists('smarty_block_$plugin')===false)". |
|
916 | - "\n\t\$this->getLoader()->loadPlugin('$plugin');\n"; |
|
917 | - break; |
|
918 | - case Core::PROXY_PLUGIN: |
|
919 | - $output .= $this->getCore()->getPluginProxy()->getLoader($plugin); |
|
920 | - break; |
|
921 | - default: |
|
922 | - throw new CompilationException($this, 'Type error for ' . $plugin . ' with type' . $type); |
|
895 | + } |
|
896 | + break; |
|
897 | + case Core::FUNC_PLUGIN: |
|
898 | + if (function_exists('Plugin' . $plugin) !== false) { |
|
899 | + $output .= "if (function_exists('" . "Plugin" . $plugin . "')===false)". |
|
900 | + "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n"; |
|
901 | + } else { |
|
902 | + $output .= "if (function_exists('" . Core::NAMESPACE_PLUGINS_FUNCTIONS . "Plugin" . $plugin . "')===false)". |
|
903 | + "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n"; |
|
904 | + } |
|
905 | + break; |
|
906 | + case Core::SMARTY_MODIFIER: |
|
907 | + $output .= "if (function_exists('smarty_modifier_$plugin')===false)". |
|
908 | + "\n\t\$this->getLoader()->loadPlugin('$plugin');\n"; |
|
909 | + break; |
|
910 | + case Core::SMARTY_FUNCTION: |
|
911 | + $output .= "if (function_exists('smarty_function_$plugin')===false)". |
|
912 | + "\n\t\$this->getLoader()->loadPlugin('$plugin');\n"; |
|
913 | + break; |
|
914 | + case Core::SMARTY_BLOCK: |
|
915 | + $output .= "if (function_exists('smarty_block_$plugin')===false)". |
|
916 | + "\n\t\$this->getLoader()->loadPlugin('$plugin');\n"; |
|
917 | + break; |
|
918 | + case Core::PROXY_PLUGIN: |
|
919 | + $output .= $this->getCore()->getPluginProxy()->getLoader($plugin); |
|
920 | + break; |
|
921 | + default: |
|
922 | + throw new CompilationException($this, 'Type error for ' . $plugin . ' with type' . $type); |
|
923 | 923 | } |
924 | 924 | } |
925 | 925 |
@@ -85,8 +85,8 @@ |
||
85 | 85 | |
86 | 86 | /** |
87 | 87 | * @param $output |
88 | - * @param $dynamicId |
|
89 | - * @param $compiledFile |
|
88 | + * @param string $dynamicId |
|
89 | + * @param string $compiledFile |
|
90 | 90 | * |
91 | 91 | * @return mixed|string |
92 | 92 | */ |
@@ -59,7 +59,7 @@ |
||
59 | 59 | * @param string $append |
60 | 60 | * @param string $content |
61 | 61 | * |
62 | - * @return mixed|string |
|
62 | + * @return string |
|
63 | 63 | */ |
64 | 64 | public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content) |
65 | 65 | { |
@@ -67,12 +67,12 @@ |
||
67 | 67 | |
68 | 68 | $mode = trim($params['mode'], '"\''); |
69 | 69 | switch ($mode) { |
70 | - case 'js': |
|
71 | - case 'javascript': |
|
72 | - $content = preg_replace('#(?<!:)//\s[^\r\n]*|/\*.*?\*/#s', '', $content); |
|
70 | + case 'js': |
|
71 | + case 'javascript': |
|
72 | + $content = preg_replace('#(?<!:)//\s[^\r\n]*|/\*.*?\*/#s', '', $content); |
|
73 | 73 | |
74 | - case 'default': |
|
75 | - default: |
|
74 | + case 'default': |
|
75 | + default: |
|
76 | 76 | } |
77 | 77 | $content = preg_replace(array( |
78 | 78 | "/\n/", |
@@ -29,7 +29,7 @@ |
||
29 | 29 | /** |
30 | 30 | * @param string $input |
31 | 31 | * |
32 | - * @return mixed |
|
32 | + * @return string |
|
33 | 33 | */ |
34 | 34 | public function process($input) |
35 | 35 | { |
@@ -312,7 +312,7 @@ |
||
312 | 312 | |
313 | 313 | /** |
314 | 314 | * @param mixed $_tpl |
315 | - * @param array $data |
|
315 | + * @param Data $data |
|
316 | 316 | * @param null $_compiler |
317 | 317 | * @param bool $_output |
318 | 318 | * |
@@ -70,164 +70,164 @@ |
||
70 | 70 | } |
71 | 71 | switch ($vmod) { |
72 | 72 | |
73 | - case 'and': |
|
74 | - if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
75 | - $p[] = '&&'; |
|
76 | - } else { |
|
77 | - $p[] = $v; |
|
78 | - } |
|
79 | - break; |
|
80 | - case 'or': |
|
81 | - if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
82 | - $p[] = '||'; |
|
83 | - } else { |
|
84 | - $p[] = $v; |
|
85 | - } |
|
86 | - break; |
|
87 | - case 'xor': |
|
88 | - if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
89 | - $p[] = '^'; |
|
90 | - } else { |
|
91 | - $p[] = $v; |
|
92 | - } |
|
93 | - break; |
|
94 | - case 'eq': |
|
95 | - if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
96 | - $p[] = '=='; |
|
97 | - } else { |
|
98 | - $p[] = $v; |
|
99 | - } |
|
100 | - break; |
|
101 | - case 'ne': |
|
102 | - case 'neq': |
|
103 | - if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
104 | - $p[] = '!='; |
|
105 | - } else { |
|
106 | - $p[] = $v; |
|
107 | - } |
|
108 | - break; |
|
109 | - case 'gte': |
|
110 | - case 'ge': |
|
111 | - if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
112 | - $p[] = '>='; |
|
113 | - } else { |
|
114 | - $p[] = $v; |
|
115 | - } |
|
116 | - break; |
|
117 | - case 'lte': |
|
118 | - case 'le': |
|
119 | - if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
120 | - $p[] = '<='; |
|
121 | - } else { |
|
122 | - $p[] = $v; |
|
123 | - } |
|
124 | - break; |
|
125 | - case 'gt': |
|
126 | - if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
127 | - $p[] = '>'; |
|
128 | - } else { |
|
129 | - $p[] = $v; |
|
130 | - } |
|
131 | - break; |
|
132 | - case 'lt': |
|
133 | - if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
134 | - $p[] = '<'; |
|
135 | - } else { |
|
136 | - $p[] = $v; |
|
137 | - } |
|
138 | - break; |
|
139 | - case 'mod': |
|
140 | - if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
141 | - $p[] = '%'; |
|
142 | - } else { |
|
143 | - $p[] = $v; |
|
144 | - } |
|
145 | - break; |
|
146 | - case 'not': |
|
147 | - if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
148 | - $p[] = '!'; |
|
149 | - } else { |
|
150 | - $p[] = $v; |
|
151 | - } |
|
152 | - break; |
|
153 | - case '<>': |
|
73 | + case 'and': |
|
74 | + if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
75 | + $p[] = '&&'; |
|
76 | + } else { |
|
77 | + $p[] = $v; |
|
78 | + } |
|
79 | + break; |
|
80 | + case 'or': |
|
81 | + if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
82 | + $p[] = '||'; |
|
83 | + } else { |
|
84 | + $p[] = $v; |
|
85 | + } |
|
86 | + break; |
|
87 | + case 'xor': |
|
88 | + if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
89 | + $p[] = '^'; |
|
90 | + } else { |
|
91 | + $p[] = $v; |
|
92 | + } |
|
93 | + break; |
|
94 | + case 'eq': |
|
95 | + if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
96 | + $p[] = '=='; |
|
97 | + } else { |
|
98 | + $p[] = $v; |
|
99 | + } |
|
100 | + break; |
|
101 | + case 'ne': |
|
102 | + case 'neq': |
|
103 | + if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
154 | 104 | $p[] = '!='; |
105 | + } else { |
|
106 | + $p[] = $v; |
|
107 | + } |
|
108 | + break; |
|
109 | + case 'gte': |
|
110 | + case 'ge': |
|
111 | + if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
112 | + $p[] = '>='; |
|
113 | + } else { |
|
114 | + $p[] = $v; |
|
115 | + } |
|
116 | + break; |
|
117 | + case 'lte': |
|
118 | + case 'le': |
|
119 | + if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
120 | + $p[] = '<='; |
|
121 | + } else { |
|
122 | + $p[] = $v; |
|
123 | + } |
|
124 | + break; |
|
125 | + case 'gt': |
|
126 | + if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
127 | + $p[] = '>'; |
|
128 | + } else { |
|
129 | + $p[] = $v; |
|
130 | + } |
|
131 | + break; |
|
132 | + case 'lt': |
|
133 | + if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
134 | + $p[] = '<'; |
|
135 | + } else { |
|
136 | + $p[] = $v; |
|
137 | + } |
|
138 | + break; |
|
139 | + case 'mod': |
|
140 | + if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
141 | + $p[] = '%'; |
|
142 | + } else { |
|
143 | + $p[] = $v; |
|
144 | + } |
|
145 | + break; |
|
146 | + case 'not': |
|
147 | + if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) { |
|
148 | + $p[] = '!'; |
|
149 | + } else { |
|
150 | + $p[] = $v; |
|
151 | + } |
|
152 | + break; |
|
153 | + case '<>': |
|
154 | + $p[] = '!='; |
|
155 | + break; |
|
156 | + case '==': |
|
157 | + case '!=': |
|
158 | + case '>=': |
|
159 | + case '<=': |
|
160 | + case '>': |
|
161 | + case '<': |
|
162 | + case '===': |
|
163 | + case '!==': |
|
164 | + case '%': |
|
165 | + case '!': |
|
166 | + case '^': |
|
167 | + $p[] = $vmod; |
|
168 | + break; |
|
169 | + case 'is': |
|
170 | + if ($tokens[$k] !== Compiler::T_UNQUOTED_STRING) { |
|
171 | + $p[] = $v; |
|
155 | 172 | break; |
156 | - case '==': |
|
157 | - case '!=': |
|
158 | - case '>=': |
|
159 | - case '<=': |
|
160 | - case '>': |
|
161 | - case '<': |
|
162 | - case '===': |
|
163 | - case '!==': |
|
164 | - case '%': |
|
165 | - case '!': |
|
166 | - case '^': |
|
167 | - $p[] = $vmod; |
|
173 | + } |
|
174 | + if (isset($params[$k + 1]) && strtolower(trim($params[$k + 1], '"\'')) === 'not' && $tokens[$k + 1] === Compiler::T_UNQUOTED_STRING) { |
|
175 | + $negate = true; |
|
176 | + next($params); |
|
177 | + } else { |
|
178 | + $negate = false; |
|
179 | + } |
|
180 | + $ptr = 1 + (int)$negate; |
|
181 | + if ($tokens[$k + $ptr] !== Compiler::T_UNQUOTED_STRING) { |
|
168 | 182 | break; |
169 | - case 'is': |
|
170 | - if ($tokens[$k] !== Compiler::T_UNQUOTED_STRING) { |
|
171 | - $p[] = $v; |
|
172 | - break; |
|
173 | - } |
|
174 | - if (isset($params[$k + 1]) && strtolower(trim($params[$k + 1], '"\'')) === 'not' && $tokens[$k + 1] === Compiler::T_UNQUOTED_STRING) { |
|
175 | - $negate = true; |
|
176 | - next($params); |
|
177 | - } else { |
|
178 | - $negate = false; |
|
179 | - } |
|
180 | - $ptr = 1 + (int)$negate; |
|
181 | - if ($tokens[$k + $ptr] !== Compiler::T_UNQUOTED_STRING) { |
|
182 | - break; |
|
183 | - } |
|
184 | - if (!isset($params[$k + $ptr])) { |
|
185 | - $params[$k + $ptr] = ''; |
|
186 | - } else { |
|
187 | - $params[$k + $ptr] = trim($params[$k + $ptr], '"\''); |
|
188 | - } |
|
189 | - switch ($params[$k + $ptr]) { |
|
183 | + } |
|
184 | + if (!isset($params[$k + $ptr])) { |
|
185 | + $params[$k + $ptr] = ''; |
|
186 | + } else { |
|
187 | + $params[$k + $ptr] = trim($params[$k + $ptr], '"\''); |
|
188 | + } |
|
189 | + switch ($params[$k + $ptr]) { |
|
190 | 190 | |
191 | - case 'div': |
|
192 | - if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') { |
|
193 | - $p[] = ' % ' . $params[$k + $ptr + 2] . ' ' . ($negate ? '!' : '=') . '== 0'; |
|
194 | - next($params); |
|
195 | - next($params); |
|
196 | - next($params); |
|
197 | - } else { |
|
198 | - throw new CompilationException($compiler, 'If : Syntax error : syntax should be "if $a is [not] div by $b", found ' . $params[$k - 1] . ' is ' . ($negate ? 'not ' : '') . 'div ' . $params[$k + $ptr + 1] . ' ' . $params[$k + $ptr + 2]); |
|
199 | - } |
|
200 | - break; |
|
201 | - case 'even': |
|
202 | - $a = array_pop($p); |
|
203 | - if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') { |
|
204 | - $b = $params[$k + $ptr + 2]; |
|
205 | - $p[] = '(' . $a . ' / ' . $b . ') % 2 ' . ($negate ? '!' : '=') . '== 0'; |
|
206 | - next($params); |
|
207 | - next($params); |
|
208 | - } else { |
|
209 | - $p[] = $a . ' % 2 ' . ($negate ? '!' : '=') . '== 0'; |
|
210 | - } |
|
211 | - next($params); |
|
212 | - break; |
|
213 | - case 'odd': |
|
214 | - $a = array_pop($p); |
|
215 | - if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') { |
|
216 | - $b = $params[$k + $ptr + 2]; |
|
217 | - $p[] = '(' . $a . ' / ' . $b . ') % 2 ' . ($negate ? '=' : '!') . '== 0'; |
|
218 | - next($params); |
|
219 | - next($params); |
|
220 | - } else { |
|
221 | - $p[] = $a . ' % 2 ' . ($negate ? '=' : '!') . '== 0'; |
|
222 | - } |
|
223 | - next($params); |
|
224 | - break; |
|
225 | - default: |
|
226 | - throw new CompilationException($compiler, 'If : Syntax error : syntax should be "if $a is [not] (div|even|odd) [by $b]", found ' . $params[$k - 1] . ' is ' . $params[$k + $ptr + 1]); |
|
227 | - } |
|
228 | - break; |
|
191 | + case 'div': |
|
192 | + if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') { |
|
193 | + $p[] = ' % ' . $params[$k + $ptr + 2] . ' ' . ($negate ? '!' : '=') . '== 0'; |
|
194 | + next($params); |
|
195 | + next($params); |
|
196 | + next($params); |
|
197 | + } else { |
|
198 | + throw new CompilationException($compiler, 'If : Syntax error : syntax should be "if $a is [not] div by $b", found ' . $params[$k - 1] . ' is ' . ($negate ? 'not ' : '') . 'div ' . $params[$k + $ptr + 1] . ' ' . $params[$k + $ptr + 2]); |
|
199 | + } |
|
200 | + break; |
|
201 | + case 'even': |
|
202 | + $a = array_pop($p); |
|
203 | + if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') { |
|
204 | + $b = $params[$k + $ptr + 2]; |
|
205 | + $p[] = '(' . $a . ' / ' . $b . ') % 2 ' . ($negate ? '!' : '=') . '== 0'; |
|
206 | + next($params); |
|
207 | + next($params); |
|
208 | + } else { |
|
209 | + $p[] = $a . ' % 2 ' . ($negate ? '!' : '=') . '== 0'; |
|
210 | + } |
|
211 | + next($params); |
|
212 | + break; |
|
213 | + case 'odd': |
|
214 | + $a = array_pop($p); |
|
215 | + if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') { |
|
216 | + $b = $params[$k + $ptr + 2]; |
|
217 | + $p[] = '(' . $a . ' / ' . $b . ') % 2 ' . ($negate ? '=' : '!') . '== 0'; |
|
218 | + next($params); |
|
219 | + next($params); |
|
220 | + } else { |
|
221 | + $p[] = $a . ' % 2 ' . ($negate ? '=' : '!') . '== 0'; |
|
222 | + } |
|
223 | + next($params); |
|
224 | + break; |
|
229 | 225 | default: |
230 | - $p[] = $v; |
|
226 | + throw new CompilationException($compiler, 'If : Syntax error : syntax should be "if $a is [not] (div|even|odd) [by $b]", found ' . $params[$k - 1] . ' is ' . $params[$k + $ptr + 1]); |
|
227 | + } |
|
228 | + break; |
|
229 | + default: |
|
230 | + $p[] = $v; |
|
231 | 231 | } |
232 | 232 | } |
233 | 233 |
@@ -62,14 +62,14 @@ |
||
62 | 62 | |
63 | 63 | switch ($style) { |
64 | 64 | |
65 | - case 'email': |
|
66 | - $wrap = 72; |
|
67 | - $indent_first = 0; |
|
68 | - break; |
|
69 | - case 'html': |
|
70 | - $wrap_char = '<br />'; |
|
71 | - $indent_char = $indent_char == "\t" ? ' ' : ' '; |
|
72 | - break; |
|
65 | + case 'email': |
|
66 | + $wrap = 72; |
|
67 | + $indent_first = 0; |
|
68 | + break; |
|
69 | + case 'html': |
|
70 | + $wrap_char = '<br />'; |
|
71 | + $indent_char = $indent_char == "\t" ? ' ' : ' '; |
|
72 | + break; |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | $this->wrap = (int)$wrap; |
@@ -56,22 +56,22 @@ |
||
56 | 56 | $params = $compiler->getCompiledParams($params); |
57 | 57 | switch (strtolower(trim((string)$params['enabled'], '"\''))) { |
58 | 58 | |
59 | - case 'on': |
|
60 | - case 'true': |
|
61 | - case 'enabled': |
|
62 | - case 'enable': |
|
63 | - case '1': |
|
64 | - $enable = true; |
|
65 | - break; |
|
66 | - case 'off': |
|
67 | - case 'false': |
|
68 | - case 'disabled': |
|
69 | - case 'disable': |
|
70 | - case '0': |
|
71 | - $enable = false; |
|
72 | - break; |
|
73 | - default: |
|
74 | - throw new CompilationException($compiler, 'Auto_Escape : Invalid parameter (' . $params['enabled'] . '), valid parameters are "enable"/true or "disable"/false'); |
|
59 | + case 'on': |
|
60 | + case 'true': |
|
61 | + case 'enabled': |
|
62 | + case 'enable': |
|
63 | + case '1': |
|
64 | + $enable = true; |
|
65 | + break; |
|
66 | + case 'off': |
|
67 | + case 'false': |
|
68 | + case 'disabled': |
|
69 | + case 'disable': |
|
70 | + case '0': |
|
71 | + $enable = false; |
|
72 | + break; |
|
73 | + default: |
|
74 | + throw new CompilationException($compiler, 'Auto_Escape : Invalid parameter (' . $params['enabled'] . '), valid parameters are "enable"/true or "disable"/false'); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | self::$stack[] = $compiler->getAutoEscape(); |
@@ -293,7 +293,7 @@ |
||
293 | 293 | * @param Core $core the dwoo instance that requests it |
294 | 294 | * @param string $output the template output |
295 | 295 | * |
296 | - * @return mixed full path of the cached file or false upon failure |
|
296 | + * @return false|string full path of the cached file or false upon failure |
|
297 | 297 | */ |
298 | 298 | public function cache(Core $core, $output) |
299 | 299 | { |