fix(Bp4ELhAA): indirect modification of overloaded property in generated DTOs

misha-rollun · misha-rollun · commit 9623ddfd85aa · 2024-12-27T11:24:36.000+01:00
- Updated __get to return 'values' by reference to enable direct modifications.
- Ensured undefined properties return null without throwing exceptions.
diff --git a/src/ClientTest/src/OpenAPI/V1/DTO/ErrorResult.php b/src/ClientTest/src/OpenAPI/V1/DTO/ErrorResult.php
@@ -24,9 +24,13 @@ class ErrorResult implements \IteratorAggregate, \JsonSerializable
      */
     private array $messages;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/ClientTest/src/OpenAPI/V1/DTO/Message.php b/src/ClientTest/src/OpenAPI/V1/DTO/Message.php
@@ -56,9 +56,13 @@ class Message implements \IteratorAggregate, \JsonSerializable
      */
     private string $text;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/ClientTest/src/OpenAPI/V1/DTO/NestedObject.php b/src/ClientTest/src/OpenAPI/V1/DTO/NestedObject.php
@@ -21,9 +21,13 @@ class NestedObject implements \IteratorAggregate, \JsonSerializable
      */
     private string $name;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/ClientTest/src/OpenAPI/V1/DTO/Resource.php b/src/ClientTest/src/OpenAPI/V1/DTO/Resource.php
@@ -55,9 +55,13 @@ class Resource implements \IteratorAggregate, \JsonSerializable
      */
     private array $arrayField;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/ClientTest/src/OpenAPI/V1/DTO/ResourceGETQueryData.php b/src/ClientTest/src/OpenAPI/V1/DTO/ResourceGETQueryData.php
@@ -23,9 +23,13 @@ class ResourceGETQueryData implements \IteratorAggregate, \JsonSerializable
      */
     private string $filter;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/ClientTest/src/OpenAPI/V1/DTO/ResourceListResult.php b/src/ClientTest/src/OpenAPI/V1/DTO/ResourceListResult.php
@@ -33,9 +33,13 @@ class ResourceListResult implements \IteratorAggregate, \JsonSerializable
      */
     private array $messages;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/ClientTest/src/OpenAPI/V1/DTO/ResourcePostRequest.php b/src/ClientTest/src/OpenAPI/V1/DTO/ResourcePostRequest.php
@@ -29,9 +29,13 @@ class ResourcePostRequest implements \IteratorAggregate, \JsonSerializable
      */
     private ?string $optionalField;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/ClientTest/src/OpenAPI/V1/DTO/ResourceResult.php b/src/ClientTest/src/OpenAPI/V1/DTO/ResourceResult.php
@@ -31,9 +31,13 @@ class ResourceResult implements \IteratorAggregate, \JsonSerializable
      */
     private array $messages;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/ClientTest/src/OpenAPI/V1/DTO/SuccessResult.php b/src/ClientTest/src/OpenAPI/V1/DTO/SuccessResult.php
@@ -31,9 +31,13 @@ class SuccessResult implements \IteratorAggregate, \JsonSerializable
      */
     private array $messages;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/Test/src/OpenAPI/V1_0_1/DTO/Bla.php b/src/Test/src/OpenAPI/V1_0_1/DTO/Bla.php
@@ -27,9 +27,13 @@ class Bla implements \IteratorAggregate, \JsonSerializable
      */
     private string $name;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/Test/src/OpenAPI/V1_0_1/DTO/BlaGETQueryData.php b/src/Test/src/OpenAPI/V1_0_1/DTO/BlaGETQueryData.php
@@ -30,9 +30,13 @@ class BlaGETQueryData implements \IteratorAggregate, \JsonSerializable
      */
     private array $id;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/Test/src/OpenAPI/V1_0_1/DTO/BlaResult.php b/src/Test/src/OpenAPI/V1_0_1/DTO/BlaResult.php
@@ -33,9 +33,13 @@ class BlaResult implements \IteratorAggregate, \JsonSerializable
      */
     private array $messages;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/Test/src/OpenAPI/V1_0_1/DTO/Collection.php b/src/Test/src/OpenAPI/V1_0_1/DTO/Collection.php
@@ -23,9 +23,13 @@ class Collection implements \IteratorAggregate, \JsonSerializable
      */
     private array $data;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/Test/src/OpenAPI/V1_0_1/DTO/CustomOperationGetQueryData.php b/src/Test/src/OpenAPI/V1_0_1/DTO/CustomOperationGetQueryData.php
@@ -22,9 +22,13 @@ class CustomOperationGetQueryData implements \IteratorAggregate, \JsonSerializab
      */
     private string $queryParam;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/Test/src/OpenAPI/V1_0_1/DTO/ErrorResult.php b/src/Test/src/OpenAPI/V1_0_1/DTO/ErrorResult.php
