couple bugfixes in agent client

Author: dcarbone

src/Agent/AgentClient.php

@@ -36,6 +36,7 @@ class AgentClient extends AbstractClient
     /**
      * @param bool $refresh
      * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws \Exception
      * @return \DCarbone\PHPConsulAPI\Agent\AgentSelfResponse
      */
     public function Self(bool $refresh = false): AgentSelfResponse
@@ -54,6 +55,7 @@ public function Self(bool $refresh = false): AgentSelfResponse
 
     /**
      * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws \Exception
      * @return \DCarbone\PHPConsulAPI\Agent\MetricsInfoResponse
      */
     public function Metrics(): MetricsInfoResponse
@@ -95,6 +97,7 @@ public function NodeName(bool $refresh = false): ValuedStringResponse
     /**
      * @param string $filter
      * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws \Exception
      * @return \DCarbone\PHPConsulAPI\Agent\AgentChecksResponse
      */
     public function ChecksWithFilter(string $filter): AgentChecksResponse
@@ -119,6 +122,7 @@ public function Checks(): AgentChecksResponse
     /**
      * @param string $filter
      * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws \Exception
      * @return \DCarbone\PHPConsulAPI\Agent\AgentServicesResponse
      */
     public function ServicesWithFilter(string $filter): AgentServicesResponse
@@ -162,6 +166,7 @@ public function AgentHealthServiceByID(string $id): AgentHealthServiceResponse
 
     /**
      * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws \Exception
      * @return \DCarbone\PHPConsulAPI\Agent\AgentMembersResponse
      */
     public function Members(): AgentMembersResponse
@@ -175,6 +180,7 @@ public function Members(): AgentMembersResponse
     /**
      * @param \DCarbone\PHPConsulAPI\Agent\MemberOpts $memberOpts
      * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws \Exception
      * @return \DCarbone\PHPConsulAPI\Agent\AgentMembersResponse
      */
     public function MemberOpts(MemberOpts $memberOpts): AgentMembersResponse
@@ -194,6 +200,7 @@ public function MemberOpts(MemberOpts $memberOpts): AgentMembersResponse
      * @param \DCarbone\PHPConsulAPI\Agent\AgentServiceRegistration $service
      * @param \DCarbone\PHPConsulAPI\Agent\ServiceRegisterOpts $registerOpts
      * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws \Exception
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
     public function ServiceRegisterOpts(AgentServiceRegistration $service, ServiceRegisterOpts $registerOpts): ?Error
@@ -222,6 +229,7 @@ public function ServiceRegister(AgentServiceRegistration $service): ?Error
      *
      * @param string $serviceID
      * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws \Exception
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
     public function ServiceDeregister(string $serviceID): ?Error
@@ -277,6 +285,7 @@ public function FailTTL(string $checkID, string $note): ?Error
      * @param string $output
      * @param string $status
      * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws \Exception
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
     public function UpdateTTL(string $checkID, string $output, string $status): ?Error
@@ -333,6 +342,7 @@ public function CheckDeregister(string $checkID): ?Error
      * @param string $addr
      * @param bool $wan
      * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws \Exception
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
     public function Join(string $addr, bool $wan = false): ?Error
@@ -366,6 +376,7 @@ public function ForceLeave(string $node): ?Error
     /**
      * @param string $node
      * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws \Exception
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
     public function ForceLeavePrune(string $node): ?Error
@@ -379,6 +390,7 @@ public function ForceLeavePrune(string $node): ?Error
      * @param string $serviceID
      * @param string $reason
      * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws \Exception
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
     public function EnableServiceMaintenance(string $serviceID, string $reason = ''): ?Error
@@ -392,6 +404,7 @@ public function EnableServiceMaintenance(string $serviceID, string $reason = '')
     /**
      * @param string $serviceID
      * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws \Exception
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
     public function DisableServiceMaintenance(string $serviceID): ?Error
@@ -404,6 +417,7 @@ public function DisableServiceMaintenance(string $serviceID): ?Error
     /**
      * @param string $reason
      * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws \Exception
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
     public function EnableNodeMaintenance(string $reason = ''): ?Error
@@ -416,6 +430,7 @@ public function EnableNodeMaintenance(string $reason = ''): ?Error
 
     /**
      * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws \Exception
      * @return \DCarbone\PHPConsulAPI\Error|null
      */
     public function DisableNodeMaintenance(): ?Error
@@ -428,6 +443,7 @@ public function DisableNodeMaintenance(): ?Error
     /**
      * @param string $path
      * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws \Exception
      * @return \DCarbone\PHPConsulAPI\Agent\AgentHealthServiceResponse
      */
     protected function _agentHealthService(string $path): AgentHealthServiceResponse

src/Agent/AgentSelfResponse.php

@@ -18,13 +18,13 @@
    limitations under the License.
  */
 
-use DCarbone\PHPConsulAPI\AbstractValuedQueryResponse;
+use DCarbone\PHPConsulAPI\AbstractValuedResponse;
 use DCarbone\PHPConsulAPI\HydratedResponseInterface;
 
 /**
  * Class AgentSelfResponse
  */
-class AgentSelfResponse extends AbstractValuedQueryResponse implements HydratedResponseInterface
+class AgentSelfResponse extends AbstractValuedResponse implements HydratedResponseInterface
 {
     /** @var array|null */
     public ?array $AgentConfig = null;

src/Agent/AgentServicesResponse.php

@@ -18,13 +18,13 @@
    limitations under the License.
  */
 
-use DCarbone\PHPConsulAPI\AbstractValuedQueryResponse;
+use DCarbone\PHPConsulAPI\AbstractValuedResponse;
 use DCarbone\PHPConsulAPI\HydratedResponseInterface;
 
 /**
  * Class AgentServicesResponse
  */
-class AgentServicesResponse extends AbstractValuedQueryResponse implements HydratedResponseInterface
+class AgentServicesResponse extends AbstractValuedResponse implements HydratedResponseInterface
 {
     /** @var \DCarbone\PHPConsulAPI\Agent\AgentService[]|null */
     public ?array $Services = null;

tests/Usage/Agent/AgentClientTest.php

@@ -50,7 +50,8 @@ public function testCanGetSelf(): void
     {
         $client = new AgentClient(new Config());
 
-        $self = $client->Self();
+        [$self, $err] = $client->Self();
+        static::assertNull($err);
         static::assertIsArray(
             $self,
             \sprintf(