Completed
Branch master (b65d76)
by David
04:29
created
lib/Dwoo/Plugins/Blocks/PluginForeach.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -112,15 +112,15 @@  discard block
 block discarded – undo
112 112
         }
113 113
 
114 114
         // evaluates which global variables have to be computed
115
-        $varName       = '$dwoo.foreach.' . trim($name, '"\'') . '.';
116
-        $shortVarName  = '$.foreach.' . trim($name, '"\'') . '.';
115
+        $varName       = '$dwoo.foreach.'.trim($name, '"\'').'.';
116
+        $shortVarName  = '$.foreach.'.trim($name, '"\'').'.';
117 117
         $usesAny       = strpos($tpl, $varName) !== false || strpos($tpl, $shortVarName) !== false;
118
-        $usesFirst     = strpos($tpl, $varName . 'first') !== false || strpos($tpl, $shortVarName . 'first') !== false;
119
-        $usesLast      = strpos($tpl, $varName . 'last') !== false || strpos($tpl, $shortVarName . 'last') !== false;
120
-        $usesIndex     = $usesFirst || strpos($tpl, $varName . 'index') !== false || strpos($tpl, $shortVarName . 'index') !== false;
121
-        $usesIteration = $usesLast || strpos($tpl, $varName . 'iteration') !== false || strpos($tpl, $shortVarName . 'iteration') !== false;
122
-        $usesShow      = strpos($tpl, $varName . 'show') !== false || strpos($tpl, $shortVarName . 'show') !== false;
123
-        $usesTotal     = $usesLast || strpos($tpl, $varName . 'total') !== false || strpos($tpl, $shortVarName . 'total') !== false;
118
+        $usesFirst     = strpos($tpl, $varName.'first') !== false || strpos($tpl, $shortVarName.'first') !== false;
119
+        $usesLast      = strpos($tpl, $varName.'last') !== false || strpos($tpl, $shortVarName.'last') !== false;
120
+        $usesIndex     = $usesFirst || strpos($tpl, $varName.'index') !== false || strpos($tpl, $shortVarName.'index') !== false;
121
+        $usesIteration = $usesLast || strpos($tpl, $varName.'iteration') !== false || strpos($tpl, $shortVarName.'iteration') !== false;
122
+        $usesShow      = strpos($tpl, $varName.'show') !== false || strpos($tpl, $shortVarName.'show') !== false;
123
+        $usesTotal     = $usesLast || strpos($tpl, $varName.'total') !== false || strpos($tpl, $shortVarName.'total') !== false;
124 124
 
125 125
         if (strpos($name, '$this->scope[') !== false) {
126 126
             $usesAny = $usesFirst = $usesLast = $usesIndex = $usesIteration = $usesShow = $usesTotal = true;
@@ -136,66 +136,66 @@  discard block
 block discarded – undo
136 136
         }
137 137
 
138 138
         // gets foreach id
139
-        $cnt = self::$cnt ++;
139
+        $cnt = self::$cnt++;
140 140
 
141 141
         // build pre content output
142
-        $pre = Compiler::PHP_OPEN . "\n" . '$_fh' . $cnt . '_data = ' . $src . ';';
142
+        $pre = Compiler::PHP_OPEN."\n".'$_fh'.$cnt.'_data = '.$src.';';
143 143
         // adds foreach properties
144 144
         if ($usesAny) {
145
-            $pre .= "\n" . '$this->globals["foreach"][' . $name . '] = array' . "\n(";
145
+            $pre .= "\n".'$this->globals["foreach"]['.$name.'] = array'."\n(";
146 146
             if ($usesIndex) {
147
-                $pre .= "\n\t" . '"index"		=> 0,';
147
+                $pre .= "\n\t".'"index"		=> 0,';
148 148
             }
149 149
             if ($usesIteration) {
150
-                $pre .= "\n\t" . '"iteration"		=> 1,';
150
+                $pre .= "\n\t".'"iteration"		=> 1,';
151 151
             }
152 152
             if ($usesFirst) {
153
-                $pre .= "\n\t" . '"first"		=> null,';
153
+                $pre .= "\n\t".'"first"		=> null,';
154 154
             }
155 155
             if ($usesLast) {
156
-                $pre .= "\n\t" . '"last"		=> null,';
156
+                $pre .= "\n\t".'"last"		=> null,';
157 157
             }
158 158
             if ($usesShow) {
159
-                $pre .= "\n\t" . '"show"		=> $this->isArray($_fh' . $cnt . '_data, true),';
159
+                $pre .= "\n\t".'"show"		=> $this->isArray($_fh'.$cnt.'_data, true),';
160 160
             }
161 161
             if ($usesTotal) {
162
-                $pre .= "\n\t" . '"total"		=> $this->count($_fh' . $cnt . '_data),';
162
+                $pre .= "\n\t".'"total"		=> $this->count($_fh'.$cnt.'_data),';
163 163
             }
164
-            $pre .= "\n);\n" . '$_fh' . $cnt . '_glob =& $this->globals["foreach"][' . $name . '];';
164
+            $pre .= "\n);\n".'$_fh'.$cnt.'_glob =& $this->globals["foreach"]['.$name.'];';
165 165
         }
