more work.

Author: dcarbone

src/ACL/ACLToken.php

@@ -27,6 +27,13 @@ class ACLToken extends AbstractModel
 {
     use ACLTokenFields;
 
+    /**
+     * @param array<\DCarbone\PHPConsulAPI\ACL\ACLTokenPolicyLink> $Policies
+     * @param array<\DCarbone\PHPConsulAPI\ACL\ACLTokenRoleLink> $Roles
+     * @param array<\DCarbone\PHPConsulAPI\ACL\ACLServiceIdentity> $ServiceIdentities
+     * @param array<\DCarbone\PHPConsulAPI\ACL\ACLNodeIdentity> $NodeIdentities
+     * @param array<\DCarbone\PHPConsulAPI\ACL\ACLTemplatedPolicy> $TemplatePolicies
+     */
     public function __construct(
         int $CreateIndex = 0,
         int $ModifyIndex = 0,

src/ACL/ACLTokenExpanded.php

@@ -37,33 +37,15 @@ class ACLTokenExpanded extends ACLToken
     public string $ResolvedByAgent;
 
     /**
-     * @param iterable $ExpandedPolicies
-     * @param iterable $ExpandedRoles
-     * @param iterable $NamespaceDefaultPolicyIDs
-     * @param iterable $NamespaceDefaultRoleIDs
-     * @param string $AgentACLDefaultPolicy
-     * @param string $AgentACLDownPolicy
-     * @param string $ResolvedByAgent
-     * @param int $CreateIndex
-     * @param int $ModifyIndex
-     * @param string $AccessorID
-     * @param string $SecretID
-     * @param string $Description
-     * @param iterable $Policies
-     * @param iterable $Roles
-     * @param iterable $ServiceIdentities
-     * @param iterable $NodeIdentities
-     * @param iterable $TemplatePolicies
-     * @param bool $Local
-     * @param string $AuthMethod
-     * @param \DateInterval|float|int|string|\DCarbone\Go\Time\Duration|null $ExpirationTTL
-     * @param \DCarbone\Go\Time\Time|null $ExpirationTime
-     * @param \DCarbone\Go\Time\Time|null $CreateTime
-     * @param string $Hash
-     * @param string $Namespace
-     * @param string $Rules
-     * @param string $Partition
-     * @param string $AuthMethodNamespace
+     * @param array<\DCarbone\PHPConsulAPI\ACL\ACLPolicy> $ExpandedPolicies
+     * @param array<\DCarbone\PHPConsulAPI\ACL\ACLRole> $ExpandedRoles
+     * @param array<string> $NamespaceDefaultPolicyIDs
+     * @param array<string> $NamespaceDefaultRoleIDs
+     * @param array<\DCarbone\PHPConsulAPI\ACL\ACLTokenPolicyLink> $Policies
+     * @param array<\DCarbone\PHPConsulAPI\ACL\ACLTokenRoleLink> $Roles
+     * @param array<\DCarbone\PHPConsulAPI\ACL\ACLServiceIdentity> $ServiceIdentities
+     * @param array<\DCarbone\PHPConsulAPI\ACL\ACLNodeIdentity> $NodeIdentities
+     * @param array<\DCarbone\PHPConsulAPI\ACL\ACLTemplatedPolicy> $TemplatePolicies
      */
     public function __construct(
         iterable $ExpandedPolicies = [],
@@ -140,7 +122,7 @@ public function setExpandedPolicies(ACLPolicy ...$ExpandedPolicies): self
     }
 
     /**
-     * @return \DCarbone\PHPConsulAPI\ACL\ACLRole[]
+     * @return array<\DCarbone\PHPConsulAPI\ACL\ACLRole>
      */
     public function getExpandedRoles(): array
     {
@@ -220,7 +202,9 @@ public static function jsonUnserialize(\stdClass $decoded, null|ACLToken $into =
         foreach ($decoded as $k => $v) {
             if ($n->_jsonUnserializeField($k, $v, $n)) {
                 continue;
-            } elseif ('ExpandedPolicies' === $k) {
+            }
+
+            if ('ExpandedPolicies' === $k) {
                 foreach ($v as $vv) {
                     $n->ExpandedPolicies[] = ACLPolicy::jsonUnserialize($vv);
                 }
@@ -241,6 +225,16 @@ public static function jsonUnserialize(\stdClass $decoded, null|ACLToken $into =
 
     public function jsonSerialize(): \stdClass
     {
-        return parent::jsonSerialize(); // TODO: Change the autogenerated stub
+        $out = parent::jsonSerialize();
+
+        $out->ExpandedPolicies = $this->ExpandedPolicies;
+        $out->ExpandedRoles = $this->ExpandedRoles;
+        $out->NamespaceDefaultPolicyIDs = $this->NamespaceDefaultPolicyIDs;
+        $out->NamespaceDefaultRoleIDs = $this->NamespaceDefaultRoleIDs;
+        $out->AgentACLDefaultPolicy = $this->AgentACLDefaultPolicy;
+        $out->AgentACLDownPolicy = $this->AgentACLDownPolicy;
+        $out->ResolvedByAgent = $this->ResolvedByAgent;
+
+        return $out;
     }
 }

src/ACL/ACLTokenFields.php

@@ -29,15 +29,15 @@ trait ACLTokenFields
     public string $AccessorID;
     public string $SecretID;
     public string $Description;
-    /** @var \DCarbone\PHPConsulAPI\ACL\ACLTokenPolicyLink[] */
+    /** @var array<\DCarbone\PHPConsulAPI\ACL\ACLTokenPolicyLink> */
     public array $Policies;
-    /** @var \DCarbone\PHPConsulAPI\ACL\ACLTokenRoleLink[] */
+    /** @var array<\DCarbone\PHPConsulAPI\ACL\ACLTokenRoleLink> */
     public array $Roles;
-    /** @var \DCarbone\PHPConsulAPI\ACL\ACLServiceIdentity[] */
+    /** @var array<\DCarbone\PHPConsulAPI\ACL\ACLServiceIdentity> */
     public array $ServiceIdentities;
-    /** @var \DCarbone\PHPConsulAPI\ACL\ACLNodeIdentity[] */
+    /** @var array<\DCarbone\PHPConsulAPI\ACL\ACLNodeIdentity> */
     public array $NodeIdentities;
-    /** @var \DCarbone\PHPConsulAPI\ACL\ACLTemplatedPolicy[] */
+    /** @var array>\DCarbone\PHPConsulAPI\ACL\ACLTemplatedPolicy> */
     public array $TemplatePolicies;
     public bool $Local;
     public string $AuthMethod;
@@ -286,7 +286,7 @@ public function setAuthMethodNamespace(string $AuthMethodNamespace): self
         return $this;
     }
 
-    public function _jsonUnserializeField(string $k, mixed $v, object $n): bool
+    protected function _jsonUnserializeField(string $k, mixed $v, object $n): bool
     {
         if ('Policies' === $k) {
             foreach ($v as $vv) {