Completed
Push — master ( bf2930...494091 )
by David
07:08 queued 03:26
created
lib/Dwoo/Plugins/Functions/PluginDefaultCompile.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,5 +29,5 @@
 block discarded – undo
29 29
  */
30 30
 function PluginDefaultCompile(Compiler $compiler, $value, $default = '')
31 31
 {
32
-    return '(($tmp = ' . $value . ')===null||$tmp===\'\' ? ' . $default . ' : $tmp)';
32
+    return '(($tmp = '.$value.')===null||$tmp===\'\' ? '.$default.' : $tmp)';
33 33
 }
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Functions/PluginAssignCompile.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,5 +29,5 @@
 block discarded – undo
29 29
  */
30 30
 function PluginAssignCompile(Compiler $compiler, $value, $var)
31 31
 {
32
-    return '$this->assignInScope(' . $value . ', ' . $var . ')';
32
+    return '$this->assignInScope('.$value.', '.$var.')';
33 33
 }
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Functions/PluginUpperCompile.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,5 +28,5 @@
 block discarded – undo
28 28
  */
29 29
 function PluginUpperCompile(Compiler $compiler, $value)
30 30
 {
31
-    return 'mb_strtoupper((string) ' . $value . ', $this->charset)';
31
+    return 'mb_strtoupper((string) '.$value.', $this->charset)';
32 32
 }
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Functions/PluginDump.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
         $out .= $this->export($var, $scope);
64 64
 
65
-        return $out . '</div></div>';
65
+        return $out.'</div></div>';
66 66
     }
67 67
 
68 68
     protected function export($var, $scope)
@@ -70,16 +70,16 @@  discard block
 block discarded – undo
70 70
         $out = '';
71 71
         foreach ($var as $i => $v) {
72 72
             if (is_array($v) || (is_object($v) && $v instanceof Iterator)) {
73
-                $out .= $i . ' (' . (is_array($v) ? 'array' : 'object: ' . get_class($v)) . ')';
73
+                $out .= $i.' ('.(is_array($v) ? 'array' : 'object: '.get_class($v)).')';
74 74
                 if ($v === $scope) {
75
-                    $out .= ' (current scope):<div style="background:#ccc;padding-left:20px;">' . $this->export($v, $scope) . '</div>';
75
+                    $out .= ' (current scope):<div style="background:#ccc;padding-left:20px;">'.$this->export($v, $scope).'</div>';
76 76
                 } else {
77
-                    $out .= ':<div style="padding-left:20px;">' . $this->export($v, $scope) . '</div>';
77
+                    $out .= ':<div style="padding-left:20px;">'.$this->export($v, $scope).'</div>';
78 78
                 }
79 79
             } elseif (is_object($v)) {
80
-                $out .= $this->exportObj($i . ' (object: ' . get_class($v) . '):', $v);
80
+                $out .= $this->exportObj($i.' (object: '.get_class($v).'):', $v);
81 81
             } else {
82
-                $out .= $this->exportVar($i . ' = ', $v);
82
+                $out .= $this->exportVar($i.' = ', $v);
83 83
             }
84 84
         }
85 85
 
@@ -89,27 +89,27 @@  discard block
 block discarded – undo
89 89
     protected function exportVar($i, $v)
90 90
     {
91 91
         if (is_string($v) || is_bool($v) || is_numeric($v)) {
92
-            return $i . htmlentities(var_export($v, true)) . '<br />';
92
+            return $i.htmlentities(var_export($v, true)).'<br />';
93 93
         } elseif (is_null($v)) {
94
-            return $i . 'null<br />';
94
+            return $i.'null<br />';
95 95
         } elseif (is_resource($v)) {
96
-            return $i . 'resource(' . get_resource_type($v) . ')<br />';
96
+            return $i.'resource('.get_resource_type($v).')<br />';
97 97
         } else {
98
-            return $i . htmlentities(var_export($v, true)) . '<br />';
98
+            return $i.htmlentities(var_export($v, true)).'<br />';
99 99
         }
100 100
     }
