allowing old map-style construction

dcarbone · dcarbone · commit c1b73737b93e · 2025-04-10T21:18:05.000-05:00
diff --git a/src/ACL/ACLAuthMethod.php b/src/ACL/ACLAuthMethod.php
@@ -39,6 +39,7 @@ class ACLAuthMethod extends AbstractModel
     public string $Namespace;
 
     public function __construct(
+        array $data = [], // Deprecated, will be removed.
         string $ID = '',
         string $Name = '',
         string $Type = '',
@@ -51,6 +52,10 @@ public function __construct(
         iterable $NamespaceRules = [],
         string $Namespace = ''
     ) {
+        if ([] !== $data) {
+            $this->jsonUnserialize((object)$data, $this);
+            return;
+        }
         $this->ID = $ID;
         $this->Name = $Name;
         $this->Type = $Type;
@@ -202,9 +207,9 @@ public function setNamespace(string $Namespace): self
         return $this;
     }
 
-    public static function jsonUnserialize(\stdClass $decoded): self
+    public static function jsonUnserialize(\stdClass $decoded, null|self $into = null): self
     {
-        $n = new static();
+        $n = $into ?? new static();
         foreach ($decoded as $k => $v) {
             switch ($k) {
                 case 'MaxTokenTTL':
diff --git a/src/ACL/ACLAuthMethodListEntry.php b/src/ACL/ACLAuthMethodListEntry.php
@@ -41,6 +41,7 @@ class ACLAuthMethodListEntry extends AbstractModel
     public string $Namespace;
 
     public function __construct(
+        array $data = [], // Deprecated, will be removed.
         string $Name = '',
         string $Type = '',
         string $DisplayName = '',
@@ -51,6 +52,10 @@ public function __construct(
         int $ModifyIndex = 0,
         string $Namespace = ''
     ) {
+        if ([] !== $data) {
+            $this->jsonUnserialize((object)$data, $this);
+            return;
+        }
         $this->Name = $Name;
         $this->Type = $Type;
         $this->DisplayName = $DisplayName;
@@ -174,9 +179,9 @@ public function setNamespace(string $Namespace): self
         return $this;
     }
 
-    public static function jsonUnserialize(\stdClass $decoded): self
+    public static function jsonUnserialize(\stdClass $decoded, null|self $into = null): self
     {
-        $n = new static();
+        $n = $into ?? new static();
         foreach ($decoded as $k => $v) {
             if (null === $v) {
                 continue;
diff --git a/src/ACL/ACLAuthMethodNamespaceRule.php b/src/ACL/ACLAuthMethodNamespaceRule.php
@@ -27,8 +27,15 @@ class ACLAuthMethodNamespaceRule extends AbstractModel
     public string $Selector;
     public string $BindNamespace;
 
-    public function __construct(string $Selector = '', string $BindNamespace = '')
-    {
+    public function __construct(
+        array $data = [], // Deprecated, will be removed.
+        string $Selector = '',
+        string $BindNamespace = '',
+    ) {
+        if ([] !== $data) {
+            $this->jsonUnserialize((object)$data, $this);
+            return;
+        }
         $this->Selector = $Selector;
         $this->BindNamespace = $BindNamespace;
     }
@@ -55,9 +62,9 @@ public function setBindNamespace(string $BindNamespace): self
         return $this;
     }
 
-    public static function jsonUnserialize(\stdClass $decoded): self
+    public static function jsonUnserialize(\stdClass $decoded, null|self $into = null): self
     {
-        $n = new static();
+        $n = $into ?? new static();
         foreach ($decoded as $k => $v) {
             $n->{$k} = $v;
         }
diff --git a/src/ACL/ACLBindingRule.php b/src/ACL/ACLBindingRule.php
@@ -35,6 +35,7 @@ class ACLBindingRule extends AbstractModel
     public string $Namespace;
 
     public function __construct(
+        array $data = [], // Deprecated, will be removed.
         string $ID = '',
         string $Description = '',
         string $AuthMethod = '',
@@ -45,6 +46,10 @@ public function __construct(
         int $ModifyIndex = 0,
         string $Namespace = ''
     ) {
+        if ([] !== $data) {
+            $this->jsonUnserialize((object)$data, $this);
+            return;
+        }
         $this->ID = $ID;
         $this->Description = $Description;
         $this->AuthMethod = $AuthMethod;
@@ -155,9 +160,9 @@ public function setNamespace(string $Namespace): self
         return $this;
     }
 
-    public static function jsonUnserialize(\stdClass $decoded): self
+    public static function jsonUnserialize(\stdClass $decoded, null|self $into = null): self
     {
-        $n = new static();
+        $n = $into ?? new static();
         foreach ($decoded as $k => $v) {
             $n->{$k} = $v;
         }
diff --git a/src/ACL/ACLEntry.php b/src/ACL/ACLEntry.php
@@ -32,13 +32,18 @@ class ACLEntry extends AbstractModel
     public string $Rules;
 
     public function __construct(
+        array $data = [], // Deprecated, will be removed.
         int $CreateIndex = 0,
         int $ModifyIndex = 0,
         string $ID = '',
         string $Name = '',
         string $Type = '',
         string $Rules = ''
     ) {
+        if ([] !== $data) {
+            $this->jsonUnserialize((object)$data, $this);
+            return;
+        }
         $this->CreateIndex = $CreateIndex;
         $this->ModifyIndex = $ModifyIndex;
         $this->ID = $ID;
@@ -113,9 +118,9 @@ public function setRules(string $rules): self
         return $this;
     }
 
-    public static function jsonUnserialize(\stdClass $decoded): self
+    public static function jsonUnserialize(\stdClass $decoded, null|self $into = null): self
     {
-        $n = new static();
+        $n = $into ?? new static();
         foreach ($decoded as $k => $v) {
             $n->{$k} = $v;
         }
diff --git a/src/ACL/ACLLink.php b/src/ACL/ACLLink.php
@@ -27,8 +27,15 @@ class ACLLink extends AbstractModel
     public string $ID;
     public string $Name;
 
-    public function __construct(string $ID = '', string $Name = '')
-    {
+    public function __construct(
+        array $data = [], // Deprecated, will be removed.
+        string $ID = '',
+        string $Name = '',
+    ) {
+        if ([] !== $data) {
+            $this->jsonUnserialize((object)$data, $this);
+            return;
+        }
         $this->ID = $ID;
         $this->Name = $Name;
     }
@@ -55,9 +62,9 @@ public function setName(string $Name): self
         return $this;
     }
 
-    public static function jsonUnserialize(\stdClass $decoded): self
+    public static function jsonUnserialize(\stdClass $decoded, null|self $into = null): self
     {
-        $n = new static();
+        $n = $into ?? new static();
         foreach ($decoded as $k => $v) {
             $n->{$k} = $v;
         }
diff --git a/src/ACL/ACLLoginParams.php b/src/ACL/ACLLoginParams.php
@@ -28,8 +28,16 @@ class ACLLoginParams extends AbstractModel
     public string $BearerToken;
     public null|array $Meta;
 
-    public function __construct(string $AuthMethod = '', string $BearerToken = '', null|array|\stdClass $Meta = null)
-    {
+    public function __construct(
+        array $data = [], // Deprecated, will be removed.
+        string $AuthMethod = '',
+        string $BearerToken = '',
+        null|array|\stdClass $Meta = null,
+    ) {
+        if ([] !== $data) {
+            $this->jsonUnserialize((object)$data, $this);
+            return;
+        }
         $this->AuthMethod = $AuthMethod;
         $this->BearerToken = $BearerToken;
         $this->setMeta($Meta);
@@ -71,9 +79,9 @@ public function setMeta(null|array|\stdClass $Meta): self
         return $this;
     }
 
-    public static function jsonUnserialize(\stdClass $decoded): self
+    public static function jsonUnserialize(\stdClass $decoded, null|self $into = null): self
     {
-        $n = new static();
+        $n = $into ?? new static();
         foreach ($decoded as $k => $v) {
             if ('Meta' === $k) {
                 $n->setMeta($v);
diff --git a/src/ACL/ACLNodeIdentity.php b/src/ACL/ACLNodeIdentity.php
@@ -27,8 +27,15 @@ class ACLNodeIdentity extends AbstractModel
     public string $NodeName;
     public string $Datacenter;
 
-    public function __construct(string $NodeName = '', string $Datacenter = '')
-    {
+    public function __construct(
+        array $data = [], // Deprecated, will be removed.
+        string $NodeName = '',
+        string $Datacenter = ''
+    ) {
+        if ([] !== $data) {
+            $this->jsonUnserialize((object)$data, $this);
+            return;
+        }
         $this->NodeName = $NodeName;
         $this->Datacenter = $Datacenter;
     }
@@ -43,9 +50,9 @@ public function getDatacenter(): string
         return $this->Datacenter;
     }
 
-    public static function jsonUnserialize(\stdClass $decoded): self
+    public static function jsonUnserialize(\stdClass $decoded, null|self $into = null): self
     {
-        $n = new static();
+        $n = $into ?? new static();
         foreach ($decoded as $k => $v) {
             $n->{$k} = $v;
         }
diff --git a/src/ACL/ACLOIDCAuthURLParams.php b/src/ACL/ACLOIDCAuthURLParams.php
@@ -30,11 +30,16 @@ class ACLOIDCAuthURLParams extends AbstractModel
     public null|array $Meta;
 
     public function __construct(
+        array $data = [], // Deprecated, will be removed.
         string $AuthMethod = '',
         string $RedirectURI = '',
         string $ClientNonce = '',
         null|array|\stdClass $Meta = null
     ) {
+        if ([] !== $data) {
+            $this->jsonUnserialize((object)$data, $this);
+            return;
+        }
         $this->AuthMethod = $AuthMethod;
         $this->RedirectURI = $RedirectURI;
         $this->ClientNonce = $ClientNonce;
@@ -88,9 +93,10 @@ public function setMeta(null|array|\stdClass $Meta): self
         return $this;
     }
 
-    public static function jsonUnserialize(\stdClass $decoded): self
+
+    public static function jsonUnserialize(\stdClass $decoded, null|self $into = null): self
     {
-        $n = new static();
+        $n = $into ?? new static();
         foreach ($decoded as $k => $v) {
             if ('Meta' === $k) {
                 $n->setMeta($v);
diff --git a/src/ACL/ACLOIDCCallbackParams.php b/src/ACL/ACLOIDCCallbackParams.php
@@ -30,11 +30,16 @@ class ACLOIDCCallbackParams extends AbstractModel
     public string $ClientNonce;
 
     public function __construct(
+        array $data = [], // Deprecated, will be removed.
         string $AuthMethod = '',
         string $State = '',
         string $Code = '',
         string $ClientNonce = '',
     ) {
+        if ([] !== $data) {
+            $this->jsonUnserialize((object)$data, $this);
+            return;
+        }
         $this->AuthMethod = $AuthMethod;
         $this->State = $State;
         $this->Code = $Code;
@@ -85,9 +90,9 @@ public function setClientNonce(string $ClientNonce): self
         return $this;
     }
 
-    public static function jsonUnserialize(\stdClass $decoded): self
+    public static function jsonUnserialize(\stdClass $decoded, null|self $into = null): self
     {
-        $n = new static();
+        $n = $into ?? new static();
         foreach ($decoded as $k => $v) {
             $n->{$k} = $v;
         }
diff --git a/src/ACL/ACLPolicy.php b/src/ACL/ACLPolicy.php
@@ -35,6 +35,7 @@ class ACLPolicy extends AbstractModel
     public string $Namespace;
 
     public function __construct(
+        array $data = [], // Deprecated, will be removed.
         string $ID = '',
         string $Name = '',
         string $Description = '',
@@ -45,6 +46,10 @@ public function __construct(
         int $ModifyIndex = 0,
         string $Namespace = ''
     ) {
+        if ([] !== $data) {
+            $this->jsonUnserialize((object)$data, $this);
+            return;
+        }
         $this->ID = $ID;
         $this->Name = $Name;
         $this->Description = $Description;
@@ -156,9 +161,9 @@ public function setNamespace(string $Namespace): self
         return $this;
     }
 
-    public static function jsonUnserialize(\stdClass $decoded): self
+    public static function jsonUnserialize(\stdClass $decoded, null|self $into = null): self
     {
-        $n = new static();
+        $n = $into ?? new static();
         foreach ($decoded as $k => $v) {
             if ('Datacenters' === $k) {
                 $n->setDatacenters(...$v);
diff --git a/src/ACL/ACLPolicyListEntry.php b/src/ACL/ACLPolicyListEntry.php
@@ -34,6 +34,7 @@ class ACLPolicyListEntry extends AbstractModel
     public string $Namespace;
 
     public function __construct(
+        array $data = [], // Deprecated, will be removed.
         string $ID = '',
         string $Name = '',
         string $Description = '',
@@ -43,6 +44,10 @@ public function __construct(
         int $ModifyIndex = 0,
         string $Namespace = '',
     ) {
+        if ([] !== $data) {
+            $this->jsonUnserialize((object)$data, $this);
+            return;
+        }
         $this->ID = $ID;
         $this->Name = $Name;
         $this->Description = $Description;
@@ -141,9 +146,9 @@ public function setNamespace(string $Namespace): self
         return $this;
     }
 
-    public static function jsonUnserialize(\stdClass $decoded): self
+    public static function jsonUnserialize(\stdClass $decoded, null|self $into = null): self
     {
-        $n = new static();
+        $n = $into ?? new static();
         foreach ($decoded as $k => $v) {
             if ('Datacenters' === $k) {
                 $n->setDatacenters(...$v);
diff --git a/src/ACL/ACLReplicationStatus.php b/src/ACL/ACLReplicationStatus.php
@@ -35,6 +35,7 @@ class ACLReplicationStatus extends AbstractModel
     public Time\Time $LastError;
 
     public function __construct(
+        array $data = [], // Deprecated, will be removed.
         bool $Enabled = false,
         bool $Running = false,
         string $SourceDatacenter = '',
@@ -44,6 +45,10 @@ public function __construct(
         null|Time\Time $LastSuccess = null,
         null|Time\Time $LastError = null,
     ) {
+        if ([] !== $data) {
+            $this->jsonUnserialize((object)$data, $this);
+            return;
+        }
         $this->Enabled = $Enabled;
         $this->Running = $Running;
         $this->SourceDatacenter = $SourceDatacenter;
@@ -94,9 +99,9 @@ public function getLastError(): Time\Time
         return $this->LastError;
     }
 
-    public static function jsonUnserialize(\stdClass $decoded): self
+    public static function jsonUnserialize(\stdClass $decoded, null|self $into = null): self
     {
-        $n = new static();
+        $n = $into ?? new static();
         foreach ($decoded as $k => $v) {
             if ('LastSuccess' === $k) {
                 $n->LastSuccess = Time\Time::createFromFormat(DATE_RFC3339, $v);
diff --git a/src/ACL/ACLRole.php b/src/ACL/ACLRole.php
diff --git a/src/ACL/ACLServiceIdentity.php b/src/ACL/ACLServiceIdentity.php
diff --git a/src/ACL/ACLToken.php b/src/ACL/ACLToken.php
diff --git a/src/ACL/ACLTokenListEntry.php b/src/ACL/ACLTokenListEntry.php
diff --git a/src/ACL/KubernetesAuthMethodConfig.php b/src/ACL/KubernetesAuthMethodConfig.php
diff --git a/src/ACL/OIDCAuthMethodConfig.php b/src/ACL/OIDCAuthMethodConfig.php