@@ -23,9 +23,13 @@ class ErrorResult implements \IteratorAggregate, \JsonSerializable
      */
     private array $messages;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/Test/src/OpenAPI/V1_0_1/DTO/Message.php b/src/Test/src/OpenAPI/V1_0_1/DTO/Message.php
@@ -39,9 +39,13 @@ class Message implements \IteratorAggregate, \JsonSerializable
      */
     private array $context;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/Test/src/OpenAPI/V1_0_1/DTO/OkResponse.php b/src/Test/src/OpenAPI/V1_0_1/DTO/OkResponse.php
@@ -36,9 +36,13 @@ class OkResponse implements \IteratorAggregate, \JsonSerializable
      */
     private array $messages;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/Test/src/OpenAPI/V1_0_1/DTO/Test.php b/src/Test/src/OpenAPI/V1_0_1/DTO/Test.php
@@ -27,9 +27,13 @@ class Test implements \IteratorAggregate, \JsonSerializable
      */
     private string $name;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/Test/src/OpenAPI/V1_0_1/DTO/TestCustom.php b/src/Test/src/OpenAPI/V1_0_1/DTO/TestCustom.php
@@ -27,9 +27,13 @@ class TestCustom implements \IteratorAggregate, \JsonSerializable
      */
     private string $queryParam;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/Test/src/OpenAPI/V1_0_1/DTO/TestCustomResponse.php b/src/Test/src/OpenAPI/V1_0_1/DTO/TestCustomResponse.php
@@ -31,9 +31,13 @@ class TestCustomResponse implements \IteratorAggregate, \JsonSerializable
      */
     private array $messages;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/Test/src/OpenAPI/V1_0_1/DTO/TestGETQueryData.php b/src/Test/src/OpenAPI/V1_0_1/DTO/TestGETQueryData.php
@@ -38,9 +38,13 @@ class TestGETQueryData implements \IteratorAggregate, \JsonSerializable
      */
     private array $id;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/src/Test/src/OpenAPI/V1_0_1/DTO/TestPathParamCustomGETQueryData.php b/src/Test/src/OpenAPI/V1_0_1/DTO/TestPathParamCustomGETQueryData.php
@@ -30,9 +30,13 @@ class TestPathParamCustomGETQueryData implements \IteratorAggregate, \JsonSerial
      */
     private array $arrayParam;
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/template/server/model.mustache b/template/server/model.mustache
@@ -31,9 +31,13 @@ class {{classname}} implements \IteratorAggregate, \JsonSerializable
     private {{>php_data_type}} ${{name}};
 {{/vars}}
 
-    public function __get($name)
+    public function &__get($name)
     {
-        return $this->isInitialized($name) ? $this->{$name} : null;
+        if ($this->isInitialized($name)) {
+            return $this->{$name};
+        }
+        $null = null;
+        return $null;
     }
 
     public function __set(string $name, $value): void
diff --git a/test/functional/Client/ClientTest.php b/test/functional/Client/ClientTest.php

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,13 @@ class ErrorResult implements \IteratorAggregate, \JsonSerializable`
`24`	`24`	`*/`
`25`	`25`	`private array $messages;`
`26`	`26`
`27`		`- public function __get($name)`
	`27`	`+ public function &__get($name)`
`28`	`28`	`{`
`29`		`- return $this->isInitialized($name) ? $this->{$name} : null;`
	`29`	`+ if ($this->isInitialized($name)) {`
	`30`	`+ return $this->{$name};`
	`31`	`+ }`
	`32`	`+ $null = null;`
	`33`	`+ return $null;`
`30`	`34`	`}`
`31`	`35`
`32`	`36`	`public function __set(string $name, $value): void`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,13 @@ class Message implements \IteratorAggregate, \JsonSerializable`
`56`	`56`	`*/`
`57`	`57`	`private string $text;`
`58`	`58`
`59`		`- public function __get($name)`
	`59`	`+ public function &__get($name)`
`60`	`60`	`{`
`61`		`- return $this->isInitialized($name) ? $this->{$name} : null;`
	`61`	`+ if ($this->isInitialized($name)) {`
	`62`	`+ return $this->{$name};`
	`63`	`+ }`
	`64`	`+ $null = null;`
	`65`	`+ return $null;`
`62`	`66`	`}`
`63`	`67`
`64`	`68`	`public function __set(string $name, $value): void`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,13 @@ class NestedObject implements \IteratorAggregate, \JsonSerializable`
`21`	`21`	`*/`
`22`	`22`	`private string $name;`
`23`	`23`
`24`		`- public function __get($name)`
	`24`	`+ public function &__get($name)`
`25`	`25`	`{`
`26`		`- return $this->isInitialized($name) ? $this->{$name} : null;`
	`26`	`+ if ($this->isInitialized($name)) {`
	`27`	`+ return $this->{$name};`
	`28`	`+ }`
	`29`	`+ $null = null;`
	`30`	`+ return $null;`
`27`	`31`	`}`
`28`	`32`
`29`	`33`	`public function __set(string $name, $value): void`
Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,13 @@ class Resource implements \IteratorAggregate, \JsonSerializable`
`55`	`55`	`*/`
`56`	`56`	`private array $arrayField;`
`57`	`57`
`58`		`- public function __get($name)`
	`58`	`+ public function &__get($name)`
