[BC-Break] Add request and response object to the preHandle and postHandle hooks

Bootstraps/HooksInterface.php

@@ -2,8 +2,11 @@
 
 namespace PHPPM\Bootstraps;
 
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
 interface HooksInterface
 {
-    public function preHandle($app);
-    public function postHandle($app);
+    public function preHandle($app, ServerRequestInterface $request);
+    public function postHandle($app, ServerRequestInterface $request, ResponseInterface $response);
 }

Bootstraps/Laravel.php

@@ -1,6 +1,8 @@
 <?php
 
 namespace PHPPM\Bootstraps;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 
 /**
  * A default bootstrap for the Laravel framework
@@ -120,16 +122,19 @@ public function getApplication()
 
     /**
      * @param \Illuminate\Contracts\Foundation\Application $app
+     * @param ServerRequestInterface $request
      */
-    public function preHandle($app)
+    public function preHandle($app, ServerRequestInterface $request)
     {
         //reset const LARAVEL_START, to get the correct timing
     }
 
     /**
      * @param \Illuminate\Contracts\Foundation\Application $app
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
      */
-    public function postHandle($app)
+    public function postHandle($app, ServerRequestInterface $request, ResponseInterface $response)
     {
         //check if this is a lumen framework, if so, do not reset
         //note that lumen does not have the getProvider method

Bootstraps/Symfony.php

@@ -4,6 +4,8 @@
 
 use PHPPM\Symfony\StrongerNativeSessionStorage;
 use PHPPM\Utils;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 use Symfony\Component\HttpFoundation\Request;
 use function PHPPM\register_file;
 
@@ -116,8 +118,9 @@ protected function getVendorDir()
      * Does some necessary preparation before each request.
      *
      * @param \AppKernel $app
+     * @param ServerRequestInterface $request
      */
-    public function preHandle($app)
+    public function preHandle($app, ServerRequestInterface $request)
     {
         //resets Kernels startTime, so Symfony can correctly calculate the execution time
         Utils::hijackProperty($app, 'startTime', microtime(true));
@@ -127,8 +130,10 @@ public function preHandle($app)
      * Does some necessary clean up after each request.
      *
      * @param \AppKernel $app
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
      */
-    public function postHandle($app)
+    public function postHandle($app, ServerRequestInterface $request, ResponseInterface $response)
     {
         $container = $app->getContainer();
 

Bridges/HttpKernel.php

@@ -81,7 +81,7 @@ public function handle(ServerRequestInterface $request)
         ob_start();
 
         if ($this->bootstrap instanceof HooksInterface) {
-            $this->bootstrap->preHandle($this->application);
+            $this->bootstrap->preHandle($this->application, $request);
         }
 
         $syResponse = $this->application->handle($syRequest);
@@ -98,7 +98,7 @@ public function handle(ServerRequestInterface $request)
         }
 
         if ($this->bootstrap instanceof HooksInterface) {
-            $this->bootstrap->postHandle($this->application);
+            $this->bootstrap->postHandle($this->application, $request, $response);
         }
 
         return $response;