Remove use of helper methods

Author: mikebronner

CHANGELOG.md

@@ -4,7 +4,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [0.5.3] - 21 May 2019
+## [0.5.6] - 2019-06-20
+### Removed
+- all use of helper methods to allow non-Laravel apps to use this package:
+  - app()
+  - config()
+  - cache()
+  - db()
+  - now()
+  - request()
+
+## [0.5.5] - 2019-05-27
+### Fixed
+- parsing of soft-deleted-related queries:
+  - withTrashed()
+  - onlyTrashed()
+  - withoutTrashed()
+
+## [0.5.4] - 2019-05-27
+### Fixed
+- parsing of global scopes. Rewrote how global scopes are analyzed to create appropriate cache key.
+
+## [0.5.3] - 2019-05-21
 ### Fixed
 - calling `flushCache()` on non-cachable related models.
 

composer.json

@@ -13,8 +13,10 @@
         "illuminate/cache": "5.8.*",
         "illuminate/config": "5.8.*",
         "illuminate/console": "5.8.*",
+        "illuminate/container": "5.8.*",
         "illuminate/database": "5.8.*",
         "illuminate/support": "5.8.*",
+        "illuminate/http": "5.8.*",
         "php": "^7.1.3"
     },
     "require-dev": {

src/Console/Commands/Clear.php

@@ -1,6 +1,7 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Console\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Container\Container;
 use Illuminate\Support\Collection;
 
 class Clear extends Command
@@ -21,8 +22,13 @@ public function handle()
 
     protected function flushEntireCache() : int
     {
-        app('cache')
-            ->store(config('laravel-model-caching.store'))
+        $config = Container::getInstance()
+            ->make("config")
+            ->get('laravel-model-caching.store');
+
+        Container::getInstance()
+            ->make("cache")
+            ->store($config)
             ->flush();
 
         $this->info("✔︎ Entire model cache has been flushed.");

src/Helper.php

@@ -1,15 +1,24 @@
 <?php namespace GeneaLabs\LaravelModelCaching;
 
+use Illuminate\Container\Container;
+
 class Helper
 {
     public function runDisabled(callable $closure)
     {
-        $originalSetting = config('laravel-model-caching.disabled');
-        config(['laravel-model-caching.disabled' => true]);
+        $originalSetting = Container::getInstance()
+            ->make("config")
+            ->get('laravel-model-caching.disabled');
+
+        Container::getInstance()
+            ->make("config")
+            ->set(['laravel-model-caching.disabled' => true]);
 
         $result = $closure();
 
-        config(['laravel-model-caching.disabled' => $originalSetting]);
+        Container::getInstance()
+            ->make("config")
+            ->set(['laravel-model-caching.disabled' => $originalSetting]);
 
         return $result;
     }

src/Traits/Buildable.php

@@ -1,5 +1,7 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Traits;
 
+use Illuminate\Container\Container;
+
 /**
  * @SuppressWarnings(PHPMD.TooManyPublicMethods)
  */
@@ -146,7 +148,9 @@ public function paginate(
             return parent::paginate($perPage, $columns, $pageName, $page);
         }
 
-        $page = app('request')->input($pageName)
+        $page = Container::getInstance()
+            ->make("request")
+            ->input($pageName)
             ?: $page
             ?: 1;
 

src/Traits/CachePrefixing.php

@@ -1,10 +1,14 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Traits;
 
+use Illuminate\Container\Container;
+
 trait CachePrefixing
 {
     protected function getCachePrefix() : string
     {
-        $cachePrefix = config("laravel-model-caching.cache-prefix", "");
+        $cachePrefix = Container::getInstance()
+            ->make("config")
+            ->get("laravel-model-caching.cache-prefix", "");
 
         if ($this->model
             && property_exists($this->model, "cachePrefix")

src/Traits/Caching.php

@@ -1,14 +1,15 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Traits;
 
-use Carbon\Carbon;
 use Closure;
 use GeneaLabs\LaravelModelCaching\CachedBuilder;
 use GeneaLabs\LaravelModelCaching\CacheKey;
 use GeneaLabs\LaravelModelCaching\CacheTags;
 use Illuminate\Cache\TaggableStore;
+use Illuminate\Container\Container;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Scope;
 use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Carbon;
 
 trait Caching
 {
@@ -62,10 +63,14 @@ protected function applyScopesToInstance()
 
     public function cache(array $tags = [])
     {
-        $cache = app('cache');
-
-        if (config('laravel-model-caching.store')) {
-            $cache = $cache->store(config('laravel-model-caching.store'));
+        $cache = Container::getInstance()
+            ->make("cache");
+        $config = Container::getInstance()
+            ->make("config")
+            ->get("laravel-model-caching.store");
+
+        if ($config) {
+            $cache = $cache->store($config);
         }
 
         if (is_subclass_of($cache->getStore(), TaggableStore::class)) {
@@ -106,7 +111,9 @@ public function flushCache(array $tags = [])
 
     protected function getCachePrefix() : string
     {
-        $cachePrefix = config("laravel-model-caching.cache-prefix", "");
+        $cachePrefix = Container::getInstance()
+            ->make("config")
+            ->get("laravel-model-caching.cache-prefix", "");
 
         if ($this->model
             && property_exists($this->model, "cachePrefix")
@@ -140,7 +147,9 @@ protected function makeCacheKey(
         }
 
         $query = $this->query
-            ?? app('db')->query();
+            ?? Container::getInstance()
+                ->make("db")
+                ->query();
 
         if ($this->query
             && method_exists($this->query, "getQuery")
@@ -160,7 +169,9 @@ protected function makeCacheTags() : array
             : $this;
         $query = $this->query instanceof Builder
             ? $this->query
-            : app('db')->query();
+            : Container::getInstance()
+                ->make("db")
+                ->query();
         $tags = (new CacheTags($eagerLoad, $model, $query))
             ->make();
 
@@ -259,8 +270,12 @@ protected function checkCooldownAndFlushAfterPersisting(Model $instance, string
 
     public function isCachable() : bool
     {
+        $isCacheDisabled = Container::getInstance()
+            ->make("config")
+            ->get("laravel-model-caching.disabled");
+
         return $this->isCachable
-            && ! config('laravel-model-caching.disabled');
+            && ! $isCacheDisabled;
     }
 
     protected function setCacheCooldownSavedAtTimestamp(Model $instance)

src/Traits/ModelCaching.php

@@ -1,11 +1,12 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Traits;
 
-use Carbon\Carbon;
 use GeneaLabs\LaravelModelCaching\CachedBelongsToMany;
 use GeneaLabs\LaravelModelCaching\CachedBuilder;
+use Illuminate\Container\Container;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Support\Carbon;
 
 trait ModelCaching
 {
@@ -39,7 +40,11 @@ public function __set($key, $value)
 
     public static function all($columns = ['*'])
     {
-        if (config('laravel-model-caching.disabled')) {
+        $isCacheDisabled = Container::getInstance()
+            ->make("config")
+            ->get("laravel-model-caching.disabled");
+
+        if ($isCacheDisabled) {
             return parent::all($columns);
         }
 

tests/Integration/CachedModelTest.php

@@ -169,7 +169,7 @@ public function testCooldownIsQueriedForCooldownModels()
         [$usesCacheCooldown, $expiresAt, $savedAt] = $method->invokeArgs($author, [$author]);
 
         $this->assertEquals($usesCacheCooldown, 1);
-        $this->assertEquals("Carbon\Carbon", get_class($expiresAt));
+        $this->assertEquals("Illuminate\Support\Carbon", get_class($expiresAt));
         $this->assertNull($savedAt);
     }