Add access key for fixer.io.

danielme85 · Aug 28, 2018 · 5a923da · 5a923da
1 parent 99fad13
commit 5a923da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/Providers/Fixer.php b/src/Providers/Fixer.php
@@ -67,9 +67,9 @@ public function download(string $currency, string $date = null) {
                 $url = 'http';
             }
             if (!empty($date)) {
-                $url .= "://data.fixer.io/api/$date?base=$currency";
+                $url .= "://data.fixer.io/api/$date?access_key=".$this->settings['fixer-access-key']."&base=$currency";
             } else {
-                $url .= "://data.fixer.io/api/latest?base=$currency";
+                $url .= "://data.fixer.io/api/latest?access_key=".$this->settings['fixer-access-key']."&base=$currency";
             }
             $this->url = $url;
             $response = $this->connect($url);
@@ -100,16 +100,15 @@ private function convert($input) : Rates
             if (!empty($data['rates'])) {
                 $rates->extra['fixer_date'] = $data['date'] ?? null;
                 foreach ($data['rates'] as $key => $row) {
-                    $newrates[$key] = $row;
+                    $rates->rates[$key] = $row;
                 }
                 //add 1:1 conversion rate from base for testing
-                $newrates[$data['base']] = 1;
+                $rates->rates[$data['base']] = 1;
             }
         }
         else {
             $rates->error = "No data in response from Fixer.io";
         }
-        $rates->rates = $newrates;
 
         return $rates;
     }

diff --git a/tests/CurrencyConvertTest.php b/tests/CurrencyConvertTest.php
@@ -116,7 +116,7 @@ public function testFixer()
         $this->assertEquals(1, $currency->convert('NOK', 'NOK', 1));
 
         //Live test
-        $currency = new Currency('currencylayer', false);
+        $currency = new Currency('fixer', false);
         $this->assertNotEmpty($currency->getRateResults());
         $this->assertNotEmpty($currency->getRateResults('USD', '2018-01-01'));
         $this->assertEquals(1, $currency->convert('USD', 'USD', 1));