Merge pull request #24 from worksome/feature/frankfurter

feat: prepare for 2.x release

.github/workflows/phpstan.yml → .github/workflows/static.yml

@@ -1,4 +1,4 @@
-name: PHPStan
+name: Static Analysis
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
 
 jobs:
   phpstan:
-    name: phpstan
+    name: PHPStan
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/run-tests.yml → .github/workflows/tests.yml

@@ -1,4 +1,4 @@
-name: run-tests
+name: Tests
 
 on:
   push:

README.md

@@ -2,8 +2,10 @@
 
 Check exchange rates for any currency in Laravel
 
-[![Tests](https://github.com/worksome/exchange/actions/workflows/run-tests.yml/badge.svg)](https://github.com/worksome/exchange/actions/workflows/run-tests.yml)
-[![PHPStan](https://github.com/worksome/exchange/actions/workflows/phpstan.yml/badge.svg)](https://github.com/worksome/exchange/actions/workflows/phpstan.yml)
+[![Latest Version on Packagist](https://img.shields.io/packagist/v/worksome/exchange.svg?style=flat-square)](https://packagist.org/packages/worksome/exchange)
+[![GitHub Tests Action Status](https://img.shields.io/github/actions/workflow/status/worksome/exchange/tests.yml?branch=main&style=flat-square&label=Tests)](https://github.com/worksome/exchange/actions?query=workflow%3ATests+branch%3Amain)
+[![GitHub Static Analysis Action Status](https://img.shields.io/github/actions/workflow/status/worksome/exchange/static.yml?branch=main&style=flat-square&label=Static%20Analysis)](https://github.com/worksome/exchange/actions?query=workflow%3A"Static%20Analysis"+branch%3Amain)
+[![Total Downloads](https://img.shields.io/packagist/dt/worksome/exchange.svg?style=flat-square)](https://packagist.org/packages/worksome/exchange)
 
 If your app supports multi-currency, you'll no doubt need to check exchange rates. There are many third party services
 to accomplish this, but why bother reinventing the wheel when we've done all the hard work for you?
@@ -91,7 +93,7 @@ In your `exchange.php` config file, set `default` to `cache`, or set `EXCHANGE_D
 You'll also want to pick a strategy under `services.cache.strategy`. By default, this will be `fixer`, but you are free to change that.
 The strategy is the service that will be used to perform the exchange rate lookup when nothing is found in the cache.
 
-There is also the option to override the `ttl` (how many seconds rates are cached for) and `key` for your cached rates.
+There is also the option to override the `ttl` (how many seconds rates are cached for), `key` for your cached rates, and the `store`.
 
 ## Artisan
 
@@ -130,7 +132,7 @@ composer test
 
 ## Changelog
 
-Please see [CHANGELOG](CHANGELOG.md) for more information on what has changed recently.
+Please see [GitHub Releases](https://github.com/worksome/exchange/releases) for more information on what has changed recently.
 
 ## Credits
 

composer.json

@@ -28,7 +28,7 @@
         "orchestra/testbench": "^8.0 || ^9.0",
         "pestphp/pest": "^2.33",
         "pestphp/pest-plugin-laravel": "^2.2",
-        "worksome/coding-style": "^2.8"
+        "worksome/coding-style": "^2.10"
     },
     "autoload": {
         "psr-4": {

config/exchange.php

@@ -11,7 +11,7 @@
      * Supported: 'null', 'fixer', 'exchange_rate', 'frankfurter', 'cache'
      */
 
-    'default' => env('EXCHANGE_DRIVER', 'exchange_rate'),
+    'default' => env('EXCHANGE_DRIVER', 'frankfurter'),
 
     'services' => [
 
@@ -58,10 +58,10 @@
         */
 
         'cache' => [
-            'strategy' => 'exchange_rate',
-            'ttl' => 60 * 60 * 24, // 24 hours
-            'key' => 'cached_exchange_rates',
-            'store' => null,
+            'strategy' => env('EXCHANGE_RATES_CACHE_STRATEGY', 'frankfurter'),
+            'ttl' => env('EXCHANGE_RATES_CACHE_TTL', 60 * 60 * 24), // 24 hours
+            'key' => env('EXCHANGE_RATES_CACHE_KEY', 'cached_exchange_rates'),
+            'store' => env('EXCHANGE_RATES_CACHE_STORE'),
         ],
     ],
 

src/Facades/Exchange.php

@@ -20,9 +20,9 @@ final class Exchange extends Facade
      */
     public static function fake(array $rates = []): void
     {
-
         /**
          * @var \Worksome\Exchange\Exchange $fake
+         *
          * @phpstan-ignore-next-line
          */
         $fake = self::$app->instance(\Worksome\Exchange\Exchange::class, self::getFacadeRoot());

src/Support/ExchangeRateManager.php

@@ -4,7 +4,6 @@
 
 namespace Worksome\Exchange\Support;
 
-use Illuminate\Cache\Repository;
 use Illuminate\Contracts\Cache\Factory as CacheFactory;
 use Illuminate\Http\Client\Factory;
 use Illuminate\Support\Manager;