166 166
         // checks if foreach must be looped
167
-        $pre .= "\n" . 'if ($this->isTraversable($_fh' . $cnt . '_data' . (isset($params['hasElse']) ? ', true' : '') . ') == true)' . "\n{";
167
+        $pre .= "\n".'if ($this->isTraversable($_fh'.$cnt.'_data'.(isset($params['hasElse']) ? ', true' : '').') == true)'."\n{";
168 168
         // iterates over keys
169
-        $pre .= "\n\t" . 'foreach ($_fh' . $cnt . '_data as ' . (isset($key) ? '$this->scope[' . $key . ']=>' : '') . '$this->scope[' . $val . '])' . "\n\t{";
169
+        $pre .= "\n\t".'foreach ($_fh'.$cnt.'_data as '.(isset($key) ? '$this->scope['.$key.']=>' : '').'$this->scope['.$val.'])'."\n\t{";
170 170
         // updates properties
171 171
         if ($usesFirst) {
172
-            $pre .= "\n\t\t" . '$_fh' . $cnt . '_glob["first"] = (string) ($_fh' . $cnt . '_glob["index"] === 0);';
172
+            $pre .= "\n\t\t".'$_fh'.$cnt.'_glob["first"] = (string) ($_fh'.$cnt.'_glob["index"] === 0);';
173 173
         }
174 174
         if ($usesLast) {
175
-            $pre .= "\n\t\t" . '$_fh' . $cnt . '_glob["last"] = (string) ($_fh' . $cnt . '_glob["iteration"] === $_fh' . $cnt . '_glob["total"]);';
175
+            $pre .= "\n\t\t".'$_fh'.$cnt.'_glob["last"] = (string) ($_fh'.$cnt.'_glob["iteration"] === $_fh'.$cnt.'_glob["total"]);';
176 176
         }
177
-        $pre .= "\n/* -- foreach start output */\n" . Compiler::PHP_CLOSE;
177
+        $pre .= "\n/* -- foreach start output */\n".Compiler::PHP_CLOSE;
178 178
 
179 179
         // build post content output
180
-        $post = Compiler::PHP_OPEN . "\n";
180
+        $post = Compiler::PHP_OPEN."\n";
181 181
 
182 182
         if (isset($implode)) {
183
-            $post .= '/* -- implode */' . "\n" . 'if (!$_fh' . $cnt . '_glob["last"]) {' . "\n\t" . 'echo ' . $implode . ";\n}\n";
183
+            $post .= '/* -- implode */'."\n".'if (!$_fh'.$cnt.'_glob["last"]) {'."\n\t".'echo '.$implode.";\n}\n";
184 184
         }
185 185
         $post .= '/* -- foreach end output */';
186 186
         // update properties
187 187
         if ($usesIndex) {
188
-            $post .= "\n\t\t" . '$_fh' . $cnt . '_glob["index"]+=1;';
188
+            $post .= "\n\t\t".'$_fh'.$cnt.'_glob["index"]+=1;';
189 189
         }
190 190
         if ($usesIteration) {
191
-            $post .= "\n\t\t" . '$_fh' . $cnt . '_glob["iteration"]+=1;';
191
+            $post .= "\n\t\t".'$_fh'.$cnt.'_glob["iteration"]+=1;';
192 192
         }
193 193
         // end loop
194
-        $post .= "\n\t}\n}" . Compiler::PHP_CLOSE;
194
+        $post .= "\n\t}\n}".Compiler::PHP_CLOSE;
195 195
         if (isset($params['hasElse'])) {
196 196
             $post .= $params['hasElse'];
197 197
         }
198 198
 
199
-        return $pre . $content . $post;
199
+        return $pre.$content.$post;
200 200
     }
201 201
 }
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Blocks/PluginTemplate.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -83,25 +83,25 @@
 block discarded – undo
83 83
     public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
