more bugfixin'

Author: dcarbone

src/Coordinate/Coordinate.php

@@ -165,7 +165,7 @@ public function DistanceTo(self $other): Time\Duration
         if ($adjustedDist > 0.0) {
             $dist = $adjustedDist;
         }
-        return new Time\Duration($dist * $secondsToNanoseconds);
+        return Time::Duration($dist * $secondsToNanoseconds);
     }
 
     /**

src/Hydration.php

@@ -59,10 +59,10 @@ final class Hydration
 
     public const OMITEMPTY_FIELD = [self::FIELD_OMITEMPTY => true];
 
-    public const OMITEMPTY_STRING_FIELD       = [self::FIELD_TYPE => self::STRING]                                        + self::OMITEMPTY_FIELD;
-    public const OMITEMPTY_INTEGER_FIELD      = [self::FIELD_TYPE => self::INTEGER]                                       + self::OMITEMPTY_FIELD;
-    public const OMITEMPTY_DOUBLE_FIELD       = [self::FIELD_TYPE => self::DOUBLE]                                        + self::OMITEMPTY_FIELD;
-    public const OMITEMPTY_BOOLEAN_FIELD      = [self::FIELD_TYPE => self::BOOLEAN]                                       + self::OMITEMPTY_FIELD;
+    public const OMITEMPTY_STRING_FIELD       = [self::FIELD_TYPE => self::STRING]  + self::OMITEMPTY_FIELD;
+    public const OMITEMPTY_INTEGER_FIELD      = [self::FIELD_TYPE => self::INTEGER] + self::OMITEMPTY_FIELD;
+    public const OMITEMPTY_DOUBLE_FIELD       = [self::FIELD_TYPE => self::DOUBLE]  + self::OMITEMPTY_FIELD;
+    public const OMITEMPTY_BOOLEAN_FIELD      = [self::FIELD_TYPE => self::BOOLEAN] + self::OMITEMPTY_FIELD;
     public const OMITEMPTY_STRING_ARRAY_FIELD = [
         self::FIELD_TYPE       => self::ARRAY,
         self::FIELD_ARRAY_TYPE => self::STRING,
@@ -89,7 +89,7 @@ public static function hydrateTime(object $instance, string $field, $value): voi
             $instance->{$field} = clone $value;
             return;
         }
-        $instance->{$field} = Time\Time::createFromFormat(Time\Time::DefaultFormat, $value);
+        $instance->{$field} = Time\Time::createFromFormat(\DATE_RFC3339, $value);
     }
 
     /**

src/Operator/OperatorAutopilotStateResponse.php renamed to src/Operator/AutopilotStateResponse.php

@@ -22,9 +22,9 @@
 use DCarbone\PHPConsulAPI\HydratedResponseInterface;
 
 /**
- * Class OperatorAutopilotStateResponse
+ * Class AutopilotStateResponse
  */
