Completed
Push — master ( 494091...32c874 )
by David
27s
created
lib/Dwoo/Core.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -549,8 +549,7 @@
 block discarded – undo
549 549
             if (!class_exists($class) && !function_exists($class)) {
550 550
                 try {
551 551
                     $this->getLoader()->loadPlugin($callback);
552
-                }
553
-                catch (Exception $e) {
552
+                } catch (Exception $e) {
554 553
                     if (strstr($callback, self::NAMESPACE_PLUGINS_FILTERS)) {
555 554
                         throw new Exception(
556 555
                             'Wrong filter name : ' . $callback . ', the "Dwoo_Filter_" prefix should 
Please login to merge, or discard this patch.
lib/Dwoo/Compiler.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -478,8 +478,7 @@  discard block
 block discarded – undo
478 478
         if (!class_exists($class) && !function_exists($class)) {
479 479
             try {
480 480
                 $this->getDwoo()->getLoader()->loadPlugin($name);
481
-            }
482
-            catch (Exception $e) {
481
+            } catch (Exception $e) {
483 482
                 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');
484 483
             }
485 484
         }
@@ -1624,8 +1623,7 @@  discard block
 block discarded – undo
1624 1623
                     // load if plugin
1625 1624
                     try {
1626 1625
                         $this->getPluginType('if');
1627
-                    }
1628
-                    catch (Exception $e) {
1626
+                    } catch (Exception $e) {
1629 1627
                         throw new CompilationException($this, 'Assignments require the "if" plugin to be accessible');
1630 1628
                     }
1631 1629
 
@@ -3409,8 +3407,7 @@  discard block
 block discarded – undo
3409 3407
                     try {
3410 3408
                         $this->getDwoo()->getLoader()->loadPlugin(
3411 3409
                             'Plugin' . Core::toCamelCase($name));
3412
-                    }
3413
-                    catch (Exception $e) {
3410
+                    } catch (Exception $e) {
3414 3411
                         if (isset($phpFunc)) {
3415 3412
                             $pluginType = Core::NATIVE_PLUGIN;
3416 3413
                         } elseif (is_object($this->getDwoo()->getPluginProxy()) && $this->getDwoo()->getPluginProxy()->handles($name)) {
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Functions/PluginExtends.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -95,11 +95,9 @@
 block discarded – undo
95 95
 
96 96
             try {
97 97
                 $parent = $compiler->getDwoo()->templateFactory($resource, $identifier, null, null, null, $curTpl);
98
-            }
99
-            catch (SecurityException $e) {
98
+            } catch (SecurityException $e) {
100 99
                 throw new CompilationException($compiler, 'Extends : Security restriction : ' . $e->getMessage());
101
-            }
102
-            catch (Exception $e) {
100
+            } catch (Exception $e) {
103 101
                 throw new CompilationException($compiler, 'Extends : ' . $e->getMessage());
104 102
             }
105 103
 
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Blocks/PluginDynamic.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -64,8 +64,7 @@
 block discarded – undo
64 64
             $compiler->findBlock('dynamic');
65 65
 
66 66
             return $content;
67
-        }
68
-        catch (CompilationException $e) {
67
+        } catch (CompilationException $e) {
69 68
         }
70 69
         $output = Compiler::PHP_OPEN . 'if($doCache) {' . "\n\t" . 'echo \'<dwoo:dynamic_\'.$dynamicId.\'>' . str_replace('\'', '\\\'', $content) . '</dwoo:dynamic_\'.$dynamicId.\'>\';' . "\n} else {\n\t";
71 70
         if (substr($content, 0, strlen(Compiler::PHP_OPEN)) == Compiler::PHP_OPEN) {
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Functions/PluginInclude.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -66,11 +66,9 @@
 block discarded – undo
66 66
 
67 67
         try {
68 68
             $include = $this->core->templateFactory($resource, $identifier, $cache_time, $cache_id, $compile_id);
69
-        }
70
-        catch (SecurityException $e) {
69
+        } catch (SecurityException $e) {
71 70
             $this->core->triggerError('Include : Security restriction : ' . $e->getMessage(), E_USER_WARNING);
72
-        }
73
-        catch (Exception $e) {
71
+        } catch (Exception $e) {
74 72
             $this->core->triggerError('Include : ' . $e->getMessage(), E_USER_WARNING);
75 73
         }
76 74
 
Please login to merge, or discard this patch.
lib/Dwoo/Plugins/Functions/PluginTif.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,8 +50,7 @@
 block discarded – undo
50 50
         if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'PluginIf')) {
51 51
             try {
52 52
                 $compiler->getDwoo()->getLoader()->loadPlugin('if');
53
-            }
54
-            catch (Exception $e) {
53
+            } catch (Exception $e) {
55 54
                 throw new CompilationException($compiler, 'Tif: the if plugin is required to use Tif');
56 55
             }
57 56
         }
Please login to merge, or discard this patch.