84 84
     {
85 85
         $paramstr = 'Dwoo\Core $dwoo';
86
-        $init     = 'static $_callCnt = 0;' . "\n" . '$dwoo->scope[\' ' . $params['uuid'] . '\'.$_callCnt] = array();' . "\n" . '$_scope = $dwoo->setScope(array(\' ' . $params['uuid'] . '\'.($_callCnt++)));' . "\n";
86
+        $init     = 'static $_callCnt = 0;'."\n".'$dwoo->scope[\' '.$params['uuid'].'\'.$_callCnt] = array();'."\n".'$_scope = $dwoo->setScope(array(\' '.$params['uuid'].'\'.($_callCnt++)));'."\n";
87 87
         $cleanup  = '/* -- template end output */ $dwoo->setScope($_scope, true);';
88 88
         foreach ($params['*'] as $param => $defValue) {
89 89
             if ($defValue === null) {
90
-                $paramstr .= ', $' . $param;
90
+                $paramstr .= ', $'.$param;
91 91
             } else {
92
-                $paramstr .= ', $' . $param . ' = ' . $defValue;
92
+                $paramstr .= ', $'.$param.' = '.$defValue;
93 93
             }
94
-            $init .= '$dwoo->scope[\'' . $param . '\'] = $' . $param . ";\n";
94
+            $init .= '$dwoo->scope[\''.$param.'\'] = $'.$param.";\n";
95 95
         }
96 96
         $init .= '/* -- template start output */';
97 97
 
98
-        $funcName = 'Plugin' . Core::toCamelCase($params['name']) . Core::toCamelCase($params['uuid']);
98
+        $funcName = 'Plugin'.Core::toCamelCase($params['name']).Core::toCamelCase($params['uuid']);
99 99
 
100 100
         $search      = array('$this->charset', '$this->', '$this,',);
101 101
         $replacement = array('$dwoo->getCharset()', '$dwoo->', '$dwoo,',);
102 102
         $content     = str_replace($search, $replacement, $content);
103 103
 
104
-        $body = 'if (!function_exists(\'' . $funcName . "')) {\nfunction " . $funcName . '(' . $paramstr . ') {' . "\n$init" . Compiler::PHP_CLOSE . $prepend . $content . $append . Compiler::PHP_OPEN . $cleanup . "\n}\n}";
104
+        $body = 'if (!function_exists(\''.$funcName."')) {\nfunction ".$funcName.'('.$paramstr.') {'."\n$init".Compiler::PHP_CLOSE.$prepend.$content.$append.Compiler::PHP_OPEN.$cleanup."\n}\n}";
105 105
         $compiler->addTemplatePlugin($params['name'], $params['*'], $params['uuid'], $body);
106 106
     }
107 107
 
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Blocks/PluginWith.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -86,14 +86,14 @@
 block discarded – undo
86 86
 
87 87
         $compiler->setScope($rparams['var']);
88 88
 
89
-        $pre = Compiler::PHP_OPEN . 'if (' . $cparams['var'] . ')' . "\n{\n" . '$_with' . (self::$cnt) . ' = $this->setScope("' . $rparams['var'] . '");' . "\n/* -- start with output */\n" . Compiler::PHP_CLOSE;
89
+        $pre = Compiler::PHP_OPEN.'if ('.$cparams['var'].')'."\n{\n".'$_with'.(self::$cnt).' = $this->setScope("'.$rparams['var'].'");'."\n/* -- start with output */\n".Compiler::PHP_CLOSE;
90 90
 
91
-        $post = Compiler::PHP_OPEN . "\n/* -- end with output */\n" . '$this->setScope($_with' . (self::$cnt ++) . ', true);' . "\n}\n" . Compiler::PHP_CLOSE;
91
+        $post = Compiler::PHP_OPEN."\n/* -- end with output */\n".'$this->setScope($_with'.(self::$cnt++).', true);'."\n}\n".Compiler::PHP_CLOSE;
92 92
 
93 93
         if (isset($params['hasElse'])) {
94 94
             $post .= $params['hasElse'];
95 95
         }
96 96
 
97
-        return $pre . $content . $post;
97
+        return $pre.$content.$post;
98 98
     }
99 99
 }
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Blocks/PluginA.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -60,9 +60,9 @@  discard block
 block discarded – undo
60 60
     {
61 61
         $p = $compiler->getCompiledParams($params);
62 62
 
63
-        $out = Compiler::PHP_OPEN . 'echo \'<a ' . self::paramsToAttributes($p, "'", $compiler);
63
+        $out = Compiler::PHP_OPEN.'echo \'<a '.self::paramsToAttributes($p, "'", $compiler);
64 64
 
65
-        return $out . '>\';' . Compiler::PHP_CLOSE;
65
+        return $out.'>\';'.Compiler::PHP_CLOSE;
66 66
     }
67 67
 
