phan fixes

Author: Jimbolino

src/ServiceProvider.php

@@ -4,8 +4,6 @@
 
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider as IlluminateServiceProvider;
-use MikeFrancis\LaravelUnleash\Unleash;
-use MikeFrancis\LaravelUnleash\Client;
 use GuzzleHttp\ClientInterface;
 
 class ServiceProvider extends IlluminateServiceProvider
@@ -42,6 +40,7 @@ public function boot()
             function (string $feature) {
                 $client = app(Client::class);
                 $unleash = app(Unleash::class, ['client' => $client]);
+                assert($unleash instanceof Unleash);
 
                 return $unleash->isFeatureEnabled($feature);
             }
@@ -52,6 +51,7 @@ function (string $feature) {
             function (string $feature) {
                 $client = app(Client::class);
                 $unleash = app(Unleash::class, ['client' => $client]);
+                assert($unleash instanceof Unleash);
 
                 return !$unleash->isFeatureEnabled($feature);
             }
@@ -60,8 +60,6 @@ function (string $feature) {
 
     /**
      * Get the path to the config.
-     *
-     * @return string
      */
     private function getConfigPath(): string
     {

src/Strategies/ApplicationHostnameStrategy.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
 use MikeFrancis\LaravelUnleash\Strategies\Contracts\Strategy;
 
 class ApplicationHostnameStrategy implements Strategy

src/Strategies/Contracts/DynamicStrategy.php

@@ -9,8 +9,7 @@ interface DynamicStrategy
     /**
      * @param array $params Strategy Configuration from Unleash
      * @param Request $request Current Request
-     * @param mixed $args An arbitrary number of arguments passed to isFeatureEnabled/Disabled
-     * @return bool
+     * @param mixed ...$args An arbitrary number of arguments passed to isFeatureEnabled/Disabled
      */
     public function isEnabled(array $params, Request $request, ...$args): bool;
 }

src/Strategies/Contracts/Strategy.php

@@ -9,7 +9,6 @@ interface Strategy
     /**
      * @param array $params Strategy Configuration from Unleash
      * @param Request $request Current Request
-     * @return bool
      */
     public function isEnabled(array $params, Request $request): bool;
 }

src/Strategies/DefaultStrategy.php

@@ -7,6 +7,10 @@
 
 class DefaultStrategy implements Strategy
 {
+    /**
+     * @unused-param $params
+     * @unused-param $request
+     */
     public function isEnabled(array $params, Request $request): bool
     {
         return true;

src/Unleash.php

@@ -2,18 +2,15 @@
 
 namespace MikeFrancis\LaravelUnleash;
 
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Exception\InvalidArgumentException;
+use GuzzleHttp\Client;
 use GuzzleHttp\Exception\TransferException;
 use Illuminate\Contracts\Cache\Repository as Cache;
 use Illuminate\Contracts\Config\Repository as Config;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
+use JsonException;
 use MikeFrancis\LaravelUnleash\Strategies\Contracts\DynamicStrategy;
 use MikeFrancis\LaravelUnleash\Strategies\Contracts\Strategy;
-use Symfony\Component\HttpFoundation\Exception\JsonException;
-
-use function GuzzleHttp\json_decode;
 
 class Unleash
 {
@@ -26,7 +23,7 @@ class Unleash
     protected $features;
     protected $expires;
 
-    public function __construct(ClientInterface $client, Cache $cache, Config $config, Request $request)
+    public function __construct(Client $client, Cache $cache, Config $config, Request $request)
     {
         $this->client = $client;
         $this->cache = $cache;
@@ -109,7 +106,7 @@ public function isFeatureEnabled(string $name, ...$args): bool
 
             $params = Arr::get($strategyData, 'parameters', []);
 
-            if ($strategy->isEnabled($params, $this->request, ...$args)) {
+            if ($strategy->isEnabled($params, $this->request, ...$args)) { // @phan-suppress-current-line PhanParamTooManyUnpack
                 return true;
             }
         }
@@ -124,7 +121,9 @@ public function isFeatureDisabled(string $name, ...$args): bool
 
     public function refreshCache()
     {
-        $this->fetchFeatures();
+        if ($this->config->get('unleash.isEnabled') && $this->config->get('unleash.cache.isEnabled')) {
+            $this->fetchFeatures();
+        }
     }
 
     protected function isFresh(): bool
@@ -156,11 +155,7 @@ protected function fetchFeatures(): array
     {
         $response = $this->client->get($this->config->get('unleash.featuresEndpoint'));
 
-        try {
-            $data = json_decode((string)$response->getBody(), true, 512, \JSON_BIGINT_AS_STRING);
-        } catch (InvalidArgumentException $e) {
-            throw new JsonException('Could not decode unleash response body.', $e->getCode(), $e);
-        }
+        $data = (array) json_decode((string)$response->getBody(), true, 512, JSON_BIGINT_AS_STRING + JSON_THROW_ON_ERROR);
 
         $data['expires'] = $this->setExpires();