Merge pull request #19 from xterr/master

Fixed PhpArray provider to support rates and historicalRates

Author: florianv

DependencyInjection/Configuration.php

@@ -144,14 +144,28 @@ public function getConfigTreeBuilder()
                                                 return true;
                                             }
 
-                                            foreach ($config as $entry) {
-                                                if (!is_array($entry) || empty($entry)) {
-                                                    return true;
-                                                }
+                                            if (!$this->validateArrayProviderEntry($config)) {
+                                                return true;
+                                            }
+
+                                            return false;
+                                        })
+                                        ->thenInvalid('Invalid configuration for array provider.')
+                                    ->end()
+                                ->end()
+                                ->variableNode('historicalRates')
+                                    ->treatFalseLike(null)
+                                    ->treatTrueLike(null)
+                                    ->isRequired()
+                                    ->cannotBeEmpty()
+                                    ->validate()
+                                        ->ifTrue(function($config) {
+                                            if (!is_array($config) || empty($config)) {
+                                                return true;
+                                            }
 
-                                                if (!$this->validateArrayProviderEntry($entry)) {
-                                                    return true;
-                                                }
+                                            if (!$this->validateArrayProviderEntry($config)) {
+                                                return true;
                                             }
 
                                             return false;

Resources/doc/index.md

@@ -66,10 +66,9 @@ florianv_swap:
             token: secret
         array:
             rates:
-                -
                     'EUR/GBP': 1.5
                     'EUR/USD': 1.1
-                -
+            historicalRates:
                     '2017-01-01':
                         'EUR/GBP': 1.5
                         'EUR/USD': 1.1

Tests/DependencyInjection/ConfigurationTest.php

@@ -127,17 +127,15 @@ public function provideValidProvidersConfigs()
             [[
                 'array' => [
                     'rates' => [
-                        [
-                            'EUR/USD' => 1.1,
-                            'EUR/GBP' => 1.5,
+                        'EUR/USD' => 1.1,
+                        'EUR/GBP' => 1.5,
+                    ],
+                    'historicalRates' => [
+                        '2017-01-01' => [
+                            'EUR/USD' => 1.5,
                         ],
-                        [
-                            '2017-01-01' => [
-                                'EUR/USD' => 1.5,
-                            ],
-                            '2017-01-03' => [
-                                'EUR/GBP' => 1.3,
-                            ],
+                        '2017-01-03' => [
+                            'EUR/GBP' => 1.3,
                         ],
                     ],
                 ],