Merge pull request #34 from intraordinaire/master

Update code due to Laravel 5.8 migration
Distilleries · Jul 10, 2019 · 0dc40d5 · 0dc40d5
2 parents dd97a59 + 020d735
commit 0dc40d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/Distilleries/Expendable/ExpendableServiceProvider.php b/src/Distilleries/Expendable/ExpendableServiceProvider.php
@@ -5,18 +5,12 @@
 use Distilleries\Expendable\Layouts\LayoutManager;
 use Distilleries\Expendable\Models\User;
 use Distilleries\Expendable\States\StateDisplayer;
+use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Foundation\AliasLoader;
 
-class ExpendableServiceProvider extends ServiceProvider
+class ExpendableServiceProvider extends ServiceProvider implements DeferrableProvider
 {
-    /**
-     * Indicates if loading of the provider is deferred.
-     *
-     * @var bool
-     */
-    protected $defer = true;
-
     /**
      * Bootstrap the application events.
      *

diff --git a/src/Distilleries/Expendable/Http/Middleware/Cache.php b/src/Distilleries/Expendable/Http/Middleware/Cache.php
@@ -15,11 +15,11 @@ class Cache
      */
     public function handle($request, Closure $next)
     {
-        if (config('cache.enabled') === true) {
+        if (config('cache.enabled') === true && null !== config('cache.minutes')) {
             $url = $request->url();
 
             $key = md5($url.json_encode($request->query()));
-            $value = \Cache::remember($key, config('cache.minutes'), function() use ($next, $request) {
+            $value = \Cache::remember($key, now()->addMinutes(config('cache.minutes')), function() use ($next, $request) {
                 return $next($request);
             });