Skip to content

Commit f6406f6

Browse files
BrandinBrandin
authored
Merge pull request #127 from nicklaw5/v5-0-2
2 parents a59f713 + 4e1a2fc commit f6406f6

27 files changed

+95
-194
lines changed

‎spec/NewTwitchApi/HelixGuzzleClientSpec.php

+13-10
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,19 @@
22

33
namespace spec\NewTwitchApi;
44

5-
use GuzzleHttp\Psr7\Uri;
5+
use NewTwitchApi\HelixGuzzleClient;
66
use PhpSpec\ObjectBehavior;
77

88
class HelixGuzzleClientSpec extends ObjectBehavior
99
{
10+
function let(HelixGuzzleClient $guzzleClient)
11+
{
12+
$this->beConstructedWith('TEST_CLIENT_ID');
13+
}
14+
1015
function it_should_have_correct_base_uri()
1116
{
12-
$this->beConstructedThrough('getClient', ['client-id']);
13-
$this->shouldHaveType('\GuzzleHttp\Client');
17+
$this->shouldHaveType('\NewTwitchApi\HelixGuzzleClient');
1418

1519
/** @var Uri $uri */
1620
$uri = $this->getConfig('base_uri');
@@ -21,22 +25,21 @@ function it_should_have_correct_base_uri()
2125

2226
function it_should_have_client_id_header()
2327
{
24-
$this->beConstructedThrough('getClient', ['client-id']);
25-
$this->shouldHaveType('\GuzzleHttp\Client');
26-
$this->getConfig('headers')->shouldHaveKeyWithValue('Client-ID', 'client-id');
28+
$this->shouldHaveType('\NewTwitchApi\HelixGuzzleClient');
29+
$this->getConfig('headers')->shouldHaveKeyWithValue('Client-ID', 'TEST_CLIENT_ID');
2730
}
2831

2932
function it_should_have_json_content_type_header()
3033
{
31-
$this->beConstructedThrough('getClient', ['client-id']);
32-
$this->shouldHaveType('\GuzzleHttp\Client');
34+
35+
$this->shouldHaveType('\NewTwitchApi\HelixGuzzleClient');
3336
$this->getConfig('headers')->shouldHaveKeyWithValue('Content-Type', 'application/json');
3437
}
3538

3639
function it_should_have_passed_in_config_params_instead_of_defaults()
3740
{
38-
$this->beConstructedThrough('getClient', ['client-id', ['base_uri' => 'https://different.url']]);
39-
$this->shouldHaveType('\GuzzleHttp\Client');
41+
$this->beConstructedWith('TEST_CLIENT_ID', ['base_uri' => 'https://different.url']);
42+
$this->shouldHaveType('\NewTwitchApi\HelixGuzzleClient');
4043
$this->getConfig('base_uri')->getHost()->shouldBe('different.url');
4144
}
4245
}

‎spec/NewTwitchApi/NewTwitchApiSpec.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace spec\NewTwitchApi;
44

5-
use GuzzleHttp\Client;
65
use NewTwitchApi\RequestGenerator;
6+
use NewTwitchApi\HelixGuzzleClient;
77
use NewTwitchApi\Auth\OauthApi;
88
use NewTwitchApi\Resources\AdsApi;
99
use NewTwitchApi\Resources\AnalyticsApi;
@@ -28,7 +28,7 @@
2828

2929
class NewTwitchApiSpec extends ObjectBehavior
3030
{
31-
function let(Client $guzzleClient)
31+
function let(HelixGuzzleClient $guzzleClient)
3232
{
3333
$this->beConstructedWith($guzzleClient, 'client-id', 'client-secret');
3434
}

‎spec/NewTwitchApi/Resources/AdsApiSpec.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace spec\NewTwitchApi\Resources;
44

5-
use GuzzleHttp\Client;
65
use GuzzleHttp\Psr7\Request;
76
use GuzzleHttp\Psr7\Response;
87
use NewTwitchApi\RequestGenerator;
8+
use NewTwitchApi\HelixGuzzleClient;
99
use PhpSpec\ObjectBehavior;
1010

1111
class AdsApiSpec extends ObjectBehavior
1212
{
13-
function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
13+
function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
1414
{
1515
$this->beConstructedWith($guzzleClient, $requestGenerator);
1616
$guzzleClient->send($request)->willReturn($response);

‎spec/NewTwitchApi/Resources/AnalyticsApiSpec.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace spec\NewTwitchApi\Resources;
44

5-
use GuzzleHttp\Client;
65
use GuzzleHttp\Psr7\Request;
76
use GuzzleHttp\Psr7\Response;
87
use NewTwitchApi\RequestGenerator;
8+
use NewTwitchApi\HelixGuzzleClient;
99
use PhpSpec\ObjectBehavior;
1010

1111
class AnalyticsApiSpec extends ObjectBehavior
1212
{
13-
function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
13+
function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
1414
{
1515
$this->beConstructedWith($guzzleClient, $requestGenerator);
1616
$guzzleClient->send($request)->willReturn($response);

‎spec/NewTwitchApi/Resources/BitsApiSpec.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace spec\NewTwitchApi\Resources;
44

5-
use GuzzleHttp\Client;
65
use GuzzleHttp\Psr7\Request;
76
use GuzzleHttp\Psr7\Response;
87
use NewTwitchApi\RequestGenerator;
8+
use NewTwitchApi\HelixGuzzleClient;
99
use PhpSpec\ObjectBehavior;
1010

1111
class BitsApiSpec extends ObjectBehavior
1212
{
13-
function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
13+
function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
1414
{
1515
$this->beConstructedWith($guzzleClient, $requestGenerator);
1616
$guzzleClient->send($request)->willReturn($response);

‎spec/NewTwitchApi/Resources/ChannelPointsApiSpec.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace spec\NewTwitchApi\Resources;
44

5-
use GuzzleHttp\Client;
65
use GuzzleHttp\Psr7\Request;
76
use GuzzleHttp\Psr7\Response;
87
use NewTwitchApi\RequestGenerator;
8+
use NewTwitchApi\HelixGuzzleClient;
99
use PhpSpec\ObjectBehavior;
1010

1111
class ChannelPointsApiSpec extends ObjectBehavior
1212
{
13-
function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
13+
function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
1414
{
1515
$this->beConstructedWith($guzzleClient, $requestGenerator);
1616
$guzzleClient->send($request)->willReturn($response);

‎spec/NewTwitchApi/Resources/ChannelsApiSpec.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace spec\NewTwitchApi\Resources;
44

5-
use GuzzleHttp\Client;
65
use GuzzleHttp\Psr7\Request;
76
use GuzzleHttp\Psr7\Response;
87
use NewTwitchApi\RequestGenerator;
8+
use NewTwitchApi\HelixGuzzleClient;
99
use PhpSpec\ObjectBehavior;
1010

1111
class ChannelsApiSpec extends ObjectBehavior
1212
{
13-
function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
13+
function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
1414
{
1515
$this->beConstructedWith($guzzleClient, $requestGenerator);
1616
$guzzleClient->send($request)->willReturn($response);

‎spec/NewTwitchApi/Resources/ChatApiSpec.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace spec\NewTwitchApi\Resources;
44

5-
use GuzzleHttp\Client;
65
use GuzzleHttp\Psr7\Request;
76
use GuzzleHttp\Psr7\Response;
87
use NewTwitchApi\RequestGenerator;
8+
use NewTwitchApi\HelixGuzzleClient;
99
use PhpSpec\ObjectBehavior;
1010

1111
class ChatApiSpec extends ObjectBehavior
1212
{
13-
function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
13+
function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
1414
{
1515
$this->beConstructedWith($guzzleClient, $requestGenerator);
1616
$guzzleClient->send($request)->willReturn($response);

‎spec/NewTwitchApi/Resources/EntitlementsApiSpec.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace spec\NewTwitchApi\Resources;
44

5-
use GuzzleHttp\Client;
65
use GuzzleHttp\Psr7\Request;
76
use GuzzleHttp\Psr7\Response;
87
use NewTwitchApi\RequestGenerator;
8+
use NewTwitchApi\HelixGuzzleClient;
99
use PhpSpec\ObjectBehavior;
1010

1111
class EntitlementsApiSpec extends ObjectBehavior
1212
{
13-
function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
13+
function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
1414
{
1515
$this->beConstructedWith($guzzleClient, $requestGenerator);
1616
$guzzleClient->send($request)->willReturn($response);

‎spec/NewTwitchApi/Resources/EventSubApiSpec.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
namespace spec\NewTwitchApi\Resources;
44

5-
use GuzzleHttp\Client;
65
use GuzzleHttp\Psr7\Request;
76
use GuzzleHttp\Psr7\Response;
87
use NewTwitchApi\RequestGenerator;
8+
use NewTwitchApi\HelixGuzzleClient;
99
use PhpSpec\ObjectBehavior;
1010

1111
class EventSubApiSpec extends ObjectBehavior
@@ -31,7 +31,7 @@ private function createEventSubSubscription(string $type, string $version, array
3131
return $requestGenerator->generate('POST', 'eventsub/subscriptions', $this->bearer, [], $bodyParams);
3232
}
3333

34-
function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
34+
function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
3535
{
3636
$this->beConstructedWith($guzzleClient, $requestGenerator);
3737
$guzzleClient->send($request)->willReturn($response);

‎spec/NewTwitchApi/Resources/GamesApiSpec.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace spec\NewTwitchApi\Resources;
44

5-
use GuzzleHttp\Client;
65
use GuzzleHttp\Psr7\Request;
76
use GuzzleHttp\Psr7\Response;
87
use NewTwitchApi\RequestGenerator;
8+
use NewTwitchApi\HelixGuzzleClient;
99
use PhpSpec\ObjectBehavior;
1010

1111
class GamesApiSpec extends ObjectBehavior
1212
{
13-
function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
13+
function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
1414
{
1515
$this->beConstructedWith($guzzleClient, $requestGenerator);
1616
$guzzleClient->send($request)->willReturn($response);

‎spec/NewTwitchApi/Resources/ModerationApiSpec.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace spec\NewTwitchApi\Resources;
44

5-
use GuzzleHttp\Client;
65
use GuzzleHttp\Psr7\Request;
76
use GuzzleHttp\Psr7\Response;
87
use NewTwitchApi\RequestGenerator;
8+
use NewTwitchApi\HelixGuzzleClient;
99
use PhpSpec\ObjectBehavior;
1010

1111
class ModerationApiSpec extends ObjectBehavior
1212
{
13-
function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
13+
function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
1414
{
1515
$this->beConstructedWith($guzzleClient, $requestGenerator);
1616
$guzzleClient->send($request)->willReturn($response);

‎spec/NewTwitchApi/Resources/PollsApiSpec.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace spec\NewTwitchApi\Resources;
44

5-
use GuzzleHttp\Client;
65
use GuzzleHttp\Psr7\Request;
76
use GuzzleHttp\Psr7\Response;
87
use NewTwitchApi\RequestGenerator;
8+
use NewTwitchApi\HelixGuzzleClient;
99
use PhpSpec\ObjectBehavior;
1010

1111
class PollsApiSpec extends ObjectBehavior
1212
{
13-
function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
13+
function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
1414
{
1515
$this->beConstructedWith($guzzleClient, $requestGenerator);
1616
$guzzleClient->send($request)->willReturn($response);

‎spec/NewTwitchApi/Resources/PredictionsApiSpec.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace spec\NewTwitchApi\Resources;
44

5-
use GuzzleHttp\Client;
65
use GuzzleHttp\Psr7\Request;
76
use GuzzleHttp\Psr7\Response;
87
use NewTwitchApi\RequestGenerator;
8+
use NewTwitchApi\HelixGuzzleClient;
99
use PhpSpec\ObjectBehavior;
1010

1111
class PredictionsApiSpec extends ObjectBehavior
1212
{
13-
function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
13+
function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
1414
{
1515
$this->beConstructedWith($guzzleClient, $requestGenerator);
1616
$guzzleClient->send($request)->willReturn($response);

‎spec/NewTwitchApi/Resources/StreamsApiSpec.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22

33
namespace spec\NewTwitchApi\Resources;
44

5-
use GuzzleHttp\Client;
65
use GuzzleHttp\Psr7\Request;
76
use GuzzleHttp\Psr7\Response;
87
use NewTwitchApi\RequestGenerator;
8+
use NewTwitchApi\HelixGuzzleClient;
99
use PhpSpec\ObjectBehavior;
10-
use Psr\Http\Message\ResponseInterface;
1110

1211
class StreamsApiSpec extends ObjectBehavior
1312
{
14-
function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
13+
function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
1514
{
1615
$this->beConstructedWith($guzzleClient, $requestGenerator);
1716
$guzzleClient->send($request)->willReturn($response);

‎spec/NewTwitchApi/Resources/SubscriptionsApiSpec.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22

33
namespace spec\NewTwitchApi\Resources;
44

5-
use GuzzleHttp\Client;
65
use GuzzleHttp\Psr7\Request;
76
use GuzzleHttp\Psr7\Response;
87
use NewTwitchApi\RequestGenerator;
8+
use NewTwitchApi\HelixGuzzleClient;
99
use PhpSpec\ObjectBehavior;
10-
use Psr\Http\Message\ResponseInterface;
1110

1211
class SubscriptionsApiSpec extends ObjectBehavior
1312
{
14-
function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
13+
function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
1514
{
1615
$this->beConstructedWith($guzzleClient, $requestGenerator);
1716
$guzzleClient->send($request)->willReturn($response);

‎spec/NewTwitchApi/Resources/TagsApiSpec.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22

33
namespace spec\NewTwitchApi\Resources;
44

5-
use GuzzleHttp\Client;
65
use GuzzleHttp\Psr7\Request;
76
use GuzzleHttp\Psr7\Response;
87
use NewTwitchApi\RequestGenerator;
8+
use NewTwitchApi\HelixGuzzleClient;
99
use PhpSpec\ObjectBehavior;
10-
use Psr\Http\Message\ResponseInterface;
1110

1211
class TagsApiSpec extends ObjectBehavior
1312
{
14-
function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
13+
function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
1514
{
1615
$this->beConstructedWith($guzzleClient, $requestGenerator);
1716
$guzzleClient->send($request)->willReturn($response);

‎spec/NewTwitchApi/Resources/TeamsApiSpec.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22

33
namespace spec\NewTwitchApi\Resources;
44

5-
use GuzzleHttp\Client;
65
use GuzzleHttp\Psr7\Request;
76
use GuzzleHttp\Psr7\Response;
87
use NewTwitchApi\RequestGenerator;
8+
use NewTwitchApi\HelixGuzzleClient;
99
use PhpSpec\ObjectBehavior;
10-
use Psr\Http\Message\ResponseInterface;
1110

1211
class TeamsApiSpec extends ObjectBehavior
1312
{
14-
function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
13+
function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
1514
{
1615
$this->beConstructedWith($guzzleClient, $requestGenerator);
1716
$guzzleClient->send($request)->willReturn($response);

‎spec/NewTwitchApi/Resources/UsersApiSpec.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22

33
namespace spec\NewTwitchApi\Resources;
44

5-
use GuzzleHttp\Client;
65
use GuzzleHttp\Psr7\Request;
76
use GuzzleHttp\Psr7\Response;
87
use NewTwitchApi\RequestGenerator;
8+
use NewTwitchApi\HelixGuzzleClient;
99
use PhpSpec\ObjectBehavior;
10-
use Psr\Http\Message\ResponseInterface;
1110

1211
class UsersApiSpec extends ObjectBehavior
1312
{
14-
function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
13+
function let(HelixGuzzleClient $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
1514
{
1615
$this->beConstructedWith($guzzleClient, $requestGenerator);
1716
$guzzleClient->send($request)->willReturn($response);

0 commit comments

Comments
 (0)