-class OperatorAutopilotStateResponse extends AbstractValuedResponse implements HydratedResponseInterface
+class AutopilotStateResponse extends AbstractValuedResponse implements HydratedResponseInterface
 {
     /** @var \DCarbone\PHPConsulAPI\Operator\AutopilotState|null */
     public ?AutopilotState $AutopilotState = null;

src/Operator/OperatorClient.php

@@ -176,12 +176,12 @@ public function AutopilotCASConfiguration(
      * @param \DCarbone\PHPConsulAPI\QueryOptions|null $opts
      * @throws \GuzzleHttp\Exception\GuzzleException
      * @throws \Exception
-     * @return \DCarbone\PHPConsulAPI\Operator\OperatorServerHealthsResponse
+     * @return \DCarbone\PHPConsulAPI\Operator\OperatorHealthReplyResponse
      */
-    public function AutopilotServerHealth(?QueryOptions $opts = null): OperatorServerHealthsResponse
+    public function AutopilotServerHealth(?QueryOptions $opts = null): OperatorHealthReplyResponse
     {
         $resp = $this->_requireOK($this->_doGet('v1/operator/autopilot/health', $opts));
-        $ret  = new OperatorServerHealthsResponse();
+        $ret  = new OperatorHealthReplyResponse();
         $this->_hydrateResponse($resp, $ret);
         return $ret;
     }
@@ -190,12 +190,12 @@ public function AutopilotServerHealth(?QueryOptions $opts = null): OperatorServe
      * @param \DCarbone\PHPConsulAPI\QueryOptions|null $opts
      * @throws \GuzzleHttp\Exception\GuzzleException
      * @throws \Exception
-     * @return \DCarbone\PHPConsulAPI\Operator\OperatorAutopilotStateResponse
+     * @return \DCarbone\PHPConsulAPI\Operator\AutopilotStateResponse
      */
-    public function AutopilotState(?QueryOptions $opts = null): OperatorAutopilotStateResponse
+    public function AutopilotState(?QueryOptions $opts = null): AutopilotStateResponse
     {
         $resp = $this->_requireOK($this->_doGet('v1/operator/autopilot/state', $opts));
-        $ret  = new OperatorAutopilotStateResponse();
+        $ret  = new AutopilotStateResponse();
         $this->_hydrateResponse($resp, $ret);
         return $ret;
     }

src/Operator/OperatorHealthReplyResponse.php

@@ -0,0 +1,47 @@
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPConsulAPI\Operator;
+
+/*
+   Copyright 2016-2021 Daniel Carbone ([email protected])
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ */
+
+use DCarbone\PHPConsulAPI\AbstractValuedResponse;
+use DCarbone\PHPConsulAPI\HydratedResponseInterface;
+
+/**
+ * Class OperatorServerHealthsResponse
+ */
+class OperatorHealthReplyResponse extends AbstractValuedResponse implements HydratedResponseInterface
+{
+    /** @var \DCarbone\PHPConsulAPI\Operator\OperatorHealthReply|null */
+    public ?OperatorHealthReply $OperatorHealthReply = null;
+
+    /**
+     * @return \DCarbone\PHPConsulAPI\Operator\OperatorHealthReply|mixed|null
+     */
+    public function getValue()
+    {
+        return $this->OperatorHealthReply;
+    }
+
+    /**
+     * @param mixed $decodedData
+     */
+    public function hydrateValue($decodedData): void
+    {
+        $this->OperatorHealthReply = new OperatorHealthReply((array)$decodedData);
+    }
+}

tests/Usage/Coordinate/CoordinateUsageTest.php

@@ -4,6 +4,8 @@
 use DCarbone\PHPConsulAPI\Coordinate\Coordinate;
 use DCarbone\PHPConsulAPI\Coordinate\CoordinateConfig;
 use function DCarbone\PHPConsulAPI\Coordinate\diff;
+use DCarbone\PHPConsulAPI\Coordinate\DimensionalityConflictException;
+
 use function DCarbone\PHPConsulAPI\Coordinate\magnitude;
 use function DCarbone\PHPConsulAPI\Coordinate\unitVectorAt;
 use DCarbone\PHPConsulAPITests\Usage\AbstractUsageTests;
@@ -73,9 +75,11 @@ public function testCanConstructCoordinateWithDefaultConfig(): void
 
     public function testCanConstructCoordinateWithArrayOfValues(): void
     {
-        $coord = new Coordinate([
-            'Vec' => [0.1, 0.2],
-        ]);
+        $coord = new Coordinate(
+            [
+                'Vec' => [0.1, 0.2],
+            ]
+        );
         static::assertInstanceOf(Coordinate::class, $coord);
         static::assertIsArray($coord->Vec);
         static::assertCount(2, $coord->Vec);
@@ -140,7 +144,7 @@ public function testIsCompatibleWith(): void
 
     public function testApplyForce(): void
     {
-        $this->expectException(\DCarbone\PHPConsulAPI\Coordinate\DimensionalityConflictException::class);
+        $this->expectException(DimensionalityConflictException::class);
 
         $config                 = CoordinateConfig::Default();
         $config->Dimensionality = 3;
@@ -178,7 +182,7 @@ public function testApplyForce(): void
 
     public function testDistanceTo(): void
     {
-        $this->expectException(\DCarbone\PHPConsulAPI\Coordinate\DimensionalityConflictException::class);
+        $this->expectException(DimensionalityConflictException::class);
 
         $config                 = CoordinateConfig::Default();
         $config->Dimensionality = 3;

tests/Usage/Session/SessionClientUsageTest.php

@@ -53,7 +53,7 @@ public function testNoChecksLifecycle(): void
         $session = $sessions[0];
 
         static::assertInstanceOf(Time\Duration::class, $session->LockDelay);
-        static::assertSame(0, $session->LockDelay->Nanoseconds());
+        static::assertSame(15 * Time::Second, $session->LockDelay->Nanoseconds());
 
         [$sessions, $wm, $err] = $client->Renew($id);
         static::assertNull($err, \sprintf('Error renewing session: %s', $err));
@@ -67,6 +67,7 @@ public function testNoChecksLifecycle(): void
 
         [$sessions, $_, $err] = $client->Info($id);
         static::assertNull($err, \sprintf('Error getting list after expected expiration: %s', $err));
-        static::assertNull($sessions, 'Expected $sessions to be null');
+        static::assertIsArray($sessions, 'Expected $sessions to be an array');
+        static::assertCount(0, $sessions, 'Expected $sessions to be empty');
     }
 }