Merge pull request #24 from dcarbone/feature/guzzle_psr7_v2

Updating to use guzzle/psr7 v2
dcarbone · Oct 4, 2021 · 2a6af3e · 2a6af3e
2 parents f541ed8 + f667951
commit 2a6af3e
Show file tree

Hide file tree

Showing 17 changed files with 263 additions and 189 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     "dcarbone/gotime": "0.4.*",
     "dcarbone/gohttp": "v0.3.*",
     "guzzlehttp/guzzle": "~7",
-    "guzzlehttp/psr7": "~1"
+    "guzzlehttp/psr7": "~2"
   },
   "autoload": {
     "files": [

diff --git a/composer.lock b/composer.lock
diff --git a/tests/ConsulManager.php b/tests/ConsulManager.php
@@ -16,6 +16,8 @@
    limitations under the License.
  */
 
+use DCarbone\PHPConsulAPI\Config;
+
 /**
  * Class ConsulManager
  */
@@ -67,4 +69,14 @@ public static function stopSingle(): void
             \sleep(1);
         }
     }
+
+    /**
+     * @return \DCarbone\PHPConsulAPI\Config
+     */
+    public static function testConfig(): Config{
+        $conf = new Config();
+        $conf->Address = '127.0.0.1:8500';
+        $conf->Scheme = 'http';
+        return $conf;
+    }
 }
diff --git a/tests/Usage/ACL/ACLClientTest.php b/tests/Usage/ACL/ACLClientTest.php
@@ -17,7 +17,6 @@
  */
 
 use DCarbone\PHPConsulAPI\ACL\ACLClient;
-use DCarbone\PHPConsulAPI\Config;
 use DCarbone\PHPConsulAPI\QueryMeta;
 use DCarbone\PHPConsulAPI\WriteMeta;
 use DCarbone\PHPConsulAPITests\ConsulManager;
