Skip to content

Commit 2a6af3e

Browse files
dcarbonedcarbone
authored
Merge pull request #24 from dcarbone/feature/guzzle_psr7_v2
Updating to use guzzle/psr7 v2
2 parents f541ed8 + f667951 commit 2a6af3e

17 files changed

+263
-189
lines changed

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"dcarbone/gotime": "0.4.*",
2222
"dcarbone/gohttp": "v0.3.*",
2323
"guzzlehttp/guzzle": "~7",
24-
"guzzlehttp/psr7": "~1"
24+
"guzzlehttp/psr7": "~2"
2525
},
2626
"autoload": {
2727
"files": [

‎composer.lock

+183-116
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/ConsulManager.php

+12
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
limitations under the License.
1717
*/
1818

19+
use DCarbone\PHPConsulAPI\Config;
20+
1921
/**
2022
* Class ConsulManager
2123
*/
@@ -67,4 +69,14 @@ public static function stopSingle(): void
6769
\sleep(1);
6870
}
6971
}
72+
73+
/**
74+
* @return \DCarbone\PHPConsulAPI\Config
75+
*/
76+
public static function testConfig(): Config{
77+
$conf = new Config();
78+
$conf->Address = '127.0.0.1:8500';
79+
$conf->Scheme = 'http';
80+
return $conf;
81+
}
7082
}

‎tests/Usage/ACL/ACLClientTest.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*/
1818

