refactor: use Cache::rememberForever method (#252)

monicahq · Aug 13, 2022 · cf1e4da · cf1e4da
1 parent 7dc3f8a
commit cf1e4da
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 50 deletions.
diff --git a/src/Commands/Reload.php b/src/Commands/Reload.php
@@ -3,8 +3,8 @@
 namespace Monicahq\Cloudflare\Commands;
 
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Cache\Factory;
-use Illuminate\Contracts\Config\Repository;
+use Illuminate\Contracts\Cache\Factory as Cache;
+use Illuminate\Contracts\Config\Repository as Config;
 use Monicahq\Cloudflare\LaravelCloudflare;
 
 class Reload extends Command
@@ -26,11 +26,11 @@ class Reload extends Command
     /**
      * Execute the console command.
      *
-     * @param  Factory  $cache
-     * @param  Repository  $config
+     * @param  \Illuminate\Contracts\Cache\Factory  $cache
+     * @param  \Illuminate\Contracts\Config\Repository  $config
      * @return void
      */
-    public function handle(Factory $cache, Repository $config)
+    public function handle(Cache $cache, Config $config)
     {
         $proxies = LaravelCloudflare::getProxies();
 

diff --git a/src/Commands/View.php b/src/Commands/View.php
@@ -3,8 +3,8 @@
 namespace Monicahq\Cloudflare\Commands;
 
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Cache\Factory;
-use Illuminate\Contracts\Config\Repository;
+use Illuminate\Contracts\Cache\Factory as Cache;
+use Illuminate\Contracts\Config\Repository as Config;
 
 class View extends Command
 {
@@ -25,22 +25,16 @@ class View extends Command
     /**
      * Execute the console command.
      *
-     * @param  Factory  $cache
-     * @param  Repository  $config
+     * @param  \Illuminate\Contracts\Cache\Factory  $cache
+     * @param  \Illuminate\Contracts\Config\Repository  $config
      * @return void
      */
-    public function handle(Factory $cache, Repository $config)
+    public function handle(Cache $cache, Config $config)
     {
         $proxies = $cache->store()->get($config->get('laravelcloudflare.cache'), []);
 
-        $rows = array_map(function ($value): array {
-            return [
-                $value,
-            ];
-        }, $proxies);
+        $rows = array_map(fn ($value): array => [$value], $proxies);
 
-        $this->table([
-            'Address',
-        ], $rows);
+        $this->table(['Address'], $rows);
     }
 }
diff --git a/src/Http/Middleware/TrustProxies.php b/src/Http/Middleware/TrustProxies.php
@@ -18,11 +18,7 @@ class TrustProxies extends Middleware
     protected function setTrustedProxyIpAddresses(Request $request)
     {
         $cacheKey = Config::get('laravelcloudflare.cache');
-        $cachedProxies = Cache::get($cacheKey, function () use ($cacheKey) {
-            return tap(LaravelCloudflare::getProxies(), function ($proxies) use ($cacheKey) {
-                Cache::forever($cacheKey, $proxies);
-            });
-        });
+        $cachedProxies = Cache::rememberForever($cacheKey, fn () => LaravelCloudflare::getProxies());
 
         if (is_array($cachedProxies) && count($cachedProxies) > 0) {
             $this->proxies = array_merge((array) $this->proxies, $cachedProxies);

diff --git a/tests/FeatureTestCase.php b/tests/FeatureTestCase.php
@@ -18,8 +18,6 @@ protected function resolveApplicationCore($app)
     {
         parent::resolveApplicationCore($app);
 
-        $app->detectEnvironment(function () {
-            return 'testing';
-        });
+        $app->detectEnvironment(fn () => 'testing');
     }
 }
diff --git a/tests/Unit/Http/Middleware/TrustProxiesTest.php b/tests/Unit/Http/Middleware/TrustProxiesTest.php
@@ -4,61 +4,63 @@
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
-use Monicahq\Cloudflare\Facades\CloudflareProxies;
 use Monicahq\Cloudflare\Http\Middleware\TrustProxies;
+use Monicahq\Cloudflare\LaravelCloudflare;
 use Monicahq\Cloudflare\Tests\FeatureTestCase;
 
 class TrustProxiesTest extends FeatureTestCase
 {
     /** @test */
     public function it_sets_trusted_proxies()
     {
-        Cache::shouldReceive('get')
+        Cache::shouldReceive('rememberForever')
             ->with('cloudflare.proxies', \Closure::class)
             ->andReturn(['expect']);
 
         $request = new Request();
 
-        $this->app->make(TrustProxies::class)->handle($request, function () {
-        });
+        $this->app->make(TrustProxies::class)->handle($request, fn () => null);
 
         $proxies = $request->getTrustedProxies();
 
         $this->assertEquals(['expect'], $proxies);
     }
 
     /** @test */
-    public function it_does_not_sets_trusted_proxies()
+    public function it_sets_trusted_proxies_with_cache()
     {
-        Cache::shouldReceive('get')
-            ->with('cloudflare.proxies', \Closure::class)
-            ->andReturn([]);
+        LaravelCloudflare::getProxiesUsing(function () {
+            return ['expect'];
+        });
 
-        $request = new Request();
+        try {
+            $request = new Request();
 
-        $this->app->make(TrustProxies::class)->handle($request, function () {
-        });
+            $this->app->make(TrustProxies::class)->handle($request, fn () => null);
 
-        $proxies = $request->getTrustedProxies();
+            $proxies = $request->getTrustedProxies();
 
-        $this->assertEquals([], $proxies);
+            $this->assertEquals(['expect'], $proxies);
+            $this->assertTrue(Cache::has('cloudflare.proxies'));
+            $this->assertEquals(['expect'], Cache::get('cloudflare.proxies'));
+        } finally {
+            LaravelCloudflare::getProxiesUsing(null);
+        }
     }
 
     /** @test */
-    public function it_load_trustproxies()
+    public function it_does_not_sets_trusted_proxies()
     {
-        CloudflareProxies::shouldReceive('load')
-            ->once()
-            ->andReturn(['expect']);
+        Cache::shouldReceive('rememberForever')
+            ->with('cloudflare.proxies', \Closure::class)
+            ->andReturn([]);
 
         $request = new Request();
 
-        $this->app->make(TrustProxies::class)->handle($request, function () {
-        });
+        $this->app->make(TrustProxies::class)->handle($request, fn () => null);
 
         $proxies = $request->getTrustedProxies();
 
-        $this->assertEquals(['expect'], $proxies);
-        $this->assertEquals(['expect'], $this->app['cache']->get('cloudflare.proxies'));
+        $this->assertEquals([], $proxies);
     }
 }
diff --git a/tests/Unit/LaravelCloudflareTest.php b/tests/Unit/LaravelCloudflareTest.php
@@ -3,6 +3,8 @@
 namespace Monicahq\Cloudflare\Tests\Unit;
 
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use Monicahq\Cloudflare\Facades\CloudflareProxies;
 use Monicahq\Cloudflare\Http\Middleware\TrustProxies;
 use Monicahq\Cloudflare\LaravelCloudflare;
 use Monicahq\Cloudflare\Tests\FeatureTestCase;
@@ -22,14 +24,34 @@ public function it_call_callback()
             return ['expect'];
         });
 
+        try {
+            $request = new Request();
+
+            $this->app->make(TrustProxies::class)->handle($request, fn () => null);
+
+            $proxies = $request->getTrustedProxies();
+
+            $this->assertTrue(static::$run);
+            $this->assertEquals(['expect'], $proxies);
+        } finally {
+            LaravelCloudflare::getProxiesUsing(null);
+        }
+    }
+
+    /** @test */
+    public function it_call_load()
+    {
+        CloudflareProxies::shouldReceive('load')
+            ->once()
+            ->andReturn(['expect']);
+
         $request = new Request();
 
-        $this->app->make(TrustProxies::class)->handle($request, function () {
-        });
+        $this->app->make(TrustProxies::class)->handle($request, fn () => null);
 
         $proxies = $request->getTrustedProxies();
 
-        $this->assertTrue(static::$run);
         $this->assertEquals(['expect'], $proxies);
+        $this->assertEquals(['expect'], Cache::get('cloudflare.proxies'));
     }
 }