68 68
     /**
@@ -82,14 +82,14 @@  discard block
 block discarded – undo
82 82
         if ($content == '') {
83 83
             // merge </a> into the href if href is a string
84 84
             if (substr($p['href'], - 1) === '"' || substr($p['href'], - 1) === '\'') {
85
-                return Compiler::PHP_OPEN . 'echo ' . substr($p['href'], 0, - 1) . '</a>' . substr($p['href'], - 1) . ';' . Compiler::PHP_CLOSE;
85
+                return Compiler::PHP_OPEN.'echo '.substr($p['href'], 0, - 1).'</a>'.substr($p['href'], - 1).';'.Compiler::PHP_CLOSE;
86 86
             }
87 87
 
88 88
             // otherwise append
89
-            return Compiler::PHP_OPEN . 'echo ' . $p['href'] . '.\'</a>\';' . Compiler::PHP_CLOSE;
89
+            return Compiler::PHP_OPEN.'echo '.$p['href'].'.\'</a>\';'.Compiler::PHP_CLOSE;
90 90
         }
91 91
 
92 92
         // return content
93
-        return $content . '</a>';
93
+        return $content.'</a>';
94 94
     }
95 95
 }
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Blocks/PluginForelse.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@
 block discarded – undo
66 66
         }
67 67
 
68 68
         $block                      = &$compiler->getCurrentBlock();
69
-        $block['params']['hasElse'] = Compiler::PHP_OPEN . "else {\n" . Compiler::PHP_CLOSE . $content . Compiler::PHP_OPEN . "\n}" . Compiler::PHP_CLOSE;
69
+        $block['params']['hasElse'] = Compiler::PHP_OPEN."else {\n".Compiler::PHP_CLOSE.$content.Compiler::PHP_OPEN."\n}".Compiler::PHP_CLOSE;
70 70
 
71 71
         return '';
72 72
     }
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Blocks/PluginLoop.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -95,76 +95,76 @@
 block discarded – undo
95 95
         $name = $params['name'];
96 96
 
97 97
         // evaluates which global variables have to be computed
98
-        $varName       = '$dwoo.loop.' . trim($name, '"\'') . '.';
99
-        $shortVarName  = '$.loop.' . trim($name, '"\'') . '.';
98
+        $varName       = '$dwoo.loop.'.trim($name, '"\'').'.';
99
+        $shortVarName  = '$.loop.'.trim($name, '"\'').'.';
100 100
         $usesAny       = strpos($tpl, $varName) !== false || strpos($tpl, $shortVarName) !== false;
101
-        $usesFirst     = strpos($tpl, $varName . 'first') !== false || strpos($tpl, $shortVarName . 'first') !== false;
102
-        $usesLast      = strpos($tpl, $varName . 'last') !== false || strpos($tpl, $shortVarName . 'last') !== false;
103
-        $usesIndex     = $usesFirst || strpos($tpl, $varName . 'index') !== false || strpos($tpl, $shortVarName . 'index') !== false;
104
-        $usesIteration = $usesLast || strpos($tpl, $varName . 'iteration') !== false || strpos($tpl, $shortVarName . 'iteration') !== false;
105
-        $usesShow      = strpos($tpl, $varName . 'show') !== false || strpos($tpl, $shortVarName . 'show') !== false;
106
-        $usesTotal     = $usesLast || strpos($tpl, $varName . 'total') !== false || strpos($tpl, $shortVarName . 'total') !== false;
101
+        $usesFirst     = strpos($tpl, $varName.'first') !== false || strpos($tpl, $shortVarName.'first') !== false;
102
+        $usesLast      = strpos($tpl, $varName.'last') !== false || strpos($tpl, $shortVarName.'last') !== false;
103
+        $usesIndex     = $usesFirst || strpos($tpl, $varName.'index') !== false || strpos($tpl, $shortVarName.'index') !== false;
104
+        $usesIteration = $usesLast || strpos($tpl, $varName.'iteration') !== false || strpos($tpl, $shortVarName.'iteration') !== false;
105
+        $usesShow      = strpos($tpl, $varName.'show') !== false || strpos($tpl, $shortVarName.'show') !== false;
106
+        $usesTotal     = $usesLast || strpos($tpl, $varName.'total') !== false || strpos($tpl, $shortVarName.'total') !== false;
107 107
 
108 108
         if (strpos($name, '$this->scope[') !== false) {
109 109
             $usesAny = $usesFirst = $usesLast = $usesIndex = $usesIteration = $usesShow = $usesTotal = true;
110 110
         }
111 111
 
112 112
         // gets foreach id
113
-        $cnt = self::$cnt ++;
113
+        $cnt = self::$cnt++;
114 114
 
115 115
         // builds pre processing output
116
-        $pre = Compiler::PHP_OPEN . "\n" . '$_loop' . $cnt . '_data = ' . $src . ';';
116
+        $pre = Compiler::PHP_OPEN."\n".'$_loop'.$cnt.'_data = '.$src.';';
117 117
         // adds foreach properties
118 118
         if ($usesAny) {
119
-            $pre .= "\n" . '$this->globals["loop"][' . $name . '] = array' . "\n(";
119
+            $pre .= "\n".'$this->globals["loop"]['.$name.'] = array'."\n(";
120 120
             if ($usesIndex) {
121
-                $pre .= "\n\t" . '"index"		=> 0,';
121
+                $pre .= "\n\t".'"index"		=> 0,';
122 122
             }
123 123
             if ($usesIteration) {
124
-                $pre .= "\n\t" . '"iteration"		=> 1,';
124
+                $pre .= "\n\t".'"iteration"		=> 1,';
125 125
             }
126 126
             if ($usesFirst) {
127
-                $pre .= "\n\t" . '"first"		=> null,';
127
+                $pre .= "\n\t".'"first"		=> null,';
128 128
             }
129 129
             if ($usesLast) {
130
-                $pre .= "\n\t" . '"last"		=> null,';
130
+                $pre .= "\n\t".'"last"		=> null,';
131 131
             }
132 132
             if ($usesShow) {
133
-                $pre .= "\n\t" . '"show"		=> $this->isTraversable($_loop' . $cnt . '_data, true),';
133
+                $pre .= "\n\t".'"show"		=> $this->isTraversable($_loop'.$cnt.'_data, true),';
134 134
             }
135 135
             if ($usesTotal) {
136
-                $pre .= "\n\t" . '"total"		=> $this->count($_loop' . $cnt . '_data),';
136
+                $pre .= "\n\t".'"total"		=> $this->count($_loop'.$cnt.'_data),';
137 137
             }
138
-            $pre .= "\n);\n" . '$_loop' . $cnt . '_glob =& $this->globals["loop"][' . $name . '];';
138
+            $pre .= "\n);\n".'$_loop'.$cnt.'_glob =& $this->globals["loop"]['.$name.'];';
139 139
         }
140 140
         // checks if the loop must be looped
141
-        $pre .= "\n" . 'if ($this->isTraversable($_loop' . $cnt . '_data' . (isset($params['hasElse']) ? ', true' : '') . ') == true)' . "\n{";
141
+        $pre .= "\n".'if ($this->isTraversable($_loop'.$cnt.'_data'.(isset($params['hasElse']) ? ', true' : '').') == true)'."\n{";
142 142
         // iterates over keys
143
-        $pre .= "\n\t" . 'foreach ($_loop' . $cnt . '_data as $tmp_key => $this->scope["-loop-"])' . "\n\t{";
143
+        $pre .= "\n\t".'foreach ($_loop'.$cnt.'_data as $tmp_key => $this->scope["-loop-"])'."\n\t{";
144 144
         // updates properties
145 145
         if ($usesFirst) {
146
-            $pre .= "\n\t\t" . '$_loop' . $cnt . '_glob["first"] = (string) ($_loop' . $cnt . '_glob["index"] === 0);';
146
+            $pre .= "\n\t\t".'$_loop'.$cnt.'_glob["first"] = (string) ($_loop'.$cnt.'_glob["index"] === 0);';
147 147
         }
148 148
         if ($usesLast) {
149
-            $pre .= "\n\t\t" . '$_loop' . $cnt . '_glob["last"] = (string) ($_loop' . $cnt . '_glob["iteration"] === $_loop' . $cnt . '_glob["total"]);';
149
+            $pre .= "\n\t\t".'$_loop'.$cnt.'_glob["last"] = (string) ($_loop'.$cnt.'_glob["iteration"] === $_loop'.$cnt.'_glob["total"]);';
150 150
         }
151
-        $pre .= "\n\t\t" . '$_loop' . $cnt . '_scope = $this->setScope(array("-loop-"));' . "\n/* -- loop start output */\n" . Compiler::PHP_CLOSE;
151
+        $pre .= "\n\t\t".'$_loop'.$cnt.'_scope = $this->setScope(array("-loop-"));'."\n/* -- loop start output */\n".Compiler::PHP_CLOSE;
152 152
 
