Make Request object available to controllers. WIP #2738 @1

diff --git a/src/app/Http/Controllers/CubistPageController.php b/src/app/Http/Controllers/CubistPageController.php
index 6e3a33422da2c76bdb316d43741f44404c9b54c9..af12bed199e73173c900c7da2f94886ac0fbd5b3 100644 (file)
--- a/src/app/Http/Controllers/CubistPageController.php
+++ b/src/app/Http/Controllers/CubistPageController.php
@@ -10,7 +10,7 @@ use Illuminate\Support\Str;
 class CubistPageController extends CubistFrontController
 {
 
-    public function index($slug = 'home')
+    public function index(Request $request, $slug = 'home')
     {
         $class = CMSPage::getPageClass();
         /** @var CMSPage $page */
@@ -23,6 +23,7 @@ class CubistPageController extends CubistFrontController
         $this->data['title'] = $page->title;
         $this->data['page'] = $page->getPageData();
         $this->data['body_class'] = 'page-' . Str::slug($page->name);
+        $this->data['request'] = $request;
 
         // Page templates can modify/inject data before it is passed to the view
         $page->getUsedTemplate()->setData($this->data);
@@ -51,6 +52,9 @@ class CubistPageController extends CubistFrontController
                 $this->_404();
             }
             $c = $item->getController();
+
+            // Make Request object available as first parameter
+            $c['params'] = ['request' => $request] + $c['params'];
         }
 
         return call_user_func_array([app('App\\Http\\Controllers\\' . $c['controller']), $c['action']], $c['params']);