1919
use DCarbone\PHPConsulAPI\ACL\ACLClient;
20-
use DCarbone\PHPConsulAPI\Config;
2120
use DCarbone\PHPConsulAPI\QueryMeta;
2221
use DCarbone\PHPConsulAPI\WriteMeta;
2322
use DCarbone\PHPConsulAPITests\ConsulManager;
@@ -41,7 +40,7 @@ public function testCanBootstrapACL()
4140
{
4241
ConsulManager::startSingleDev('-bind="127.0.0.1"');
4342

44-
$client = new ACLClient(new Config());
43+
$client = new ACLClient(ConsulManager::testConfig());
4544

4645
[$aclID, $wm, $err] = $client->Bootstrap();
4746
static::assertNull($err, 'ACL::bootstrap() returned error: ' . $err);
@@ -57,7 +56,7 @@ public function testCanBootstrapACL()
5756
*/
5857
public function testCanGetBootstrappedACL(string $aclID): void
5958
{
60-
$client = new ACLClient(new Config());
59+
$client = new ACLClient(ConsulManager::testConfig());
6160

6261
[$acls, $qm, $err] = $client->Info($aclID);
6362
static::assertNull($err, 'ACL::info() return error: ' . $err);

‎tests/Usage/Agent/AgentClientTest.php

+11-11
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
use DCarbone\PHPConsulAPI\Agent\AgentService;
2222
use DCarbone\PHPConsulAPI\Agent\AgentServiceCheck;
2323
use DCarbone\PHPConsulAPI\Agent\AgentServiceRegistration;
24-
use DCarbone\PHPConsulAPI\Config;
24+
use DCarbone\PHPConsulAPITests\ConsulManager;
2525
use DCarbone\PHPConsulAPITests\Usage\AbstractUsageTests;
2626
use PHPUnit\Framework\AssertionFailedError;
2727

@@ -39,7 +39,7 @@ final class AgentClientTest extends AbstractUsageTests
3939

4040
public function testCanConstructAgentClient(): void
4141
{
42-
$client = new AgentClient(new Config());
42+
$client = new AgentClient(ConsulManager::testConfig());
4343
static::assertInstanceOf(AgentClient::class, $client);
4444
}
4545

@@ -48,7 +48,7 @@ public function testCanConstructAgentClient(): void
4848
*/
4949
public function testCanGetSelf(): void
5050
{
51-
$client = new AgentClient(new Config());
51+
$client = new AgentClient(ConsulManager::testConfig());
5252

5353
[$self, $err] = $client->Self();
5454
static::assertNull($err);
@@ -66,7 +66,7 @@ public function testCanGetSelf(): void
6666
*/
6767
public function testCanReloadSelf(): void
6868
{
69-
$client = new AgentClient(new Config());
69+
$client = new AgentClient(ConsulManager::testConfig());
7070
$err = $client->Reload();
7171
static::assertNull($err, \sprintf('AgentClient::reload returned error: %s', $err));
7272
}
@@ -76,7 +76,7 @@ public function testCanReloadSelf(): void
7676
*/
7777
public function testCanGetNodeName(): void
7878
{
79-
$client = new AgentClient(new Config());
79+
$client = new AgentClient(ConsulManager::testConfig());
8080

8181
[$nodeName, $err] = $client->NodeName();
8282
static::assertNull($err, \sprintf('Unable to get agent node name: %s', $err));
@@ -92,7 +92,7 @@ public function testCanGetNodeName(): void
9292
*/
9393
public function testCanGeMembers(): void
9494
{
95-
$client = new AgentClient(new Config());
95+
$client = new AgentClient(ConsulManager::testConfig());
9696

9797
[$members, $err] = $client->Members();
9898
static::assertNull($err, \sprintf('AgentClient::members returned error: %s', $err));
@@ -106,7 +106,7 @@ public function testCanGeMembers(): void
106106
*/
107107
public function testCanRegisterServiceNoChecks(): void
108108
{
109-
$client = new AgentClient(new Config());
109+
$client = new AgentClient(ConsulManager::testConfig());
110110

111111
$svc = new AgentServiceRegistration();
112112
$svc
@@ -123,7 +123,7 @@ public function testCanRegisterServiceNoChecks(): void
123123
*/
124124
public function testCanRegisterServiceWithOneCheck(): void
125125
{
126-
$client = new AgentClient(new Config());
126+
$client = new AgentClient(ConsulManager::testConfig());
127127

128128
$svc = new AgentServiceRegistration();
129129
$svc
@@ -145,7 +145,7 @@ public function testCanRegisterServiceWithOneCheck(): void
145145
*/
146146
public function testCanGetServiceList(): void
147147
{
148-
$client = new AgentClient(new Config());
148+
$client = new AgentClient(ConsulManager::testConfig());
149149

150150
[$svcs, $err] = $client->Services();
151151

@@ -170,7 +170,7 @@ public function testCanGetServiceList(): void
170170
*/
171171
public function testCanDeregisterService(): void
172172
{
173-
$client = new AgentClient(new Config());
173+
$client = new AgentClient(ConsulManager::testConfig());
174174

175175
$err = $client->ServiceDeregister(self::Service1Name);
176176
static::assertNull($err, \sprintf('AgentClient::serviceDeregister returned error: %s', $err));
@@ -196,7 +196,7 @@ public function testCanDeregisterService(): void
196196
*/
197197
public function testCanRegisterServiceWithCheck(): void
198198
{
199-
$client = new AgentClient(new Config());
199+
$client = new AgentClient(ConsulManager::testConfig());
200200

201201
$svc = new AgentServiceRegistration();
202202
$svc

‎tests/Usage/Catalog/CatalogClientTest.php

+11-11
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
use DCarbone\PHPConsulAPI\Catalog\CatalogRegistration;
2424
use DCarbone\PHPConsulAPI\Catalog\CatalogService;
2525
use DCarbone\PHPConsulAPI\Catalog\Node;
26-
use DCarbone\PHPConsulAPI\Config;
2726
use DCarbone\PHPConsulAPI\QueryMeta;
2827
use DCarbone\PHPConsulAPI\WriteMeta;
28+
use DCarbone\PHPConsulAPITests\ConsulManager;
2929
use DCarbone\PHPConsulAPITests\Usage\AbstractUsageTests;
3030
use PHPUnit\Framework\AssertionFailedError;
3131

@@ -48,7 +48,7 @@ final class CatalogClientTest extends AbstractUsageTests
4848

4949
public function testCanConstructClient(): void
5050
{
51-
$client = new CatalogClient(new Config());
51+
$client = new CatalogClient(ConsulManager::testConfig());
5252
static::assertInstanceOf(CatalogClient::class, $client);
5353
}
5454

@@ -57,7 +57,7 @@ public function testCanConstructClient(): void
5757
*/
5858
public function testCanRegisterService(): void
5959
{
60-
$client = new CatalogClient(new Config());
60+
$client = new CatalogClient(ConsulManager::testConfig());
6161

6262
$registration = new CatalogRegistration([
6363
'Node' => 'dc1',
@@ -80,7 +80,7 @@ public function testCanRegisterService(): void
8080
*/
8181
public function testCanGetService(): void
8282
{
83-
$client = new CatalogClient(new Config());
83+
$client = new CatalogClient(ConsulManager::testConfig());
8484

8585
[$service, $qm, $err] = $client->Service(self::ServiceName);
8686
static::assertNull($err, 'CatalogClient::service returned error: ' . $err);
@@ -95,7 +95,7 @@ public function testCanGetService(): void
9595
*/
9696
public function testCanRegisterSecondServiceWithSameName(): void
9797
{
98-
$client = new CatalogClient(new Config());
98+
$client = new CatalogClient(ConsulManager::testConfig());
9999

100100
[$wm, $err] = $client->Register(new CatalogRegistration([
101101
'Node' => 'dc1',
@@ -117,7 +117,7 @@ public function testCanRegisterSecondServiceWithSameName(): void
117117
*/
118118
public function testCanGetListOfService(): void
119119
{
120-
$client = new CatalogClient(new Config());
120+
$client = new CatalogClient(ConsulManager::testConfig());
121121

122122
[$service, $qm, $err] = $client->Service(self::ServiceName);
123123
static::assertNull($err, 'CatalogClient::service returned error: ' . $err);
@@ -140,7 +140,7 @@ public function testCanGetListOfService(): void
140140
*/
141141
public function testCanGetListOfServices(): void
142142
{
143-
$client = new CatalogClient(new Config());
143+
$client = new CatalogClient(ConsulManager::testConfig());
144144

145145
[$services, $qm, $err] = $client->Services();
146146

@@ -161,7 +161,7 @@ public function testCanGetListOfServices(): void
161161
*/
162162
public function testCanDeregisterService(): void
163163
{
164-
$client = new CatalogClient(new Config());
164+
$client = new CatalogClient(ConsulManager::testConfig());
165165

166166
[$wm, $err] = $client->Deregister(new CatalogDeregistration([
167167
'Node' => 'dc1',
@@ -184,7 +184,7 @@ public function testCanDeregisterService(): void
184184
*/
185185
public function testCanGetDatacenters(): void
186186
{
187-
$client = new CatalogClient(new Config());
187+
$client = new CatalogClient(ConsulManager::testConfig());
188188

189189
[$dcs, $err] = $client->Datacenters();
190190

@@ -204,7 +204,7 @@ public function testCanGetDatacenters(): void
204204
*/
205205
public function testCanGetListOfNodes(): void
206206
{
207-
$client = new CatalogClient(new Config());
207+
$client = new CatalogClient(ConsulManager::testConfig());
208208

209209
[$nodes, $qm, $err] = $client->Nodes();
210210
try {
@@ -225,7 +225,7 @@ public function testCanGetListOfNodes(): void
225225
*/
226226
public function testCanGetNode(): void
227227
{
228-
$client = new CatalogClient(new Config());
228+
$client = new CatalogClient(ConsulManager::testConfig());
229229

230230
[$nodes] = $client->Nodes();
231231
try {

‎tests/Usage/ConfigUsageTest.php

+6-10
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,10 @@ final class ConfigUsageTest extends TestCase
3131
public const DEFAULT_ADDRESS = '127.0.0.1:8500';
3232
public const DEFAULT_SCHEME = 'http';
3333

34-
/**
35-
* @return \DCarbone\PHPConsulAPITests\Usage\Config
36-
*/
37-
public function testCanConstructConfig()
34+
public function testCanConstructConfig(): void
3835
{
3936
$config = new Config();
40-
static::assertInstanceOf(Config::class, $config);
41-
return $config;
37+
self::assertInstanceOf(Config::class, $config);
4238
}
4339

4440
/**
@@ -51,18 +47,18 @@ public function testConfigDefaults(): void
5147
$expectedAddress = $_ENV[Consul::HTTPAddrEnvName] ?: self::DEFAULT_ADDRESS;
5248
$expectedScheme = $_ENV[Consul::HTTPSSLEnvName] ? 'https' : self::DEFAULT_SCHEME;
5349

54-
static::assertSame(
50+
self::assertSame(
5551
$expectedAddress,
5652
$config->getAddress(),
5753
\sprintf('Default address is not "%s"', $expectedAddress)
5854
);
59-
static::assertSame(
55+
self::assertSame(
6056
$expectedScheme,
6157
$config->getScheme(),
6258
\sprintf('Default scheme is not "%s"', $expectedScheme)
6359
);
64-
static::assertNotNull($config->getHttpClient(), 'HttpClient is null');
65-
static::assertFalse($config->isInsecureSkipVerify(), 'InsecureSkipVerify is not false');
60+
self::assertNotNull($config->getHttpClient(), 'HttpClient is null');
61+
self::assertFalse($config->isInsecureSkipVerify(), 'InsecureSkipVerify is not false');
6662
}
6763

6864
protected function setUp(): void

‎tests/Usage/Coordinate/CoordinateClientTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
limitations under the License.
1717
*/
1818

19-
use DCarbone\PHPConsulAPI\Config;
2019
use DCarbone\PHPConsulAPI\Coordinate\CoordinateClient;
2120
use DCarbone\PHPConsulAPI\QueryMeta;
21+
use DCarbone\PHPConsulAPITests\ConsulManager;
2222
use DCarbone\PHPConsulAPITests\Usage\AbstractUsageTests;
2323

2424
/**
@@ -33,7 +33,7 @@ final class CoordinateClientTest extends AbstractUsageTests
3333

3434
public function testCanConstructClient(): void
3535
{
36-
$client = new CoordinateClient(new Config());
36+
$client = new CoordinateClient(ConsulManager::testConfig());
3737
static::assertInstanceOf(CoordinateClient::class, $client);
3838
}
3939

@@ -42,7 +42,7 @@ public function testCanConstructClient(): void
4242
*/
4343
public function testDatacenters(): void
4444
{
45-
$client = new CoordinateClient(new Config());
45+
$client = new CoordinateClient(ConsulManager::testConfig());
4646

4747
[$dcs, $err] = $client->Datacenters();
4848
static::assertNull($err, \sprintf('CoordinateClient::datacenters() - %s', $err));
@@ -55,7 +55,7 @@ public function testDatacenters(): void
5555
*/
5656
public function testNodes(): void
5757
{
58-
$client = new CoordinateClient(new Config());
58+
$client = new CoordinateClient(ConsulManager::testConfig());
5959

6060
[$nodes, $qm, $err] = $client->Nodes();
6161
static::assertNull($err, \sprintf('CoordinateClient::nodes() - %s', $err));

‎tests/Usage/Event/EventClientUsageTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
limitations under the License.
1717
*/
1818

19-
use DCarbone\PHPConsulAPI\Config;
2019
use DCarbone\PHPConsulAPI\Event\EventClient;
20+
use DCarbone\PHPConsulAPITests\ConsulManager;
2121
use DCarbone\PHPConsulAPITests\Usage\AbstractUsageTests;
2222

2323
/**
@@ -32,7 +32,7 @@ final class EventClientUsageTest extends AbstractUsageTests
3232

3333
public function testCanConstructClient(): void
3434
{
35-
$client = new EventClient(new Config());
35+
$client = new EventClient(ConsulManager::testConfig());
3636
static::assertInstanceOf(EventClient::class, $client);
3737
}
3838
}

0 commit comments

Comments
 (0)