153 153
         // build post processing output and cache it
154
-        $post = Compiler::PHP_OPEN . "\n" . '/* -- loop end output */' . "\n\t\t" . '$this->setScope($_loop' . $cnt . '_scope, true);';
154
+        $post = Compiler::PHP_OPEN."\n".'/* -- loop end output */'."\n\t\t".'$this->setScope($_loop'.$cnt.'_scope, true);';
155 155
         // update properties
156 156
         if ($usesIndex) {
157
-            $post .= "\n\t\t" . '$_loop' . $cnt . '_glob["index"]+=1;';
157
+            $post .= "\n\t\t".'$_loop'.$cnt.'_glob["index"]+=1;';
158 158
         }
159 159
         if ($usesIteration) {
160
-            $post .= "\n\t\t" . '$_loop' . $cnt . '_glob["iteration"]+=1;';
160
+            $post .= "\n\t\t".'$_loop'.$cnt.'_glob["iteration"]+=1;';
161 161
         }
162 162
         // end loop
163
-        $post .= "\n\t}\n}\n" . Compiler::PHP_CLOSE;
163
+        $post .= "\n\t}\n}\n".Compiler::PHP_CLOSE;
164 164
         if (isset($params['hasElse'])) {
165 165
             $post .= $params['hasElse'];
166 166
         }
