Merge branch 'release/1.2.3'

Author: ed-bbwmc

src/Rest/Common/Mappers.php

@@ -92,6 +92,21 @@ public static function snapshotTicker(array $snap): array
         return $snap;
     }
 
+    /**
+     * @param array $snap
+     *
+     * @return array
+     */
+    public static function snapshotTickerV2(array $snap): array
+    {
+        $snap['day'] = Mappers::snapshotAgg($snap['day']);
+        $snap['lastQuote'] = Mappers::snapshotQuote($snap['lastQuote']);
+        $snap['min'] = Mappers::snapshotAgg($snap['min']);
+        $snap['prevDay'] = Mappers::snapshotAgg($snap['prevDay']);
+
+        return $snap;
+    }
+
     /**
      * @param array $snap
      *

src/Rest/Crypto/SnapshotSingleTickerFullBook.php

@@ -27,15 +27,16 @@ public function get($tickerSymbol): array
     protected function mapper(array $response): array
     {
         if (array_key_exists('asks', $response['data'])) {
-            $response['data']['asks'] = array_merge(
+            $response['data']['asks'] = array_map(
                 function ($ask) {
                     return Mappers::cryptoSnapshotBookItem($ask);
                 },
                 $response['data']['asks']
             );
         }
+
         if (array_key_exists('bids', $response['data'])) {
-            $response['data']['bids'] = array_merge(
+            $response['data']['bids'] = array_map(
                 function ($bid) {
                     return Mappers::cryptoSnapshotBookItem($bid);
                 },

src/Rest/Forex/Aggregates.php

@@ -24,7 +24,7 @@ class Aggregates extends RestResource
      *
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function get($tickerSymbol, $multiplier, $from, $to, $timespan = 'days', $params = []): array
+    public function get($tickerSymbol, $multiplier, $from, $to, $timespan = 'day', $params = []): array
     {
         return $this->_get('/v2/aggs/ticker/' . $tickerSymbol . '/range/' . $multiplier . '/' . $timespan . '/' . $from . '/' . $to, $params);
     }

src/Rest/Forex/GroupedDaily.php

@@ -23,7 +23,7 @@ class GroupedDaily extends RestResource
      *
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function get($date, $locale = 'US', $market = 'FX', $params = []): array
+    public function get($date, $locale = 'us', $market = 'fx', $params = []): array
     {
         return $this->_get('/v2/aggs/grouped/locale/' . $locale . '/market/' . $market . '/' . $date, $params);
     }

src/Rest/Forex/SnapshotAllTickers.php

@@ -31,7 +31,7 @@ protected function mapper(array $response): array
     {
         $response['tickers'] = array_map(
             function ($ticker) {
-                return Mappers::snapshotTicker($ticker);
+                return Mappers::snapshotTickerV2($ticker);
             },
             $response['tickers']
         );

src/Rest/Forex/SnapshotGainersLosers.php

@@ -33,7 +33,7 @@ protected function mapper(array $response): array
     {
         $response['tickers'] = array_map(
             function ($ticker) {
-                return Mappers::snapshotTicker($ticker);
+                return Mappers::snapshotTickerV2($ticker);
             },
             $response['tickers']
         );

src/Rest/Reference/TickerNews.php

@@ -8,6 +8,7 @@
  * Class TickerNews
  *
  * @package PolygonIO\rest\reference
+ * @deprecated
  */
 class TickerNews extends RestResource
 {

src/Rest/Reference/Tickers.php

@@ -8,6 +8,7 @@
  * Class Tickers
  *
  * @package PolygonIO\rest\reference
+ * @deprecated
  */
 class Tickers extends RestResource
 {

tests/Rest/Crypto/SnapshotSingleTickerFullBookTest.php

@@ -4,11 +4,13 @@
 
 use PHPUnit\Framework\TestCase;
 use PolygonIO\Rest\Crypto\SnapshotSingleTickerFullBook;
+use PolygonIO\Tests\Concerns\LoadsStub;
 use PolygonIO\Tests\Helpers\MocksHttp;
 
 class SnapshotSingleTickerFullBookTest extends TestCase
 {
     use MocksHttp;
+    use LoadsStub;
 
     public function testSnapshotSingleTickerFullbookGetCall()
     {
@@ -18,14 +20,12 @@ public function testSnapshotSingleTickerFullbookGetCall()
             = new SnapshotSingleTickerFullBook('fake-api-key');
 
         $snapshotSingleTickerFullBook->httpClient = $this->getHttpMock(
-            $requestsContainer, [
-                'data' => [],
-            ]
+            $requestsContainer, $this->loadJsonStubFile('api/v2/snapshot/locale/global/markets/crypto/tickers/X:BTCUSD/book.json')
         );
 
-        $snapshotSingleTickerFullBook->get('BTC-ETH');
+        $snapshotSingleTickerFullBook->get('X:BTCUSD');
 
         $this->assertPath($requestsContainer,
-            '/v2/snapshot/locale/global/markets/crypto/tickers/BTC-ETH/book');
+            '/v2/snapshot/locale/global/markets/crypto/tickers/X:BTCUSD/book');
     }
 }

tests/Rest/Crypto/SnapshotSingleTickerTest.php

@@ -3,11 +3,13 @@
 namespace PolygonIO\Tests\Rest\Crypto;
 
 use PolygonIO\Rest\Crypto\SnapshotSingleTicker;
+use PolygonIO\Tests\Concerns\LoadsStub;
 use PolygonIO\Tests\Helpers\MocksHttp;
 
 class SnapshotSingleTickerTest extends \PHPUnit\Framework\TestCase
 {
     use MocksHttp;
+    use LoadsStub;
 
     public function testSnapshotSingleTickerGetCall()
     {
@@ -16,42 +18,11 @@ public function testSnapshotSingleTickerGetCall()
         $singleTicker = new SnapshotSingleTicker('fake-api-key');
 
         $singleTicker->httpClient = $this->getHttpMock(
-            $requestsContainer, [
-                'ticker' => [
-                    'day' => [
-                        'c' => 'c',
-                        'h' => 'h',
-                        'l' => 'l',
-                        'o' => 'o',
-                        'v' => 'v',
-                    ],
-                    'lastTrade' => [
-                        'p' => 'p',
-                        's' => 's',
-                        'x' => 'x',
-                        'c' => 'c',
-                        't' => 't',
-                    ],
-                    'min' => [
-                        'c' => 'c',
-                        'h' => 'h',
-                        'l' => 'l',
-                        'o' => 'o',
-                        'v' => 'v',
-                    ],
-                    'prevDay' => [
-                        'c' => 'c',
-                        'h' => 'h',
-                        'l' => 'l',
-                        'o' => 'o',
-                        'v' => 'v',
-                    ],
-                ],
-            ]
+            $requestsContainer, $this->loadJsonStubFile('api/v2/snapshot/locale/global/markets/crypto/tickers/X:BTCUSD.json')
         );
 
-        $singleTicker->get('BTC-ETH');
+        $singleTicker->get('X:BTCUSD');
 
-        $this->assertPath($requestsContainer, '/v2/snapshot/locale/global/markets/crypto/tickers/BTC-ETH');
+        $this->assertPath($requestsContainer, '/v2/snapshot/locale/global/markets/crypto/tickers/X:BTCUSD');
     }
 }