Upgrade to Laravel 5.7

LavaLite · Sep 21, 2018 · 5804a2b · 5804a2b
1 parent 9ee5be3
commit 5804a2b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/app/Http/Controllers/PublicController.php b/app/Http/Controllers/PublicController.php
@@ -29,9 +29,14 @@ public function __construct()
      */
     public function home()
     {
-        return $this->response->title('Home')
+        $page = app(\Litecms\Page\Interfaces\PageRepositoryInterface::class)->getPage('home');
+        return $this->response
+            ->setMetaKeyword(strip_tags($page->meta_keyword))
+            ->setMetaDescription(strip_tags($page->meta_description))
+            ->setMetaTitle(strip_tags($page->meta_title))
             ->layout('home')
             ->view('home')
+            ->data(compact('page'))
             ->output();
     }
 

diff --git a/composer.json b/composer.json
@@ -5,10 +5,10 @@
     "license": "MIT",
     "type": "cms",
     "require": {
-        "php": ">=7.1.3",
-        "fideloper/proxy": "~4.0",
-        "laravel/framework": "5.6.*",
-        "laravel/tinker": "~1.0",
+        "php": "^7.1.3",
+        "fideloper/proxy": "^4.0",
+        "laravel/framework": "5.7.*",
+        "laravel/tinker": "^1.0",
         "lavalite/framework": "~4.0",
         "lavalite/theme": "~4.0",
         "litecms/block": "~4.0",
@@ -46,6 +46,16 @@
         },
         "laravel": {
             "dont-discover": [
+                "anahkiasen/former",
+                "fideloper/proxy",
+                "intervention/image",
+                "laravel/socialite",
+                "laravel/tinker",
+                "mcamara/laravel-localization",
+                "nunomaduro/collision",
+                "prettus/l5-repository",
+                "spatie/laravel-activitylog",
+                "spatie/laravel-backup"
             ]
         }
     },

diff --git a/config/auth.php b/config/auth.php
@@ -163,5 +163,5 @@
         ],
     ],
 
-    'verify_email' => true,
+    'verify_email' => false,
 ];