167 167
 
168
-        return $pre . $content . $post;
168
+        return $pre.$content.$post;
169 169
     }
170 170
 }
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Blocks/PluginAutoEscape.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
     public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
55 55
     {
56 56
         $params = $compiler->getCompiledParams($params);
57
-        switch (strtolower(trim((string)$params['enabled'], '"\''))) {
57
+        switch (strtolower(trim((string) $params['enabled'], '"\''))) {
58 58
 
59 59
             case 'on':
60 60
             case 'true':
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
                 $enable = false;
72 72
                 break;
73 73
             default:
74
-                throw new CompilationException($compiler, 'Auto_Escape : Invalid parameter (' . $params['enabled'] . '), valid parameters are "enable"/true or "disable"/false');
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();
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Blocks/PluginElse.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@
 block discarded – undo
89 89
         }
90 90
 
91 91
         $block                      = &$compiler->getCurrentBlock();
92
-        $block['params']['hasElse'] = Compiler::PHP_OPEN . "else {\n" . Compiler::PHP_CLOSE . $content . Compiler::PHP_OPEN . "\n}" . Compiler::PHP_CLOSE;
92
+        $block['params']['hasElse'] = Compiler::PHP_OPEN."else {\n".Compiler::PHP_CLOSE.$content.Compiler::PHP_OPEN."\n}".Compiler::PHP_CLOSE;
93 93
 
94 94
         return '';
95 95
     }
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Blocks/PluginSection.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -79,44 +79,44 @@  discard block
 block discarded – undo
79 79
         $show  = $params['show'];
80 80
 
81 81
         // gets unique id
82
-        $cnt = self::$cnt ++;
82
+        $cnt = self::$cnt++;
83 83
 
84
-        $output .= '$this->globals[\'section\'][' . $name . '] = array();' . "\n" . '$_section' . $cnt . ' =& $this->globals[\'section\'][' . $name . '];' . "\n";
84
+        $output .= '$this->globals[\'section\']['.$name.'] = array();'."\n".'$_section'.$cnt.' =& $this->globals[\'section\']['.$name.'];'."\n";
85 85
 
86 86
         if ($loop !== 'null') {
87
-            $output .= '$_section' . $cnt . '[\'loop\'] = is_array($tmp = ' . $loop . ') ? count($tmp) : max(0, (int) $tmp);' . "\n";
87
+            $output .= '$_section'.$cnt.'[\'loop\'] = is_array($tmp = '.$loop.') ? count($tmp) : max(0, (int) $tmp);'."\n";
88 88
         } else {
89
-            $output .= '$_section' . $cnt . '[\'loop\'] = 1;' . "\n";
89
+            $output .= '$_section'.$cnt.'[\'loop\'] = 1;'."\n";
90 90
         }
91 91
 
92 92
         if ($show !== 'null') {
93
-            $output .= '$_section' . $cnt . '[\'show\'] = ' . $show . ";\n";
93
+            $output .= '$_section'.$cnt.'[\'show\'] = '.$show.";\n";
94 94
         } else {
95
-            $output .= '$_section' . $cnt . '[\'show\'] = true;' . "\n";
95
+            $output .= '$_section'.$cnt.'[\'show\'] = true;'."\n";
96 96
         }
97 97
 
98 98
         if ($name !== 'null') {
99
-            $output .= '$_section' . $cnt . '[\'name\'] = ' . $name . ";\n";
99
+            $output .= '$_section'.$cnt.'[\'name\'] = '.$name.";\n";
100 100
         } else {
101
-            $output .= '$_section' . $cnt . '[\'name\'] = true;' . "\n";
101
+            $output .= '$_section'.$cnt.'[\'name\'] = true;'."\n";
102 102
         }
103 103
 
104 104
         if ($max !== 'null') {
105
-            $output .= '$_section' . $cnt . '[\'max\'] = (int)' . $max . ";\n" . 'if($_section' . $cnt . '[\'max\'] < 0) { $_section' . $cnt . '[\'max\'] = $_section' . $cnt . '[\'loop\']; }' . "\n";
105
+            $output .= '$_section'.$cnt.'[\'max\'] = (int)'.$max.";\n".'if($_section'.$cnt.'[\'max\'] < 0) { $_section'.$cnt.'[\'max\'] = $_section'.$cnt.'[\'loop\']; }'."\n";
106 106
         } else {
107
-            $output .= '$_section' . $cnt . '[\'max\'] = $_section' . $cnt . '[\'loop\'];' . "\n";
107
+            $output .= '$_section'.$cnt.'[\'max\'] = $_section'.$cnt.'[\'loop\'];'."\n";
108 108
         }
109 109
 
110 110
         if ($step !== 'null') {
111
-            $output .= '$_section' . $cnt . '[\'step\'] = (int)' . $step . ' == 0 ? 1 : (int) ' . $step . ";\n";
111
+            $output .= '$_section'.$cnt.'[\'step\'] = (int)'.$step.' == 0 ? 1 : (int) '.$step.";\n";
112 112
         } else {
113
-            $output .= '$_section' . $cnt . '[\'step\'] = 1;' . "\n";
113
+            $output .= '$_section'.$cnt.'[\'step\'] = 1;'."\n";
114 114
         }
115 115
 
116 116
         if ($start !== 'null') {
117
-            $output .= '$_section' . $cnt . '[\'start\'] = (int)' . $start . ";\n";
117
+            $output .= '$_section'.$cnt.'[\'start\'] = (int)'.$start.";\n";
118 118
         } else {
119
-            $output .= '$_section' . $cnt . '[\'start\'] = $_section' . $cnt . '[\'step\'] > 0 ? 0 : $_section' . $cnt . '[\'loop\'] - 1;' . "\n" . 'if ($_section' . $cnt . '[\'start\'] < 0) { $_section' . $cnt . '[\'start\'] = max($_section' . $cnt . '[\'step\'] > 0 ? 0 : -1, $_section' . $cnt . '[\'loop\'] + $_section' . $cnt . '[\'start\']); } ' . "\n" . 'else { $_section' . $cnt . '[\'start\'] = min($_section' . $cnt . '[\'start\'], $_section' . $cnt . '[\'step\'] > 0 ? $_section' . $cnt . '[\'loop\'] : $_section' . $cnt . '[\'loop\'] -1); }' . "\n";
119
+            $output .= '$_section'.$cnt.'[\'start\'] = $_section'.$cnt.'[\'step\'] > 0 ? 0 : $_section'.$cnt.'[\'loop\'] - 1;'."\n".'if ($_section'.$cnt.'[\'start\'] < 0) { $_section'.$cnt.'[\'start\'] = max($_section'.$cnt.'[\'step\'] > 0 ? 0 : -1, $_section'.$cnt.'[\'loop\'] + $_section'.$cnt.'[\'start\']); } '."\n".'else { $_section'.$cnt.'[\'start\'] = min($_section'.$cnt.'[\'start\'], $_section'.$cnt.'[\'step\'] > 0 ? $_section'.$cnt.'[\'loop\'] : $_section'.$cnt.'[\'loop\'] -1); }'."\n";
120 120
         }
121 121
 
122 122
         /*		if ($usesAny) {
@@ -131,24 +131,24 @@  discard block
 block discarded – undo
131 131
                 }
132 132
         */
133 133
 
134
-        $output .= 'if ($_section' . $cnt . '[\'show\']) {' . "\n";
134
+        $output .= 'if ($_section'.$cnt.'[\'show\']) {'."\n";
135 135
         if ($start === 'null' && $step === 'null' && $max === 'null') {
136
-            $output .= '	$_section' . $cnt . '[\'total\'] = $_section' . $cnt . '[\'loop\'];' . "\n";
136
+            $output .= '	$_section'.$cnt.'[\'total\'] = $_section'.$cnt.'[\'loop\'];'."\n";
137 137
         } else {
138
-            $output .= '	$_section' . $cnt . '[\'total\'] = min(ceil(($_section' . $cnt . '[\'step\'] > 0 ? $_section' . $cnt . '[\'loop\'] - $_section' . $cnt . '[\'start\'] : $_section' . $cnt . '[\'start\'] + 1) / abs($_section' . $cnt . '[\'step\'])), $_section' . $cnt . '[\'max\']);' . "\n";
138
+            $output .= '	$_section'.$cnt.'[\'total\'] = min(ceil(($_section'.$cnt.'[\'step\'] > 0 ? $_section'.$cnt.'[\'loop\'] - $_section'.$cnt.'[\'start\'] : $_section'.$cnt.'[\'start\'] + 1) / abs($_section'.$cnt.'[\'step\'])), $_section'.$cnt.'[\'max\']);'."\n";
139 139
         }
140
-        $output .= '	if ($_section' . $cnt . '[\'total\'] == 0) {' . "\n" . '		$_section' . $cnt . '[\'show\'] = false;' . "\n" . '	}' . "\n" . '} else {' . "\n" . '	$_section' . $cnt . '[\'total\'] = 0;' . "\n}\n";
141
-        $output .= 'if ($_section' . $cnt . '[\'show\']) {' . "\n";
142
-        $output .= "\t" . 'for ($this->scope[' . $name . '] = $_section' . $cnt . '[\'start\'], $_section' . $cnt . '[\'iteration\'] = 1; ' . '$_section' . $cnt . '[\'iteration\'] <= $_section' . $cnt . '[\'total\']; ' . '$this->scope[' . $name . '] += $_section' . $cnt . '[\'step\'], $_section' . $cnt . '[\'iteration\']++) {' . "\n";
143
-        $output .= "\t\t" . '$_section' . $cnt . '[\'rownum\'] = $_section' . $cnt . '[\'iteration\'];' . "\n";
144
-        $output .= "\t\t" . '$_section' . $cnt . '[\'index_prev\'] = $this->scope[' . $name . '] - $_section' . $cnt . '[\'step\'];' . "\n";
145
-        $output .= "\t\t" . '$_section' . $cnt . '[\'index_next\'] = $this->scope[' . $name . '] + $_section' . $cnt . '[\'step\'];' . "\n";
146
-        $output .= "\t\t" . '$_section' . $cnt . '[\'first\']      = ($_section' . $cnt . '[\'iteration\'] == 1);' . "\n";
147
-        $output .= "\t\t" . '$_section' . $cnt . '[\'last\']       = ($_section' . $cnt . '[\'iteration\'] == $_section' . $cnt . '[\'total\']);' . "\n";
148
-
149
-        $output .= Compiler::PHP_CLOSE . $content . Compiler::PHP_OPEN;
150
-
151
-        $output .= "\n\t}\n} " . Compiler::PHP_CLOSE;
140
+        $output .= '	if ($_section'.$cnt.'[\'total\'] == 0) {'."\n".'		$_section'.$cnt.'[\'show\'] = false;'."\n".'	}'."\n".'} else {'."\n".'	$_section'.$cnt.'[\'total\'] = 0;'."\n}\n";
141
+        $output .= 'if ($_section'.$cnt.'[\'show\']) {'."\n";
142
+        $output .= "\t".'for ($this->scope['.$name.'] = $_section'.$cnt.'[\'start\'], $_section'.$cnt.'[\'iteration\'] = 1; '.'$_section'.$cnt.'[\'iteration\'] <= $_section'.$cnt.'[\'total\']; '.'$this->scope['.$name.'] += $_section'.$cnt.'[\'step\'], $_section'.$cnt.'[\'iteration\']++) {'."\n";
143
+        $output .= "\t\t".'$_section'.$cnt.'[\'rownum\'] = $_section'.$cnt.'[\'iteration\'];'."\n";
144
+        $output .= "\t\t".'$_section'.$cnt.'[\'index_prev\'] = $this->scope['.$name.'] - $_section'.$cnt.'[\'step\'];'."\n";
145
+        $output .= "\t\t".'$_section'.$cnt.'[\'index_next\'] = $this->scope['.$name.'] + $_section'.$cnt.'[\'step\'];'."\n";
146
+        $output .= "\t\t".'$_section'.$cnt.'[\'first\']      = ($_section'.$cnt.'[\'iteration\'] == 1);'."\n";
147
+        $output .= "\t\t".'$_section'.$cnt.'[\'last\']       = ($_section'.$cnt.'[\'iteration\'] == $_section'.$cnt.'[\'total\']);'."\n";
148
+
149
+        $output .= Compiler::PHP_CLOSE.$content.Compiler::PHP_OPEN;
150
+
151
+        $output .= "\n\t}\n} ".Compiler::PHP_CLOSE;
152 152
 
153 153
         if (isset($params['hasElse'])) {
154 154
             $output .= $params['hasElse'];
Please login to merge, or discard this patch.