`59`	`59`	`{`
`60`		`- return $this->isInitialized($name) ? $this->{$name} : null;`
	`60`	`+ if ($this->isInitialized($name)) {`
	`61`	`+ return $this->{$name};`
	`62`	`+ }`
	`63`	`+ $null = null;`
	`64`	`+ return $null;`
`61`	`65`	`}`
`62`	`66`
`63`	`67`	`public function __set(string $name, $value): void`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,13 @@ class ResourceGETQueryData implements \IteratorAggregate, \JsonSerializable`
`23`	`23`	`*/`
`24`	`24`	`private string $filter;`
`25`	`25`
`26`		`- public function __get($name)`
	`26`	`+ public function &__get($name)`
`27`	`27`	`{`
`28`		`- return $this->isInitialized($name) ? $this->{$name} : null;`
	`28`	`+ if ($this->isInitialized($name)) {`
	`29`	`+ return $this->{$name};`
	`30`	`+ }`
	`31`	`+ $null = null;`
	`32`	`+ return $null;`
`29`	`33`	`}`
`30`	`34`
`31`	`35`	`public function __set(string $name, $value): void`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,13 @@ class ResourceListResult implements \IteratorAggregate, \JsonSerializable`
`33`	`33`	`*/`
`34`	`34`	`private array $messages;`
`35`	`35`
`36`		`- public function __get($name)`
	`36`	`+ public function &__get($name)`
`37`	`37`	`{`
`38`		`- return $this->isInitialized($name) ? $this->{$name} : null;`
	`38`	`+ if ($this->isInitialized($name)) {`
	`39`	`+ return $this->{$name};`
	`40`	`+ }`
	`41`	`+ $null = null;`
	`42`	`+ return $null;`
`39`	`43`	`}`
`40`	`44`
`41`	`45`	`public function __set(string $name, $value): void`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,13 @@ class ResourcePostRequest implements \IteratorAggregate, \JsonSerializable`
`29`	`29`	`*/`
`30`	`30`	`private ?string $optionalField;`
`31`	`31`
`32`		`- public function __get($name)`
	`32`	`+ public function &__get($name)`
`33`	`33`	`{`
`34`		`- return $this->isInitialized($name) ? $this->{$name} : null;`
	`34`	`+ if ($this->isInitialized($name)) {`
	`35`	`+ return $this->{$name};`
	`36`	`+ }`
	`37`	`+ $null = null;`
	`38`	`+ return $null;`
`35`	`39`	`}`
`36`	`40`
`37`	`41`	`public function __set(string $name, $value): void`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,13 @@ class ResourceResult implements \IteratorAggregate, \JsonSerializable`
`31`	`31`	`*/`
`32`	`32`	`private array $messages;`
`33`	`33`
`34`		`- public function __get($name)`
	`34`	`+ public function &__get($name)`
`35`	`35`	`{`
`36`		`- return $this->isInitialized($name) ? $this->{$name} : null;`
	`36`	`+ if ($this->isInitialized($name)) {`
	`37`	`+ return $this->{$name};`
	`38`	`+ }`
	`39`	`+ $null = null;`
	`40`	`+ return $null;`
`37`	`41`	`}`
`38`	`42`
`39`	`43`	`public function __set(string $name, $value): void`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,13 @@ class SuccessResult implements \IteratorAggregate, \JsonSerializable`
`31`	`31`	`*/`
`32`	`32`	`private array $messages;`
`33`	`33`
`34`		`- public function __get($name)`
	`34`	`+ public function &__get($name)`
`35`	`35`	`{`
`36`		`- return $this->isInitialized($name) ? $this->{$name} : null;`
	`36`	`+ if ($this->isInitialized($name)) {`
	`37`	`+ return $this->{$name};`
	`38`	`+ }`
	`39`	`+ $null = null;`
	`40`	`+ return $null;`
`37`	`41`	`}`
`38`	`42`
`39`	`43`	`public function __set(string $name, $value): void`
Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,13 @@ class Bla implements \IteratorAggregate, \JsonSerializable`
`27`	`27`	`*/`
`28`	`28`	`private string $name;`
`29`	`29`
`30`		`- public function __get($name)`
	`30`	`+ public function &__get($name)`
`31`	`31`	`{`
`32`		`- return $this->isInitialized($name) ? $this->{$name} : null;`
	`32`	`+ if ($this->isInitialized($name)) {`
	`33`	`+ return $this->{$name};`
	`34`	`+ }`
	`35`	`+ $null = null;`
	`36`	`+ return $null;`
`33`	`37`	`}`
`34`	`38`
`35`	`39`	`public function __set(string $name, $value): void`