101 101
 
102 102
     protected function exportObj($i, $obj)
103 103
     {
104 104
         if (array_search($obj, $this->outputObjects, true) !== false) {
105
-            return $i . ' [recursion, skipped]<br />';
105
+            return $i.' [recursion, skipped]<br />';
106 106
         }
107 107
 
108 108
         $this->outputObjects[] = $obj;
109 109
 
110
-        $list = (array)$obj;
110
+        $list = (array) $obj;
111 111
 
112
-        $protectedLength = strlen(get_class($obj)) + 2;
112
+        $protectedLength = strlen(get_class($obj))+2;
113 113
 
114 114
         $out = array();
115 115
 
@@ -127,10 +127,10 @@  discard block
 block discarded – undo
127 127
 
128 128
                 $params = array();
129 129
                 foreach ($method->getParameters() as $param) {
130
-                    $params[] = ($param->isPassedByReference() ? '&' : '') . '$' . $param->getName() . ($param->isOptional() ? ' = ' . var_export($param->getDefaultValue(), true) : '');
130
+                    $params[] = ($param->isPassedByReference() ? '&' : '').'$'.$param->getName().($param->isOptional() ? ' = '.var_export($param->getDefaultValue(), true) : '');
131 131
                 }
132 132
 
133
-                $out['method'] .= '(method) ' . $method->getName() . '(' . implode(', ', $params) . ')<br />';
133
+                $out['method'] .= '(method) '.$method->getName().'('.implode(', ', $params).')<br />';
134 134
             }
135 135
         }
136 136
 
@@ -149,19 +149,19 @@  discard block
 block discarded – undo
149 149
                 $out[$key] = '';
150 150
             }
151 151
 
152
-            $out[$key] .= '(' . $key . ') ';
152
+            $out[$key] .= '('.$key.') ';
153 153
 
154 154
             if (is_array($attributeValue)) {
155
-                $out[$key] .= $attributeName . ' (array):<br />
156
-							<div style="padding-left:20px;">' . $this->export($attributeValue, false) . '</div>';
155
+                $out[$key] .= $attributeName.' (array):<br />
156
+							<div style="padding-left:20px;">' . $this->export($attributeValue, false).'</div>';
157 157
             } elseif (is_object($attributeValue)) {
158
-                $out[$key] .= $this->exportObj($attributeName . ' (object: ' . get_class($attributeValue) . '):', $attributeValue);
158
+                $out[$key] .= $this->exportObj($attributeName.' (object: '.get_class($attributeValue).'):', $attributeValue);
159 159
             } else {
160
-                $out[$key] .= $this->exportVar($attributeName . ' = ', $attributeValue);
160
+                $out[$key] .= $this->exportVar($attributeName.' = ', $attributeValue);
161 161
             }
162 162
         }
163 163
 
164
-        $return = $i . '<br /><div style="padding-left:20px;">';
164
+        $return = $i.'<br /><div style="padding-left:20px;">';
165 165
 
166 166
         if (!empty($out['method'])) {
167 167
             $return .= $out['method'];
@@ -179,6 +179,6 @@  discard block
 block discarded – undo
179 179
             $return .= $out['private'];
180 180
         }
181 181
 
182
-        return $return . '</div>';
182
+        return $return.'</div>';
183 183
     }
184 184
 }
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Functions/PluginCounter.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -51,35 +51,35 @@
 block discarded – undo
51 51
         // init counter
52 52
         if (!isset($this->counters[$name])) {
53 53
             $this->counters[$name] = array(
54
-                'count'     => $start === null ? 1 : (int)$start,
55
-                'skip'      => $skip === null ? 1 : (int)$skip,
56
-                'print'     => $print === null ? true : (bool)$print,
57
-                'assign'    => $assign === null ? null : (string)$assign,
58
-                'direction' => strtolower($direction) === 'down' ? - 1 : 1,
54
+                'count'     => $start === null ? 1 : (int) $start,
55
+                'skip'      => $skip === null ? 1 : (int) $skip,
56
+                'print'     => $print === null ? true : (bool) $print,
57
+                'assign'    => $assign === null ? null : (string) $assign,
58
+                'direction' => strtolower($direction) === 'down' ? -1 : 1,
59 59
             );
60 60
         } // increment
