Merge pull request #156 from nope7777/lumen-support

Lumen support

Author: mikebronner

src/Console/Commands/Clear.php

@@ -21,7 +21,7 @@ public function handle()
 
     protected function flushEntireCache() : int
     {
-        cache()
+        app('cache')
             ->store(config('laravel-model-caching.store'))
             ->flush();
 

src/Traits/Caching.php

@@ -13,7 +13,7 @@ trait Caching
 
     public function cache(array $tags = [])
     {
-        $cache = cache();
+        $cache = app('cache');
 
         if (config('laravel-model-caching.store')) {
             $cache = $cache->store(config('laravel-model-caching.store'));
@@ -70,7 +70,7 @@ protected function makeCacheKey(
     ) : string {
         $eagerLoad = $this->eagerLoad ?? [];
         $model = $this->model ?? $this;
-        $query = $this->query ?? app(Builder::class);
+        $query = $this->query ?? app('db')->query();
 
         return (new CacheKey($eagerLoad, $model, $query))
             ->make($columns, $idColumn, $keyDifferentiator);
@@ -80,7 +80,7 @@ protected function makeCacheTags() : array
     {
         $eagerLoad = $this->eagerLoad ?? [];
         $model = $this->model ?? $this;
-        $query = $this->query ?? app(Builder::class);
+        $query = $this->query ?? app('db')->query();
 
         $tags = (new CacheTags($eagerLoad, $model, $query))
             ->make();

tests/CreatesApplication.php

@@ -14,7 +14,7 @@ trait CreatesApplication
 
     protected function cache()
     {
-        $cache = cache();
+        $cache = app('cache');
 
         if (config('laravel-model-caching.store')) {
             $cache = $cache->store(config('laravel-model-caching.store'));
@@ -33,7 +33,7 @@ public function setUp()
         $this->loadMigrationsFrom(__DIR__ . '/database/migrations');
         view()->addLocation(__DIR__ . '/resources/views', 'laravel-model-caching');
 
-        $this->cache = cache()
+        $this->cache = app('cache')
             ->store(config('laravel-model-caching.store'));
 
         $this->cache()->flush();

tests/Integration/Traits/CachableTest.php

@@ -29,10 +29,10 @@ public function testSpecifyingAlternateCacheDriver()
 
         $authors = (new Author)
             ->all();
-        $defaultcacheResults = cache()
+        $defaultcacheResults = app('cache')
             ->tags($tags)
             ->get($key)['value'];
-        $customCacheResults = cache()
+        $customCacheResults = app('cache')
             ->store('customCache')
             ->tags($tags)
             ->get($key)['value'];