Bugfix and tests

- Was using incorrect Check model with "AgentServiceRegistration"
  object.  Will need to check rest of check objects.
- More tests

Author: dcarbone

src/Agent/AgentServiceRegistration.php

@@ -37,9 +37,9 @@ class AgentServiceRegistration extends AbstractModel {
     public $Address = '';
     /** @var bool */
     public $EnableTagOverride = false;
-    /** @var \DCarbone\PHPConsulAPI\Agent\AgentCheck */
+    /** @var \DCarbone\PHPConsulAPI\Agent\AgentServiceCheck */
     public $Check = null;
-    /** @var \DCarbone\PHPConsulAPI\Agent\AgentCheck[] */
+    /** @var \DCarbone\PHPConsulAPI\Agent\AgentServiceCheck[] */
     public $Checks = [];
 
     /**
@@ -49,16 +49,16 @@ class AgentServiceRegistration extends AbstractModel {
     public function __construct(array $data = []) {
         parent::__construct($data);
 
-        if (null !== $this->Check && !($this->Check instanceof AgentCheck)) {
-            $this->Check = new AgentCheck((array)$this->Check);
+        if (null !== $this->Check && !($this->Check instanceof AgentServiceCheck)) {
+            $this->Check = new AgentServiceCheck((array)$this->Check);
         }
 
         if (0 < count($this->Checks)) {
             $this->Checks = array_filter($this->Checks);
             if (0 < ($cnt = count($this->Checks))) {
                 for ($i = 0, $cnt = count($this->Checks); $i < $cnt; $i++) {
-                    if (!($this->Checks[$i] instanceof AgentCheck)) {
-                        $this->Checks[$i] = new AgentCheck($this->Checks[$i]);
+                    if (!($this->Checks[$i] instanceof AgentServiceCheck)) {
+                        $this->Checks[$i] = new AgentServiceCheck($this->Checks[$i]);
                     }
                 }
             }
@@ -146,30 +146,30 @@ public function setEnableTagOverride($EnableTagOverride) {
     }
 
     /**
-     * @return \DCarbone\PHPConsulAPI\Agent\AgentCheck
+     * @return \DCarbone\PHPConsulAPI\Agent\AgentServiceCheck
      */
     public function getCheck() {
         return $this->Check;
     }
 
     /**
-     * @param \DCarbone\PHPConsulAPI\Agent\AgentCheck $Check
+     * @param \DCarbone\PHPConsulAPI\Agent\AgentServiceCheck $Check
      * @return \DCarbone\PHPConsulAPI\Agent\AgentServiceRegistration
      */
-    public function setCheck(AgentCheck $Check) {
+    public function setCheck(AgentServiceCheck $Check) {
         $this->Check = $Check;
         return $this;
     }
 
     /**
-     * @return \DCarbone\PHPConsulAPI\Agent\AgentCheck[]
+     * @return \DCarbone\PHPConsulAPI\Agent\AgentServiceCheck[]
      */
     public function getChecks() {
         return $this->Checks;
     }
 
     /**
-     * @param \DCarbone\PHPConsulAPI\Agent\AgentCheck[] $Checks
+     * @param \DCarbone\PHPConsulAPI\Agent\AgentServiceCheck[] $Checks
      * @return \DCarbone\PHPConsulAPI\Agent\AgentServiceRegistration
      */
     public function setChecks(array $Checks) {
@@ -180,10 +180,10 @@ public function setChecks(array $Checks) {
     }
 
     /**
-     * @param \DCarbone\PHPConsulAPI\Agent\AgentCheck $Check
+     * @param \DCarbone\PHPConsulAPI\Agent\AgentServiceCheck $Check
      * @return $this
      */
-    public function addCheck(AgentCheck $Check) {
+    public function addCheck(AgentServiceCheck $Check) {
         $this->Checks[] = $Check;
         return $this;
     }

tests/Usage/Agent/AgentClientUsageTests.php

@@ -19,6 +19,7 @@
 use DCarbone\PHPConsulAPI\Agent\AgentClient;
 use DCarbone\PHPConsulAPI\Agent\AgentMember;
 use DCarbone\PHPConsulAPI\Agent\AgentService;
+use DCarbone\PHPConsulAPI\Agent\AgentServiceCheck;
 use DCarbone\PHPConsulAPI\Agent\AgentServiceRegistration;
 use DCarbone\PHPConsulAPI\Config;
 use DCarbone\PHPConsulAPITests\ConsulManager;
@@ -174,4 +175,46 @@ public function testCanDeregisterService() {
             throw $e;
         }
     }
+
+    /**
+     * @depends testCanDeregisterService
+     */
+    public function testCanRegisterServiceWithCheck() {
+        $client = new AgentClient(new Config());
+
+        $svc = new AgentServiceRegistration();
+        $svc
+            ->setName(self::ServiceName)
+            ->setPort(1234)
+            ->setAddress('127.0.0.1')
+            ->setCheck(new AgentServiceCheck([
+                'TCP' => '127.0.0.1',
+                'Interval' => '30s',
+            ]));
+
+        $err = $client->serviceRegister($svc);
+        $this->assertNull($err, sprintf('Error registering service with check: %s', $err));
+
+        sleep(2);
+
+        list($svcs, $err) = $client->services();
+
+        try {
+            $this->assertNull($err, sprintf('AgentClient::services returned error: %s', $err));
+            $this->assertInternalType('array', $svcs);
+            $this->assertContainsOnlyInstancesOf(AgentService::class, $svcs);
+            $this->assertCount(2, $svcs);
+        } catch (\PHPUnit_Framework_AssertionFailedError $e) {
+            echo "\nservices list:\n";
+            var_dump($svcs);
+            echo "\n";
+
+            throw $e;
+        }
+
+        $err = $client->serviceDeregister(self::ServiceName);
+        $this->assertNull($err, sprintf('Error deregistering service: %s', $err));
+    }
+
+
 }