Changed method signatures for all hooks to include app container

library/Zepto/PluginInterface.php

@@ -14,16 +14,16 @@
  */
 interface PluginInterface {
 
-    public function after_plugins_load();
+    public function after_plugins_load(\Pimple $app);
 
-    public function before_config_load(&$settings);
+    public function before_config_load(\Pimple $app, &$settings);
 
-    public function before_router_setup();
+    public function before_router_setup(\Pimple $app);
 
-    public function after_router_setup();
+    public function after_router_setup(\Pimple $app);
 
-    public function before_response_send();
+    public function before_response_send(\Pimple $app);
 
-    public function after_response_send();
+    public function after_response_send(\Pimple $app);
 
 }

library/Zepto/Zepto.php

@@ -209,7 +209,7 @@ public function run_hooks($hook_id, $args = array())
         }
 
         // Send app reference to hooks
-        $args = array_merge($args, array($this->app));
+        $args = array_merge(array($this->app), $args);
 
         // Run hooks associated with that event
         foreach ($app['plugins'] as $plugin_id => $plugin) {

plugins/ExamplePlugin.php

@@ -10,29 +10,29 @@
  */
 class ExamplePlugin implements \Zepto\PluginInterface {
 
-    public function after_plugins_load()
+    public function after_plugins_load(\Pimple $app)
     {
         // echo __CLASS__ . '::after_plugins_load';
     }
 
-    public function before_config_load(&$settings)
+    public function before_config_load(\Pimple $app, &$settings)
     {
         // echo __CLASS__ . '::before_config_load';
     }
 
-    public function before_router_setup()
+    public function before_router_setup(\Pimple $app)
     {
     }
 
-    public function after_router_setup()
+    public function after_router_setup(\Pimple $app)
     {
     }
 
-    public function before_response_send()
+    public function before_response_send(\Pimple $app)
     {
     }
 
-    public function after_response_send()
+    public function after_response_send(\Pimple $app)
     {
     }
 

plugins/NavGenPlugin.php

@@ -12,31 +12,31 @@
  */
 class NavGenPlugin implements \Zepto\PluginInterface {
 
-    public function after_plugins_load()
+    public function after_plugins_load(\Pimple $app)
     {
     }
 
-    public function before_config_load(&$settings)
+    public function before_config_load(\Pimple $app, &$settings)
     {
     }
 
-    public function before_router_setup()
+    public function before_router_setup(\Pimple $app)
     {
     }
 
-    public function after_router_setup()
+    public function after_router_setup(\Pimple $app)
     {
         // Use this one
         $app = func_get_arg(0);
         $html = $this->generate_html($app);
         $app['nav'] = array('nav' => $html);
     }
 
-    public function before_response_send()
+    public function before_response_send(\Pimple $app)
     {
     }
 
-    public function after_response_send()
+    public function after_response_send(\Pimple $app)
     {
     }
 

plugins/OtherExamplePlugin.php

@@ -10,27 +10,27 @@
  */
 class OtherExamplePlugin implements \Zepto\PluginInterface {
 
-    public function after_plugins_load()
+    public function after_plugins_load(\Pimple $app)
     {
     }
 
-    public function before_config_load(&$settings)
+    public function before_config_load(\Pimple $app, &$settings)
     {
     }
 
-    public function before_router_setup()
+    public function before_router_setup(\Pimple $app)
     {
     }
 
-    public function after_router_setup()
+    public function after_router_setup(\Pimple $app)
     {
     }
 
-    public function before_response_send()
+    public function before_response_send(\Pimple $app)
     {
     }
 
-    public function after_response_send()
+    public function after_response_send(\Pimple $app)
     {
     }
 

plugins/WhoopsPlugin.php

@@ -14,10 +14,8 @@
  */
 class WhoopsPlugin implements \Zepto\PluginInterface {
 
-    public function after_plugins_load()
+    public function after_plugins_load(\Pimple $app)
     {
-        $app = func_get_arg(0);
-
         // Add Whoops handlers
         $app['whoopsPrettyPageHandler'] = $app->share(
             function() {
@@ -109,19 +107,19 @@ public function before_config_load(\Pimple $app, &$settings)
         }
     }
 
-    public function before_router_setup()
+    public function before_router_setup(\Pimple $app)
     {
     }
 
-    public function after_router_setup()
+    public function after_router_setup(\Pimple $app)
     {
     }
 
-    public function before_response_send()
+    public function before_response_send(\Pimple $app)
     {
     }
 
-    public function after_response_send()
+    public function after_response_send(\Pimple $app)
     {
     }