dwoo-project / dwoo

lib/Dwoo/Core.php

Braces +1 added lines, -2 removed lines

@@ -549,8 +549,7 @@
             if (!class_exists($class) && !function_exists($class)) {
                 try {
                     $this->getLoader()->loadPlugin($callback);
-                }
-                catch (Exception $e) {
+                } catch (Exception $e) {
                     if (strstr($callback, self::NAMESPACE_PLUGINS_FILTERS)) {
                         throw new Exception(
                             'Wrong filter name : ' . $callback . ', the "Dwoo_Filter_" prefix should 

lib/Dwoo/Compiler.php

Switch Indentation +43 added lines, -43 removed lines

@@ -769,13 +769,13 @@ 
                         $search = array('{<\?.*?\?>}', '{<%.*?%>}');
                     }
                     switch ($this->securityPolicy->getPhpHandling()) {
-                        case SecurityPolicy::PHP_ALLOW:
-                            break;
-                        case SecurityPolicy::PHP_ENCODE:
-                            $tpl = preg_replace_callback($search, array($this, 'phpTagEncodingHelper'), $tpl);
-                            break;
-                        case SecurityPolicy::PHP_REMOVE:
-                            $tpl = preg_replace($search, '', $tpl);
+                    case SecurityPolicy::PHP_ALLOW:
+                        break;
+                    case SecurityPolicy::PHP_ENCODE:
+                        $tpl = preg_replace_callback($search, array($this, 'phpTagEncodingHelper'), $tpl);
+                        break;
+                    case SecurityPolicy::PHP_REMOVE:
+                        $tpl = preg_replace($search, '', $tpl);
                     }
                 }
             }
@@ -875,42 +875,42 @@ 
             }
 
             switch ($type) {
-                case Core::BLOCK_PLUGIN:
-                case Core::CLASS_PLUGIN:
-                    if (class_exists('Plugin' . $plugin) !== false) {
-                        $output .= "if (class_exists('" . "Plugin" . $plugin . "')===false)".
-                        "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
-                    } else {
-                        $output .= "if (class_exists('" . Core::NAMESPACE_PLUGINS_BLOCKS . "Plugin" . $plugin . "')===false)".
-                        "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
-                    }
-                    break;
-                case Core::FUNC_PLUGIN:
-                    if (function_exists('Plugin' . $plugin) !== false) {
-                        $output .= "if (function_exists('" . "Plugin" . $plugin . "')===false)".
-                        "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
-                    } else {
-                        $output .= "if (function_exists('" . Core::NAMESPACE_PLUGINS_FUNCTIONS . "Plugin" . $plugin . "')===false)".
-                        "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
-                    }
-                    break;
-                case Core::SMARTY_MODIFIER:
-                    $output .= "if (function_exists('smarty_modifier_$plugin')===false)".
-                    "\n\t\$this->getLoader()->loadPlugin('$plugin');\n";
-                    break;
-                case Core::SMARTY_FUNCTION:
-                    $output .= "if (function_exists('smarty_function_$plugin')===false)".
-                    "\n\t\$this->getLoader()->loadPlugin('$plugin');\n";
-                    break;
-                case Core::SMARTY_BLOCK:
-                    $output .= "if (function_exists('smarty_block_$plugin')===false)".
-                    "\n\t\$this->getLoader()->loadPlugin('$plugin');\n";
-                    break;
-                case Core::PROXY_PLUGIN:
-                    $output .= $this->getDwoo()->getPluginProxy()->getLoader($plugin);
-                    break;
-                default:
-                    throw new CompilationException($this, 'Type error for ' . $plugin . ' with type' . $type);
+            case Core::BLOCK_PLUGIN:
+            case Core::CLASS_PLUGIN:
+                if (class_exists('Plugin' . $plugin) !== false) {
+                    $output .= "if (class_exists('" . "Plugin" . $plugin . "')===false)".
+                    "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
+                } else {
+                    $output .= "if (class_exists('" . Core::NAMESPACE_PLUGINS_BLOCKS . "Plugin" . $plugin . "')===false)".
+                    "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
+                }
+                break;
+            case Core::FUNC_PLUGIN:
+                if (function_exists('Plugin' . $plugin) !== false) {
+                    $output .= "if (function_exists('" . "Plugin" . $plugin . "')===false)".
+                    "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
+                } else {
+                    $output .= "if (function_exists('" . Core::NAMESPACE_PLUGINS_FUNCTIONS . "Plugin" . $plugin . "')===false)".
+                    "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
+                }
+                break;
+            case Core::SMARTY_MODIFIER:
+                $output .= "if (function_exists('smarty_modifier_$plugin')===false)".
+                "\n\t\$this->getLoader()->loadPlugin('$plugin');\n";
+                break;
+            case Core::SMARTY_FUNCTION:
+                $output .= "if (function_exists('smarty_function_$plugin')===false)".
+                "\n\t\$this->getLoader()->loadPlugin('$plugin');\n";
+                break;
+            case Core::SMARTY_BLOCK:
+                $output .= "if (function_exists('smarty_block_$plugin')===false)".
+                "\n\t\$this->getLoader()->loadPlugin('$plugin');\n";
+                break;
+            case Core::PROXY_PLUGIN:
+                $output .= $this->getDwoo()->getPluginProxy()->getLoader($plugin);
+                break;
+            default:
+                throw new CompilationException($this, 'Type error for ' . $plugin . ' with type' . $type);
             }
         }
 