61 61
         else {
62 62
             // override setting if present
63 63
             if ($skip !== null) {
64
-                $this->counters[$name]['skip'] = (int)$skip;
64
+                $this->counters[$name]['skip'] = (int) $skip;
65 65
             }
66 66
 
67 67
             if ($direction !== null) {
68
-                $this->counters[$name]['direction'] = strtolower($direction) === 'down' ? - 1 : 1;
68
+                $this->counters[$name]['direction'] = strtolower($direction) === 'down' ? -1 : 1;
69 69
             }
70 70
 
71 71
             if ($print !== null) {
72
-                $this->counters[$name]['print'] = (bool)$print;
72
+                $this->counters[$name]['print'] = (bool) $print;
73 73
             }
74 74
 
75 75
             if ($assign !== null) {
76
-                $this->counters[$name]['assign'] = (string)$assign;
76
+                $this->counters[$name]['assign'] = (string) $assign;
77 77
             }
78 78
 
79 79
             if ($start !== null) {
80
-                $this->counters[$name]['count'] = (int)$start;
80
+                $this->counters[$name]['count'] = (int) $start;
81 81
             } else {
82
-                $this->counters[$name]['count'] += ($this->counters[$name]['skip'] * $this->counters[$name]['direction']);
82
+                $this->counters[$name]['count'] += ($this->counters[$name]['skip']*$this->counters[$name]['direction']);
83 83
             }
84 84
         }
85 85
 
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Functions/PluginRegexReplace.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
  */
31 31
 function PluginRegexReplace(Core $dwoo, $value, $search, $replace)
