From 87ab74681271f6447379dbed49a82a965c956428 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Sun, 17 Dec 2017 13:52:42 -0600
Subject: [PATCH] Update to Laravel 5.5.25

---
 Makefile         |  2 ++
 composer.json    |  2 +-
 composer.lock    | 13 +++++++------
 config/cache.php |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index db67a756..89e6e5e0 100644
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,10 @@ clean:
 	@find storage/framework/sessions -type f -not -name '.gitignore' -print0 -delete
 	@find storage/framework/views -type f -not -name '.gitignore' -print0 -delete
 	@find storage/logs -type f -not -name '.gitignore' -print0 -delete
+	@php artisan cache:clear
 	@php artisan route:clear
 	@php artisan config:clear
+	@php artisan view:clear
 
 .PHONY: clean-routes
 clean-routes:
diff --git a/composer.json b/composer.json
index 10449fba..d20af32c 100755
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
     "url": "https://github.com/nabeelio/phpvms.git",
     "require": {
         "php": ">=7.0",
-        "laravel/framework": "v5.5.23",
+        "laravel/framework": "v5.5.25",
         "symfony/lts": "v3",
         "yajra/laravel-datatables-oracle": "8.3.2",
         "infyomlabs/laravel-generator": "5.5.x-dev",
diff --git a/composer.lock b/composer.lock
index 7ac7685b..a36ed31e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "d063351d417cd47b46435e0f911a2d16",
+    "content-hash": "ec5e5013aa142d4d397b6d7fe00f6397",
     "packages": [
         {
             "name": "composer/semver",
@@ -1427,16 +1427,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.5.23",
+            "version": "v5.5.25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "cb8ec95aa65fbaeeaf94026c8a9f04bb97c13777"
+                "reference": "0a5b6112f325c56ae5a6679c08a0a10723153fe0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/cb8ec95aa65fbaeeaf94026c8a9f04bb97c13777",
-                "reference": "cb8ec95aa65fbaeeaf94026c8a9f04bb97c13777",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/0a5b6112f325c56ae5a6679c08a0a10723153fe0",
+                "reference": "0a5b6112f325c56ae5a6679c08a0a10723153fe0",
                 "shasum": ""
             },
             "require": {
@@ -1516,6 +1516,7 @@
                 "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).",
                 "laravel/tinker": "Required to use the tinker console command (~1.0).",
                 "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
+                "league/flysystem-cached-adapter": "Required to use Flysystem caching (~1.0).",
                 "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).",
                 "nexmo/client": "Required to use the Nexmo transport (~1.0).",
                 "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).",
@@ -1556,7 +1557,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2017-12-04T14:19:08+00:00"
+            "time": "2017-12-11T14:59:28+00:00"
         },
         {
             "name": "laravelcollective/html",
diff --git a/config/cache.php b/config/cache.php
index 28add1cc..63f6f1a4 100755
--- a/config/cache.php
+++ b/config/cache.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'default' => env('CACHE_DRIVER', 'file'),
+    'default' => env('CACHE_DRIVER', 'array'),
     'prefix' => env('CACHE_PREFIX', ''),
 
     'keys' => [