Braces +3 added lines, -6 removed lines

@@ -478,8 +478,7 @@ 
         if (!class_exists($class) && !function_exists($class)) {
             try {
                 $this->getDwoo()->getLoader()->loadPlugin($name);
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 throw new Exception('Processor ' . $name . ' could not be found in your plugin directories, please ensure it is in a file named ' . $name . '.php in the plugin directory');
             }
         }
@@ -1624,8 +1623,7 @@ 
                     // load if plugin
                     try {
                         $this->getPluginType('if');
-                    }
-                    catch (Exception $e) {
+                    } catch (Exception $e) {
                         throw new CompilationException($this, 'Assignments require the "if" plugin to be accessible');
                     }
 
@@ -3409,8 +3407,7 @@ 
                     try {
                         $this->getDwoo()->getLoader()->loadPlugin(
                             'Plugin' . Core::toCamelCase($name));
-                    }
-                    catch (Exception $e) {
+                    } catch (Exception $e) {
                         if (isset($phpFunc)) {
                             $pluginType = Core::NATIVE_PLUGIN;
                         } elseif (is_object($this->getDwoo()->getPluginProxy()) && $this->getDwoo()->getPluginProxy()->handles($name)) {

lib/Dwoo/Plugins/Functions/PluginInclude.php

Braces +2 added lines, -4 removed lines

@@ -52,11 +52,9 @@
 
     try {
         $include = $dwoo->templateFactory($resource, $identifier, $cache_time, $cache_id, $compile_id);
-    }
-    catch (SecurityException $e) {
+    } catch (SecurityException $e) {
         $dwoo->triggerError('Include : Security restriction : ' . $e->getMessage(), E_USER_WARNING);
-    }
-    catch (Exception $e) {
+    } catch (Exception $e) {
         $dwoo->triggerError('Include : ' . $e->getMessage(), E_USER_WARNING);
     }
 

lib/Dwoo/Plugins/Functions/PluginExtends.php

Braces +2 added lines, -4 removed lines

@@ -95,11 +95,9 @@
 
             try {
                 $parent = $compiler->getDwoo()->templateFactory($resource, $identifier, null, null, null, $curTpl);
-            }
-            catch (SecurityException $e) {
+            } catch (SecurityException $e) {
                 throw new CompilationException($compiler, 'Extends : Security restriction : ' . $e->getMessage());
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 throw new CompilationException($compiler, 'Extends : ' . $e->getMessage());
             }
 

lib/Dwoo/Plugins/Functions/PluginTifCompile.php

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
     if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'PluginIf')) {
         try {
             $compiler->getDwoo()->getLoader()->loadPlugin('if');
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             throw new CompilationException($compiler, 'Tif: the if plugin is required to use Tif');
         }
     }

