Update to Swap 3.4

Author: florianv

DependencyInjection/Configuration.php

@@ -54,7 +54,17 @@ public function getConfigTreeBuilder()
                 ->end()
                 ->arrayNode('providers')
                     ->children()
-                        ->append($this->createSimpleProviderNode('fixer'))
+                        ->arrayNode('fixer')
+                            ->children()
+                                ->integerNode('priority')->defaultValue(0)->end()
+                                ->scalarNode('access_key')
+                                    ->treatFalseLike(null)
+                                    ->treatTrueLike(null)
+                                    ->isRequired()
+                                    ->cannotBeEmpty()
+                                ->end()
+                            ->end()
+                        ->end()
                         ->append($this->createSimpleProviderNode('google'))
                         ->append($this->createSimpleProviderNode('cryptonator'))
                         ->append($this->createSimpleProviderNode('webservicex'))

Resources/doc/index.md

@@ -28,7 +28,8 @@ public function registerBundles()
 florianv_swap:
     providers:
         google: ~                          # Google Finance  
-        fixer: ~                           # Fixer
+        fixer:
+            access_key: secret             # Fixer
         webservicex: ~                     # WebserviceX 
         cryptonator: ~                     # Cryptonator 
         russian_central_bank: ~            # Russian Central Bank
@@ -67,6 +68,7 @@ florianv_swap:
         google: ~
             #priority: 0 (default)
         fixer: 
+            access_key: secret
             priority: 1
 ```
 

Tests/DependencyInjection/ConfigurationTest.php

@@ -83,7 +83,7 @@ public function testValidCacheConfig(array $cache)
     {
         $this->processor->processConfiguration($this->configuration, [
             'florianv_swap' => [
-                'providers' => ['fixer' => null],
+                'providers' => ['fixer' => ['access_key' => 'YOUR_KEY']],
                 'cache'     => $cache,
             ],
         ]);
@@ -100,7 +100,7 @@ public function testInvalidCacheConfig(array $cache)
 
         $this->processor->processConfiguration($this->configuration, [
             'florianv_swap' => [
-                'providers' => ['fixer' => null],
+                'providers' => ['fixer' => ['access_key' => 'YOUR_KEY']],
                 'cache'     => $cache,
             ],
         ]);
@@ -112,7 +112,7 @@ public function provideValidProvidersConfigs()
             [['central_bank_of_czech_republic' => null]],
             [['central_bank_of_republic_turkey' => []]],
             [['european_central_bank' => null]],
-            [['fixer' => null]],
+            [['fixer' => ['access_key' => 'YOUR_KEY']]],
             [['google' => null]],
             [['national_bank_of_romania' => null]],
             [['webservicex' => null]],

Tests/DependencyInjection/FlorianvSwapExtensionTest.php

@@ -67,7 +67,7 @@ public function testNoProvider()
 
     public function testFixerProvider()
     {
-        $this->buildContainer(['fixer' => null]);
+        $this->buildContainer(['fixer' => ['access_key' => 'test']]);
     }
 
     public function testForgeProvider()
@@ -78,7 +78,7 @@ public function testForgeProvider()
     public function testProviderPriorities()
     {
         $this->buildContainer([
-            'fixer' => null,
+            'fixer' => ['access_key' => 'YOUR_KEY'],
             'google' => [
                 'priority' => 3,
             ],
@@ -104,19 +104,19 @@ public function testProviderPriorities()
         // Fixer third
         $this->assertEquals($calls[2][0], 'add');
         $this->assertEquals($calls[2][1][0], 'fixer');
-        $this->assertEquals($calls[2][1][1], []);
+        $this->assertEquals($calls[2][1][1], ['access_key' => 'YOUR_KEY']);
     }
 
     public function testCacheMissTtl()
     {
         $this->expectException(InvalidConfigurationException::class);
 
-        $this->buildContainer(['fixer' => null], ['ttl' => null]);
+        $this->buildContainer(['fixer' => ['access_key' => 'YOUR_KEY']], ['ttl' => null]);
     }
 
     public function testArrayCache()
     {
-        $this->buildContainer(['fixer' => null], ['type' => 'array', 'ttl' => 60]);
+        $this->buildContainer(['fixer' => ['access_key' => 'YOUR_KEY']], ['type' => 'array', 'ttl' => 60]);
 
         $this->assertCache(Adapter\ArrayAdapter::class, [60]);
     }
@@ -127,14 +127,14 @@ public function testApcuCache()
             $this->markTestSkipped('APCU is not enabled');
         }
 
-        $this->buildContainer(['fixer' => null], ['type' => 'apcu']);
+        $this->buildContainer(['fixer' => ['access_key' => 'YOUR_KEY']], ['type' => 'apcu']);
 
         $this->assertCache(Adapter\ApcuAdapter::class, ['swap', 3600]);
     }
 
     public function testFilesystemCache()
     {
-        $this->buildContainer(['fixer' => null], ['type' => 'filesystem']);
+        $this->buildContainer(['fixer' => ['access_key' => 'YOUR_KEY']], ['type' => 'filesystem']);
 
         $this->assertCache(Adapter\FilesystemAdapter::class, ['swap', 3600]);
     }
@@ -145,7 +145,7 @@ public function testFilesystemCache()
      * @param array $providers
      * @param array $cache
      */
-    private function buildContainer(array $providers = ['fixer' => null], array $cache = [])
+    private function buildContainer(array $providers = ['fixer' => ['access_key' => 'test']], array $cache = [])
     {
         $this->extension->load([
             'florianv_swap' => [

composer.json

@@ -15,7 +15,7 @@
     "require": {
         "php": "^5.6|^7.0",
         "symfony/framework-bundle": "~3.0",
-        "florianv/swap": "~3.0"
+        "florianv/swap": "^3.4"
     },
     "require-dev": {
         "php-http/guzzle6-adapter": "^1.0",