32 32
 {
33
-    $search = (array)$search;
33
+    $search = (array) $search;
34 34
     $cnt    = count($search);
35 35
 
36 36
     for ($i = 0; $i < $cnt; ++ $i) {
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
         }
41 41
 
42 42
         if (preg_match('#[a-z\s]+$#is', $search[$i], $m) && (strpos($m[0], 'e') !== false)) {
43
-            $search[$i] = substr($search[$i], 0, - strlen($m[0])) . str_replace(array(
43
+            $search[$i] = substr($search[$i], 0, - strlen($m[0])).str_replace(array(
44 44
                     'e',
45 45
                     ' '
46 46
                 ), '', $m[0]);
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Functions/PluginDateFormat.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
             '%t',
58 58
             '%T'
59 59
         );
60
-        $_win_to   = array(
60
+        $_win_to = array(
61 61
             '%m/%d/%y',
62 62
             '%b',
63 63
             "\n",
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Helpers/PluginArrayCompile.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -41,10 +41,10 @@
 block discarded – undo
41 41
     $out = array();
42 42
     foreach ($rest as $key => $value) {
43 43
         if (!is_numeric($key) && !strstr($key, '$this->scope')) {
44
-            $key = "'" . $key . "'";
44
+            $key = "'".$key."'";
45 45
         }
46
-        $out[] = $key . '=>' . $value;
46
+        $out[] = $key.'=>'.$value;
47 47
     }
48 48
 
49
-    return 'array(' . implode(', ', $out) . ')';
49
+    return 'array('.implode(', ', $out).')';
50 50
 }
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Blocks/PluginIf.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
         reset($params);
64 64
         while (list($k, $v) = each($params)) {
65
-            $v = (string)$v;
65
+            $v = (string) $v;
66 66
             if (substr($v, 0, 1) === '"' || substr($v, 0, 1) === '\'') {
67 67
                 $vmod = strtolower(substr($v, 1, - 1));
68 68
             } else {
@@ -171,59 +171,59 @@  discard block
 block discarded – undo
171 171
                         $p[] = $v;
172 172
                         break;
173 173
                     }
174
-                    if (isset($params[$k + 1]) && strtolower(trim($params[$k + 1], '"\'')) === 'not' && $tokens[$k + 1] === Compiler::T_UNQUOTED_STRING) {
174
+                    if (isset($params[$k+1]) && strtolower(trim($params[$k+1], '"\'')) === 'not' && $tokens[$k+1] === Compiler::T_UNQUOTED_STRING) {
175 175
                         $negate = true;
176 176
                         next($params);
177 177
                     } else {
178 178
                         $negate = false;
179 179
                     }
180
-                    $ptr = 1 + (int)$negate;
181
-                    if ($tokens[$k + $ptr] !== Compiler::T_UNQUOTED_STRING) {
180
+                    $ptr = 1+(int) $negate;
181
+                    if ($tokens[$k+$ptr] !== Compiler::T_UNQUOTED_STRING) {
182 182
                         break;
183 183
                     }
184
-                    if (!isset($params[$k + $ptr])) {
185
-                        $params[$k + $ptr] = '';
184
+                    if (!isset($params[$k+$ptr])) {
185
+                        $params[$k+$ptr] = '';
186 186
                     } else {
187
-                        $params[$k + $ptr] = trim($params[$k + $ptr], '"\'');
187
+                        $params[$k+$ptr] = trim($params[$k+$ptr], '"\'');
188 188
                     }
189
-                    switch ($params[$k + $ptr]) {
189
+                    switch ($params[$k+$ptr]) {
190 190
 
191 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';
192
+                            if (isset($params[$k+$ptr+1]) && strtolower(trim($params[$k+$ptr+1], '"\'')) === 'by') {
193
+                                $p[] = ' % '.$params[$k+$ptr+2].' '.($negate ? '!' : '=').'== 0';
194 194
                                 next($params);
195 195
                                 next($params);
196 196
                                 next($params);
197 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]);
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 199
                             }
200 200
                             break;
201 201
                         case 'even':
202 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';
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 206
                                 next($params);
207 207
                                 next($params);
208 208
                             } else {
209
-                                $p[] = $a . ' % 2 ' . ($negate ? '!' : '=') . '== 0';
209
+                                $p[] = $a.' % 2 '.($negate ? '!' : '=').'== 0';
210 210
                             }
211 211
                             next($params);
212 212
                             break;
213 213
                         case 'odd':
214 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';
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 218
                                 next($params);
219 219
                                 next($params);
220 220
                             } else {
221
-                                $p[] = $a . ' % 2 ' . ($negate ? '=' : '!') . '== 0';
221
+                                $p[] = $a.' % 2 '.($negate ? '=' : '!').'== 0';
222 222
                             }
223 223
                             next($params);
224 224
                             break;
225 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]);
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 227
                     }
228 228
                     break;
229 229
                 default:
@@ -261,14 +261,14 @@  discard block
 block discarded – undo
261 261
     {
262 262
         $tokens = $compiler->getParamTokens($params);
263 263
         $params = $compiler->getCompiledParams($params);
264
-        $pre    = Compiler::PHP_OPEN . 'if (' . implode(' ', self::replaceKeywords($params['*'], $tokens['*'], $compiler)) . ") {\n" . Compiler::PHP_CLOSE;
264
+        $pre    = Compiler::PHP_OPEN.'if ('.implode(' ', self::replaceKeywords($params['*'], $tokens['*'], $compiler)).") {\n".Compiler::PHP_CLOSE;
265 265
 
266
-        $post = Compiler::PHP_OPEN . "\n}" . Compiler::PHP_CLOSE;
266
+        $post = Compiler::PHP_OPEN."\n}".Compiler::PHP_CLOSE;
267 267
 
268 268
         if (isset($params['hasElse'])) {
269 269
             $post .= $params['hasElse'];
270 270
         }
271 271
 
272
-        return $pre . $content . $post;
272
+        return $pre.$content.$post;
273 273
     }
274 274
 }
Please login to merge, or discard this patch.