lib/Dwoo/Plugins/Blocks/PluginIf.php

Switch Indentation +153 added lines, -153 removed lines

@@ -70,164 +70,164 @@
             }
             switch ($vmod) {
 
-                case 'and':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '&&';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'or':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '||';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'xor':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '^';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'eq':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '==';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'ne':
-                case 'neq':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '!=';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'gte':
-                case 'ge':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '>=';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'lte':
-                case 'le':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '<=';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'gt':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '>';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'lt':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '<';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'mod':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '%';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'not':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '!';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case '<>':
+            case 'and':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '&&';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'or':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '||';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'xor':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '^';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'eq':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '==';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'ne':
+            case 'neq':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
                     $p[] = '!=';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'gte':
+            case 'ge':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '>=';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'lte':
+            case 'le':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '<=';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'gt':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '>';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'lt':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '<';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'mod':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '%';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case 'not':
+                if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+                    $p[] = '!';
+                } else {
+                    $p[] = $v;
+                }
+                break;
+            case '<>':
+                $p[] = '!=';
+                break;
+            case '==':
+            case '!=':
+            case '>=':
+            case '<=':
+            case '>':
+            case '<':
+            case '===':
+            case '!==':
+            case '%':
+            case '!':
+            case '^':
+                $p[] = $vmod;
+                break;
+            case 'is':
+                if ($tokens[$k] !== Compiler::T_UNQUOTED_STRING) {
+                    $p[] = $v;
                     break;
-                case '==':
-                case '!=':
-                case '>=':
-                case '<=':
-                case '>':
-                case '<':
-                case '===':
-                case '!==':
-                case '%':
-                case '!':
-                case '^':
-                    $p[] = $vmod;
+                }
+                if (isset($params[$k + 1]) && strtolower(trim($params[$k + 1], '"\'')) === 'not' && $tokens[$k + 1] === Compiler::T_UNQUOTED_STRING) {
+                    $negate = true;
+                    next($params);
+                } else {
+                    $negate = false;
+                }
+                $ptr = 1 + (int)$negate;
+                if ($tokens[$k + $ptr] !== Compiler::T_UNQUOTED_STRING) {
                     break;
-                case 'is':
-                    if ($tokens[$k] !== Compiler::T_UNQUOTED_STRING) {
-                        $p[] = $v;
-                        break;
-                    }
-                    if (isset($params[$k + 1]) && strtolower(trim($params[$k + 1], '"\'')) === 'not' && $tokens[$k + 1] === Compiler::T_UNQUOTED_STRING) {
-                        $negate = true;
-                        next($params);
-                    } else {
-                        $negate = false;
-                    }
-                    $ptr = 1 + (int)$negate;
-                    if ($tokens[$k + $ptr] !== Compiler::T_UNQUOTED_STRING) {
-                        break;
-                    }
-                    if (!isset($params[$k + $ptr])) {
-                        $params[$k + $ptr] = '';
-                    } else {
-                        $params[$k + $ptr] = trim($params[$k + $ptr], '"\'');
-                    }
-                    switch ($params[$k + $ptr]) {
+                }
+                if (!isset($params[$k + $ptr])) {
+                    $params[$k + $ptr] = '';
+                } else {
+                    $params[$k + $ptr] = trim($params[$k + $ptr], '"\'');
+                }
+                switch ($params[$k + $ptr]) {
 
-                        case 'div':
-                            if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
-                                $p[] = ' % ' . $params[$k + $ptr + 2] . ' ' . ($negate ? '!' : '=') . '== 0';
-                                next($params);
-                                next($params);
-                                next($params);
-                            } else {
-                                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]);
-                            }
-                            break;
-                        case 'even':
-                            $a = array_pop($p);
-                            if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
-                                $b   = $params[$k + $ptr + 2];
-                                $p[] = '(' . $a . ' / ' . $b . ') % 2 ' . ($negate ? '!' : '=') . '== 0';
-                                next($params);
-                                next($params);
-                            } else {
-                                $p[] = $a . ' % 2 ' . ($negate ? '!' : '=') . '== 0';
-                            }
-                            next($params);
-                            break;
-                        case 'odd':
-                            $a = array_pop($p);
-                            if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
-                                $b   = $params[$k + $ptr + 2];
-                                $p[] = '(' . $a . ' / ' . $b . ') % 2 ' . ($negate ? '=' : '!') . '== 0';
-                                next($params);
-                                next($params);
-                            } else {
-                                $p[] = $a . ' % 2 ' . ($negate ? '=' : '!') . '== 0';
-                            }
-                            next($params);
-                            break;
-                        default:
-                            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]);
-                    }
-                    break;
+                case 'div':
+                if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
+                $p[] = ' % ' . $params[$k + $ptr + 2] . ' ' . ($negate ? '!' : '=') . '== 0';
+                next($params);
+                next($params);
+                next($params);
+                } else {
+                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]);
+                }
+                break;
+                case 'even':
+                $a = array_pop($p);
+                if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
+                $b   = $params[$k + $ptr + 2];
+                $p[] = '(' . $a . ' / ' . $b . ') % 2 ' . ($negate ? '!' : '=') . '== 0';
+                next($params);
+                next($params);
+                } else {
+                $p[] = $a . ' % 2 ' . ($negate ? '!' : '=') . '== 0';
+                }
+                next($params);
+                break;
+                case 'odd':
+                $a = array_pop($p);
+                if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
+                $b   = $params[$k + $ptr + 2];
+                $p[] = '(' . $a . ' / ' . $b . ') % 2 ' . ($negate ? '=' : '!') . '== 0';
+                next($params);
+                next($params);
+                } else {
+                $p[] = $a . ' % 2 ' . ($negate ? '=' : '!') . '== 0';
+                }
+                next($params);
+                break;
                 default:
