Custom field support for constructors

Author: phpfui

Tests/CustomFieldTest.php

@@ -20,6 +20,28 @@ public function testGetSet() : void
 		$this->assertIsString($fixture->cf_string);
 		}
 
+	public function testJsonOutput() : void
+		{
+		$class = new \Tests\Fixtures\CustomFieldTest();
+		$class->cf_gender = 'mail';
+		$class->cf_firstName = 'First';
+		$class->cf_lastName = 'Class';
+
+		$json = $class->getJSON();
+		$expectedJSON = '{
+    "cf:gender": "mail",
+    "cf:firstName": "First",
+    "cf:lastName": "Class"
+}';
+		// normalize line endings
+		$expectedJSON = \str_replace("\r\n", "\n", $expectedJSON);
+		$this->assertEquals($expectedJSON, $json);
+
+		$class = new \Tests\Fixtures\CustomFieldTest(['cf_gender' => 'mail', 'cf_firstName' => 'First', 'cf_lastName' => 'Class']);
+		$json = $class->getJSON();
+		$this->assertEquals($expectedJSON, $json);
+		}
+
 	public function testBadIntType() : void
 		{
 		$fixture = new \Tests\Fixtures\CustomFieldTest();

Tests/DefinitionTest.php

@@ -61,7 +61,6 @@ public function testGetSet() : void
 
 		$json = $fixture->getJSON();
 		$expectedJSON = '{
-    "class": [],
     "integer": 123,
     "string": "A long string",
     "boolean": true,
@@ -73,7 +72,8 @@ public function testGetSet() : void
     "float": 1.23,
     "enum": "primary_email",
     "intEnum": 1,
-    "ucEnum": "REMOVED"
+    "ucEnum": "REMOVED",
+    "class": []
 }';
 		// normalize line endings
 		$expectedJSON = \str_replace("\r\n", "\n", $expectedJSON);

src/ConstantContact/Definition/Base.php

@@ -51,21 +51,32 @@ abstract class Base
 
 	public function __construct(array $initialValues = [])
 		{
-		foreach (static::$fields as $field => $type)
+		foreach ($initialValues as $field => $value)
 			{
-			if (! empty($initialValues[$field]))
+			$actualField = $field;
+			if (str_starts_with($field, 'cf_'))
 				{
-				$this->{$field} = $initialValues[$field];
+				$field = 'cf:custom_field_name';
+				}
+			$type = static::$fields[$field] ?? null;
+			if (! $type)
+				{
+				continue;
+				}
+
+			if (! empty(static::$fields[$field]))
+				{
+				$this->{$actualField} = $value;
 				}
 			elseif (! \is_array($type) && ! isset(self::$scalars[$type]))
 				{
 				if (\str_starts_with($type, 'array'))
 					{
-					$this->data[$field] = [];
+					$this->data[$actualField] = [];
 					}
 				else
 					{
-					$this->data[$field] = new $type();
+					$this->data[$actualField] = new $type();
 					}
 				}
 			}