@@ -41,7 +40,7 @@ public function testCanBootstrapACL()
     {
         ConsulManager::startSingleDev('-bind="127.0.0.1"');
 
-        $client = new ACLClient(new Config());
+        $client = new ACLClient(ConsulManager::testConfig());
 
         [$aclID, $wm, $err] = $client->Bootstrap();
         static::assertNull($err, 'ACL::bootstrap() returned error: ' . $err);
@@ -57,7 +56,7 @@ public function testCanBootstrapACL()
      */
     public function testCanGetBootstrappedACL(string $aclID): void
     {
-        $client = new ACLClient(new Config());
+        $client = new ACLClient(ConsulManager::testConfig());
 
         [$acls, $qm, $err] = $client->Info($aclID);
         static::assertNull($err, 'ACL::info() return error: ' . $err);

diff --git a/tests/Usage/Agent/AgentClientTest.php b/tests/Usage/Agent/AgentClientTest.php
@@ -21,7 +21,7 @@
 use DCarbone\PHPConsulAPI\Agent\AgentService;
 use DCarbone\PHPConsulAPI\Agent\AgentServiceCheck;
 use DCarbone\PHPConsulAPI\Agent\AgentServiceRegistration;
-use DCarbone\PHPConsulAPI\Config;
+use DCarbone\PHPConsulAPITests\ConsulManager;
 use DCarbone\PHPConsulAPITests\Usage\AbstractUsageTests;
 use PHPUnit\Framework\AssertionFailedError;
 
@@ -39,7 +39,7 @@ final class AgentClientTest extends AbstractUsageTests
 
     public function testCanConstructAgentClient(): void
     {
-        $client = new AgentClient(new Config());
+        $client = new AgentClient(ConsulManager::testConfig());
         static::assertInstanceOf(AgentClient::class, $client);
     }
 
@@ -48,7 +48,7 @@ public function testCanConstructAgentClient(): void
      */
     public function testCanGetSelf(): void
     {
-        $client = new AgentClient(new Config());
+        $client = new AgentClient(ConsulManager::testConfig());
 
         [$self, $err] = $client->Self();
         static::assertNull($err);
@@ -66,7 +66,7 @@ public function testCanGetSelf(): void
      */
     public function testCanReloadSelf(): void
     {
-        $client = new AgentClient(new Config());
+        $client = new AgentClient(ConsulManager::testConfig());
         $err    = $client->Reload();
         static::assertNull($err, \sprintf('AgentClient::reload returned error: %s', $err));
     }
@@ -76,7 +76,7 @@ public function testCanReloadSelf(): void
      */
     public function testCanGetNodeName(): void
     {
-        $client = new AgentClient(new Config());
+        $client = new AgentClient(ConsulManager::testConfig());
 
         [$nodeName, $err] = $client->NodeName();
         static::assertNull($err, \sprintf('Unable to get agent node name: %s', $err));
@@ -92,7 +92,7 @@ public function testCanGetNodeName(): void
      */
     public function testCanGeMembers(): void
     {
-        $client = new AgentClient(new Config());
+        $client = new AgentClient(ConsulManager::testConfig());
 
         [$members, $err] = $client->Members();
         static::assertNull($err, \sprintf('AgentClient::members returned error: %s', $err));
@@ -106,7 +106,7 @@ public function testCanGeMembers(): void
      */
     public function testCanRegisterServiceNoChecks(): void
     {
-        $client = new AgentClient(new Config());
+        $client = new AgentClient(ConsulManager::testConfig());
 
         $svc = new AgentServiceRegistration();
         $svc
@@ -123,7 +123,7 @@ public function testCanRegisterServiceNoChecks(): void
      */
     public function testCanRegisterServiceWithOneCheck(): void
     {
-        $client = new AgentClient(new Config());
+        $client = new AgentClient(ConsulManager::testConfig());
 
         $svc = new AgentServiceRegistration();
         $svc
@@ -145,7 +145,7 @@ public function testCanRegisterServiceWithOneCheck(): void
      */
     public function testCanGetServiceList(): void
     {
-        $client = new AgentClient(new Config());
+        $client = new AgentClient(ConsulManager::testConfig());
 
         [$svcs, $err] = $client->Services();
 
@@ -170,7 +170,7 @@ public function testCanGetServiceList(): void
      */
     public function testCanDeregisterService(): void
     {
-        $client = new AgentClient(new Config());
+        $client = new AgentClient(ConsulManager::testConfig());
 
         $err = $client->ServiceDeregister(self::Service1Name);
         static::assertNull($err, \sprintf('AgentClient::serviceDeregister returned error: %s', $err));
@@ -196,7 +196,7 @@ public function testCanDeregisterService(): void
      */
     public function testCanRegisterServiceWithCheck(): void
     {
-        $client = new AgentClient(new Config());
+        $client = new AgentClient(ConsulManager::testConfig());
 
         $svc = new AgentServiceRegistration();
         $svc

diff --git a/tests/Usage/Catalog/CatalogClientTest.php b/tests/Usage/Catalog/CatalogClientTest.php
@@ -23,9 +23,9 @@
 use DCarbone\PHPConsulAPI\Catalog\CatalogRegistration;
 use DCarbone\PHPConsulAPI\Catalog\CatalogService;
 use DCarbone\PHPConsulAPI\Catalog\Node;
-use DCarbone\PHPConsulAPI\Config;
 use DCarbone\PHPConsulAPI\QueryMeta;
 use DCarbone\PHPConsulAPI\WriteMeta;
+use DCarbone\PHPConsulAPITests\ConsulManager;
 use DCarbone\PHPConsulAPITests\Usage\AbstractUsageTests;
 use PHPUnit\Framework\AssertionFailedError;
 
@@ -48,7 +48,7 @@ final class CatalogClientTest extends AbstractUsageTests
 
     public function testCanConstructClient(): void
     {
-        $client = new CatalogClient(new Config());
+        $client = new CatalogClient(ConsulManager::testConfig());
         static::assertInstanceOf(CatalogClient::class, $client);
     }
 
@@ -57,7 +57,7 @@ public function testCanConstructClient(): void
      */
     public function testCanRegisterService(): void
     {
-        $client = new CatalogClient(new Config());
+        $client = new CatalogClient(ConsulManager::testConfig());
 
         $registration = new CatalogRegistration([
             'Node'    => 'dc1',
@@ -80,7 +80,7 @@ public function testCanRegisterService(): void
      */
     public function testCanGetService(): void
     {
-        $client = new CatalogClient(new Config());
+        $client = new CatalogClient(ConsulManager::testConfig());
 
         [$service, $qm, $err] = $client->Service(self::ServiceName);
         static::assertNull($err, 'CatalogClient::service returned error: ' . $err);
@@ -95,7 +95,7 @@ public function testCanGetService(): void
      */
     public function testCanRegisterSecondServiceWithSameName(): void
     {
-        $client = new CatalogClient(new Config());
+        $client = new CatalogClient(ConsulManager::testConfig());
 
         [$wm, $err] = $client->Register(new CatalogRegistration([
             'Node'    => 'dc1',
@@ -117,7 +117,7 @@ public function testCanRegisterSecondServiceWithSameName(): void
      */
     public function testCanGetListOfService(): void
     {
-        $client = new CatalogClient(new Config());
+        $client = new CatalogClient(ConsulManager::testConfig());
 
         [$service, $qm, $err] = $client->Service(self::ServiceName);
         static::assertNull($err, 'CatalogClient::service returned error: ' . $err);
@@ -140,7 +140,7 @@ public function testCanGetListOfService(): void
      */
     public function testCanGetListOfServices(): void
     {
-        $client = new CatalogClient(new Config());
+        $client = new CatalogClient(ConsulManager::testConfig());
 
         [$services, $qm, $err] = $client->Services();
 
@@ -161,7 +161,7 @@ public function testCanGetListOfServices(): void
      */
     public function testCanDeregisterService(): void
     {
-        $client = new CatalogClient(new Config());
+        $client = new CatalogClient(ConsulManager::testConfig());
 
         [$wm, $err] = $client->Deregister(new CatalogDeregistration([
             'Node'      => 'dc1',
@@ -184,7 +184,7 @@ public function testCanDeregisterService(): void
      */
     public function testCanGetDatacenters(): void
     {
-        $client = new CatalogClient(new Config());
+        $client = new CatalogClient(ConsulManager::testConfig());
 
         [$dcs, $err] = $client->Datacenters();
 
@@ -204,7 +204,7 @@ public function testCanGetDatacenters(): void
      */
     public function testCanGetListOfNodes(): void
     {
-        $client = new CatalogClient(new Config());
+        $client = new CatalogClient(ConsulManager::testConfig());
 
         [$nodes, $qm, $err] = $client->Nodes();
         try {
@@ -225,7 +225,7 @@ public function testCanGetListOfNodes(): void
      */
     public function testCanGetNode(): void
     {
-        $client = new CatalogClient(new Config());
+        $client = new CatalogClient(ConsulManager::testConfig());
 
         [$nodes] = $client->Nodes();
         try {

diff --git a/tests/Usage/ConfigUsageTest.php b/tests/Usage/ConfigUsageTest.php
@@ -31,14 +31,10 @@ final class ConfigUsageTest extends TestCase
     public const DEFAULT_ADDRESS = '127.0.0.1:8500';
     public const DEFAULT_SCHEME  = 'http';
 
-    /**
-     * @return \DCarbone\PHPConsulAPITests\Usage\Config
-     */
-    public function testCanConstructConfig()
+    public function testCanConstructConfig(): void
     {
         $config = new Config();
-        static::assertInstanceOf(Config::class, $config);
-        return $config;
+        self::assertInstanceOf(Config::class, $config);
     }
 
     /**
@@ -51,18 +47,18 @@ public function testConfigDefaults(): void
         $expectedAddress = $_ENV[Consul::HTTPAddrEnvName] ?: self::DEFAULT_ADDRESS;
         $expectedScheme  = $_ENV[Consul::HTTPSSLEnvName] ? 'https' : self::DEFAULT_SCHEME;
 
-        static::assertSame(
+        self::assertSame(
             $expectedAddress,
             $config->getAddress(),
             \sprintf('Default address is not "%s"', $expectedAddress)
         );
-        static::assertSame(
+        self::assertSame(
             $expectedScheme,
             $config->getScheme(),
             \sprintf('Default scheme is not "%s"', $expectedScheme)
         );
-        static::assertNotNull($config->getHttpClient(), 'HttpClient is null');
-        static::assertFalse($config->isInsecureSkipVerify(), 'InsecureSkipVerify is not false');
+        self::assertNotNull($config->getHttpClient(), 'HttpClient is null');
+        self::assertFalse($config->isInsecureSkipVerify(), 'InsecureSkipVerify is not false');
     }
 
     protected function setUp(): void

diff --git a/tests/Usage/Coordinate/CoordinateClientTest.php b/tests/Usage/Coordinate/CoordinateClientTest.php
@@ -16,9 +16,9 @@
    limitations under the License.
  */
 
-use DCarbone\PHPConsulAPI\Config;
 use DCarbone\PHPConsulAPI\Coordinate\CoordinateClient;
 use DCarbone\PHPConsulAPI\QueryMeta;
+use DCarbone\PHPConsulAPITests\ConsulManager;
 use DCarbone\PHPConsulAPITests\Usage\AbstractUsageTests;
 
 /**
@@ -33,7 +33,7 @@ final class CoordinateClientTest extends AbstractUsageTests
 
     public function testCanConstructClient(): void
     {
-        $client = new CoordinateClient(new Config());
+        $client = new CoordinateClient(ConsulManager::testConfig());
         static::assertInstanceOf(CoordinateClient::class, $client);
     }
 
@@ -42,7 +42,7 @@ public function testCanConstructClient(): void
      */
     public function testDatacenters(): void
     {
-        $client = new CoordinateClient(new Config());
+        $client = new CoordinateClient(ConsulManager::testConfig());
 
         [$dcs, $err] = $client->Datacenters();
         static::assertNull($err, \sprintf('CoordinateClient::datacenters() - %s', $err));
@@ -55,7 +55,7 @@ public function testDatacenters(): void
      */
     public function testNodes(): void
     {
-        $client = new CoordinateClient(new Config());
+        $client = new CoordinateClient(ConsulManager::testConfig());
 
         [$nodes, $qm, $err] = $client->Nodes();
         static::assertNull($err, \sprintf('CoordinateClient::nodes() - %s', $err));

diff --git a/tests/Usage/Event/EventClientUsageTest.php b/tests/Usage/Event/EventClientUsageTest.php
@@ -16,8 +16,8 @@
    limitations under the License.
  */
 
-use DCarbone\PHPConsulAPI\Config;
 use DCarbone\PHPConsulAPI\Event\EventClient;
+use DCarbone\PHPConsulAPITests\ConsulManager;
 use DCarbone\PHPConsulAPITests\Usage\AbstractUsageTests;
 
 /**
@@ -32,7 +32,7 @@ final class EventClientUsageTest extends AbstractUsageTests
 
     public function testCanConstructClient(): void
     {
-        $client = new EventClient(new Config());
+        $client = new EventClient(ConsulManager::testConfig());
         static::assertInstanceOf(EventClient::class, $client);
     }
 }