-                    $p[] = $v;
+                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]);
+                }
+                    break;
+            default:
+                $p[] = $v;
             }
         }
 

lib/Dwoo/Plugins/Blocks/PluginDynamic.php

Braces +1 added lines, -2 removed lines

@@ -64,8 +64,7 @@
             $compiler->findBlock('dynamic');
 
             return $content;
-        }
-        catch (CompilationException $e) {
+        } catch (CompilationException $e) {
         }
         $output = Compiler::PHP_OPEN . 'if($doCache) {' . "\n\t" . 'echo \'<dwoo:dynamic_\'.$dynamicId.\'>' . str_replace('\'', '\\\'', $content) . '</dwoo:dynamic_\'.$dynamicId.\'>\';' . "\n} else {\n\t";
         if (substr($content, 0, strlen(Compiler::PHP_OPEN)) == Compiler::PHP_OPEN) {

lib/Dwoo/Plugins/Blocks/PluginTextformat.php

Switch Indentation +8 added lines, -8 removed lines

@@ -62,14 +62,14 @@
 
         switch ($style) {
 
-            case 'email':
-                $wrap         = 72;
-                $indent_first = 0;
-                break;
-            case 'html':
-                $wrap_char   = '<br />';
-                $indent_char = $indent_char == "\t" ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '&nbsp;';
-                break;
+        case 'email':
+            $wrap         = 72;
+            $indent_first = 0;
+            break;
+        case 'html':
+            $wrap_char   = '<br />';
+            $indent_char = $indent_char == "\t" ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '&nbsp;';
+            break;
         }
 
         $this->wrap     = (int)$wrap;

lib/Dwoo/Plugins/Blocks/PluginStrip.php

Switch Indentation +5 added lines, -5 removed lines

@@ -67,12 +67,12 @@
 
         $mode = trim($params['mode'], '"\'');
         switch ($mode) {
-            case 'js':
-            case 'javascript':
-                $content = preg_replace('#(?<!:)//\s[^\r\n]*|/\*.*?\*/#s', '', $content);
+        case 'js':
+        case 'javascript':
+            $content = preg_replace('#(?<!:)//\s[^\r\n]*|/\*.*?\*/#s', '', $content);
 
-            case 'default':
-            default:
+        case 'default':
+        default:
         }
         $content = preg_replace(array(
             "/\n/",