Merge pull request #127 from nicklaw5/v5-0-2

nicklaw5 · Jun 3, 2021 · f6406f6 · f6406f6
2 parents a59f713 + 4e1a2fc
commit f6406f6
Show file tree

Hide file tree

Showing 27 changed files with 95 additions and 194 deletions.
diff --git a/spec/NewTwitchApi/HelixGuzzleClientSpec.php b/spec/NewTwitchApi/HelixGuzzleClientSpec.php
@@ -2,15 +2,19 @@
 
 namespace spec\NewTwitchApi;
 
-use GuzzleHttp\Psr7\Uri;
+use NewTwitchApi\HelixGuzzleClient;
 use PhpSpec\ObjectBehavior;
 
 class HelixGuzzleClientSpec extends ObjectBehavior
 {
+    function let(HelixGuzzleClient $guzzleClient)
+    {
+        $this->beConstructedWith('TEST_CLIENT_ID');
+    }
+
     function it_should_have_correct_base_uri()
     {
-        $this->beConstructedThrough('getClient', ['client-id']);
-        $this->shouldHaveType('\GuzzleHttp\Client');
+        $this->shouldHaveType('\NewTwitchApi\HelixGuzzleClient');
 
         /** @var Uri $uri */
         $uri = $this->getConfig('base_uri');
@@ -21,22 +25,21 @@ function it_should_have_correct_base_uri()
 
     function it_should_have_client_id_header()
     {
-        $this->beConstructedThrough('getClient', ['client-id']);
-        $this->shouldHaveType('\GuzzleHttp\Client');
-        $this->getConfig('headers')->shouldHaveKeyWithValue('Client-ID', 'client-id');
+        $this->shouldHaveType('\NewTwitchApi\HelixGuzzleClient');
+        $this->getConfig('headers')->shouldHaveKeyWithValue('Client-ID', 'TEST_CLIENT_ID');
     }
 
     function it_should_have_json_content_type_header()
     {
-        $this->beConstructedThrough('getClient', ['client-id']);
-        $this->shouldHaveType('\GuzzleHttp\Client');
+
+        $this->shouldHaveType('\NewTwitchApi\HelixGuzzleClient');
         $this->getConfig('headers')->shouldHaveKeyWithValue('Content-Type', 'application/json');
     }
 
     function it_should_have_passed_in_config_params_instead_of_defaults()
     {
-        $this->beConstructedThrough('getClient', ['client-id', ['base_uri' => 'https://different.url']]);
-        $this->shouldHaveType('\GuzzleHttp\Client');
+        $this->beConstructedWith('TEST_CLIENT_ID', ['base_uri' => 'https://different.url']);
+        $this->shouldHaveType('\NewTwitchApi\HelixGuzzleClient');
         $this->getConfig('base_uri')->getHost()->shouldBe('different.url');
     }
 }
diff --git a/spec/NewTwitchApi/NewTwitchApiSpec.php b/spec/NewTwitchApi/NewTwitchApiSpec.php
@@ -2,8 +2,8 @@
 
 namespace spec\NewTwitchApi;
 
-use GuzzleHttp\Client;
 use NewTwitchApi\RequestGenerator;
+use NewTwitchApi\HelixGuzzleClient;
 use NewTwitchApi\Auth\OauthApi;
 use NewTwitchApi\Resources\AdsApi;
 use NewTwitchApi\Resources\AnalyticsApi;
@@ -28,7 +28,7 @@
 
 class NewTwitchApiSpec extends ObjectBehavior
 {
-    function let(Client $guzzleClient)
+    function let(HelixGuzzleClient $guzzleClient)
     {
         $this->beConstructedWith($guzzleClient, 'client-id', 'client-secret');
     }

diff --git a/spec/NewTwitchApi/Resources/AdsApiSpec.php b/spec/NewTwitchApi/Resources/AdsApiSpec.php
@@ -2,15 +2,15 @@
 
 namespace spec\NewTwitchApi\Resources;
 
-use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use NewTwitchApi\RequestGenerator;
+use NewTwitchApi\HelixGuzzleClient;
 use PhpSpec\ObjectBehavior;
 
 class AdsApiSpec extends ObjectBehavior
 {
-    function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
+    function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
     {
         $this->beConstructedWith($guzzleClient, $requestGenerator);
         $guzzleClient->send($request)->willReturn($response);

diff --git a/spec/NewTwitchApi/Resources/AnalyticsApiSpec.php b/spec/NewTwitchApi/Resources/AnalyticsApiSpec.php
@@ -2,15 +2,15 @@
 
 namespace spec\NewTwitchApi\Resources;
 
-use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use NewTwitchApi\RequestGenerator;
+use NewTwitchApi\HelixGuzzleClient;
 use PhpSpec\ObjectBehavior;
 
 class AnalyticsApiSpec extends ObjectBehavior
 {
-    function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
+    function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
     {
         $this->beConstructedWith($guzzleClient, $requestGenerator);
         $guzzleClient->send($request)->willReturn($response);

diff --git a/spec/NewTwitchApi/Resources/BitsApiSpec.php b/spec/NewTwitchApi/Resources/BitsApiSpec.php
@@ -2,15 +2,15 @@
 
 namespace spec\NewTwitchApi\Resources;
 
-use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use NewTwitchApi\RequestGenerator;
+use NewTwitchApi\HelixGuzzleClient;
 use PhpSpec\ObjectBehavior;
 
 class BitsApiSpec extends ObjectBehavior
 {
-    function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
+    function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
     {
         $this->beConstructedWith($guzzleClient, $requestGenerator);
         $guzzleClient->send($request)->willReturn($response);

diff --git a/spec/NewTwitchApi/Resources/ChannelPointsApiSpec.php b/spec/NewTwitchApi/Resources/ChannelPointsApiSpec.php
@@ -2,15 +2,15 @@
 
 namespace spec\NewTwitchApi\Resources;
 
-use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use NewTwitchApi\RequestGenerator;
+use NewTwitchApi\HelixGuzzleClient;
 use PhpSpec\ObjectBehavior;
 
 class ChannelPointsApiSpec extends ObjectBehavior
 {
-    function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
+    function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
     {
         $this->beConstructedWith($guzzleClient, $requestGenerator);
         $guzzleClient->send($request)->willReturn($response);

diff --git a/spec/NewTwitchApi/Resources/ChannelsApiSpec.php b/spec/NewTwitchApi/Resources/ChannelsApiSpec.php
@@ -2,15 +2,15 @@
 
 namespace spec\NewTwitchApi\Resources;
 
-use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use NewTwitchApi\RequestGenerator;
+use NewTwitchApi\HelixGuzzleClient;
 use PhpSpec\ObjectBehavior;
 
 class ChannelsApiSpec extends ObjectBehavior
 {
-    function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
+    function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
     {
         $this->beConstructedWith($guzzleClient, $requestGenerator);
         $guzzleClient->send($request)->willReturn($response);

diff --git a/spec/NewTwitchApi/Resources/ChatApiSpec.php b/spec/NewTwitchApi/Resources/ChatApiSpec.php
@@ -2,15 +2,15 @@
 
 namespace spec\NewTwitchApi\Resources;
 
-use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use NewTwitchApi\RequestGenerator;
+use NewTwitchApi\HelixGuzzleClient;
 use PhpSpec\ObjectBehavior;
 
 class ChatApiSpec extends ObjectBehavior
 {
-    function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
+    function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
     {
         $this->beConstructedWith($guzzleClient, $requestGenerator);
         $guzzleClient->send($request)->willReturn($response);

diff --git a/spec/NewTwitchApi/Resources/EntitlementsApiSpec.php b/spec/NewTwitchApi/Resources/EntitlementsApiSpec.php
@@ -2,15 +2,15 @@
 
 namespace spec\NewTwitchApi\Resources;
 
-use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use NewTwitchApi\RequestGenerator;
+use NewTwitchApi\HelixGuzzleClient;
 use PhpSpec\ObjectBehavior;
 
 class EntitlementsApiSpec extends ObjectBehavior
 {
-    function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
+    function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
     {
         $this->beConstructedWith($guzzleClient, $requestGenerator);
         $guzzleClient->send($request)->willReturn($response);

diff --git a/spec/NewTwitchApi/Resources/EventSubApiSpec.php b/spec/NewTwitchApi/Resources/EventSubApiSpec.php
@@ -2,10 +2,10 @@
 
 namespace spec\NewTwitchApi\Resources;
 
-use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use NewTwitchApi\RequestGenerator;
+use NewTwitchApi\HelixGuzzleClient;
 use PhpSpec\ObjectBehavior;
 
 class EventSubApiSpec extends ObjectBehavior
@@ -31,7 +31,7 @@ private function createEventSubSubscription(string $type, string $version, array
         return $requestGenerator->generate('POST', 'eventsub/subscriptions', $this->bearer, [], $bodyParams);
     }
 
-    function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
+    function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
     {
         $this->beConstructedWith($guzzleClient, $requestGenerator);
         $guzzleClient->send($request)->willReturn($response);

diff --git a/spec/NewTwitchApi/Resources/GamesApiSpec.php b/spec/NewTwitchApi/Resources/GamesApiSpec.php
@@ -2,15 +2,15 @@
 
 namespace spec\NewTwitchApi\Resources;
 
-use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use NewTwitchApi\RequestGenerator;
+use NewTwitchApi\HelixGuzzleClient;
 use PhpSpec\ObjectBehavior;
 
 class GamesApiSpec extends ObjectBehavior
 {
-    function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
+    function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
     {
         $this->beConstructedWith($guzzleClient, $requestGenerator);
         $guzzleClient->send($request)->willReturn($response);

diff --git a/spec/NewTwitchApi/Resources/ModerationApiSpec.php b/spec/NewTwitchApi/Resources/ModerationApiSpec.php
@@ -2,15 +2,15 @@
 
 namespace spec\NewTwitchApi\Resources;
 
-use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use NewTwitchApi\RequestGenerator;
+use NewTwitchApi\HelixGuzzleClient;
 use PhpSpec\ObjectBehavior;
 
 class ModerationApiSpec extends ObjectBehavior
 {
-    function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
+    function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
     {
         $this->beConstructedWith($guzzleClient, $requestGenerator);
         $guzzleClient->send($request)->willReturn($response);

diff --git a/spec/NewTwitchApi/Resources/PollsApiSpec.php b/spec/NewTwitchApi/Resources/PollsApiSpec.php
@@ -2,15 +2,15 @@
 
 namespace spec\NewTwitchApi\Resources;
 
-use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use NewTwitchApi\RequestGenerator;
+use NewTwitchApi\HelixGuzzleClient;
 use PhpSpec\ObjectBehavior;
 
 class PollsApiSpec extends ObjectBehavior
 {
-    function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
+    function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
     {
         $this->beConstructedWith($guzzleClient, $requestGenerator);
         $guzzleClient->send($request)->willReturn($response);

diff --git a/spec/NewTwitchApi/Resources/PredictionsApiSpec.php b/spec/NewTwitchApi/Resources/PredictionsApiSpec.php
@@ -2,15 +2,15 @@
 
 namespace spec\NewTwitchApi\Resources;
 
-use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use NewTwitchApi\RequestGenerator;
+use NewTwitchApi\HelixGuzzleClient;
 use PhpSpec\ObjectBehavior;
 
 class PredictionsApiSpec extends ObjectBehavior
 {
-    function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
+    function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
     {
         $this->beConstructedWith($guzzleClient, $requestGenerator);
         $guzzleClient->send($request)->willReturn($response);

diff --git a/spec/NewTwitchApi/Resources/StreamsApiSpec.php b/spec/NewTwitchApi/Resources/StreamsApiSpec.php
@@ -2,16 +2,15 @@
 
 namespace spec\NewTwitchApi\Resources;
 
-use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use NewTwitchApi\RequestGenerator;
+use NewTwitchApi\HelixGuzzleClient;
 use PhpSpec\ObjectBehavior;
-use Psr\Http\Message\ResponseInterface;
 
 class StreamsApiSpec extends ObjectBehavior
 {
-    function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
+    function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
     {
         $this->beConstructedWith($guzzleClient, $requestGenerator);
         $guzzleClient->send($request)->willReturn($response);

diff --git a/spec/NewTwitchApi/Resources/SubscriptionsApiSpec.php b/spec/NewTwitchApi/Resources/SubscriptionsApiSpec.php
@@ -2,16 +2,15 @@
 
 namespace spec\NewTwitchApi\Resources;
 
-use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use NewTwitchApi\RequestGenerator;
+use NewTwitchApi\HelixGuzzleClient;
 use PhpSpec\ObjectBehavior;
-use Psr\Http\Message\ResponseInterface;
 
 class SubscriptionsApiSpec extends ObjectBehavior
 {
-    function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
+    function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
     {
         $this->beConstructedWith($guzzleClient, $requestGenerator);
         $guzzleClient->send($request)->willReturn($response);

diff --git a/spec/NewTwitchApi/Resources/TagsApiSpec.php b/spec/NewTwitchApi/Resources/TagsApiSpec.php
@@ -2,16 +2,15 @@
 
 namespace spec\NewTwitchApi\Resources;
 
-use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use NewTwitchApi\RequestGenerator;
+use NewTwitchApi\HelixGuzzleClient;
 use PhpSpec\ObjectBehavior;
-use Psr\Http\Message\ResponseInterface;
 
 class TagsApiSpec extends ObjectBehavior
 {
-    function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
+    function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
     {
         $this->beConstructedWith($guzzleClient, $requestGenerator);
         $guzzleClient->send($request)->willReturn($response);

diff --git a/spec/NewTwitchApi/Resources/TeamsApiSpec.php b/spec/NewTwitchApi/Resources/TeamsApiSpec.php
@@ -2,16 +2,15 @@
 
 namespace spec\NewTwitchApi\Resources;
 
-use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use NewTwitchApi\RequestGenerator;
+use NewTwitchApi\HelixGuzzleClient;
 use PhpSpec\ObjectBehavior;
-use Psr\Http\Message\ResponseInterface;
 
 class TeamsApiSpec extends ObjectBehavior
 {
-    function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
+    function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
     {
         $this->beConstructedWith($guzzleClient, $requestGenerator);
         $guzzleClient->send($request)->willReturn($response);

diff --git a/spec/NewTwitchApi/Resources/UsersApiSpec.php b/spec/NewTwitchApi/Resources/UsersApiSpec.php
@@ -2,16 +2,15 @@
 
 namespace spec\NewTwitchApi\Resources;
 
-use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use NewTwitchApi\RequestGenerator;
+use NewTwitchApi\HelixGuzzleClient;
 use PhpSpec\ObjectBehavior;
-use Psr\Http\Message\ResponseInterface;
 
 class UsersApiSpec extends ObjectBehavior
 {
-    function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
+    function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
     {
         $this->beConstructedWith($guzzleClient, $requestGenerator);
         $guzzleClient->send($request)->willReturn($response);