feature: only update the changed properties of the task blocks

Author: Greg Bowler

src/Configuration/Manifest.php

@@ -41,7 +41,7 @@ public function __construct(string $jsonFilePath, ?string $mode = null) {
 // For legacy reasons, stdClass is used to represent the block details.
 // This code might look weird, but it remains backwards compatible until an OOP
 // refactoring is made.
-			$json = (object)array_merge((array)$json, (array)$modeJson);
+			$json = $this->recursiveMerge($json, $modeJson);
 		}
 
 		$this->taskBlockList = [];
@@ -84,4 +84,22 @@ protected function setIteratorKey():void {
 		$keys = array_keys($this->taskBlockList);
 		$this->iteratorKey = $keys[$this->iteratorIndex] ?? null;
 	}
+
+	private function recursiveMerge(object $json, object $diff):object {
+		foreach($diff as $key => $value) {
+			if(property_exists($json, $key)) {
+				if(is_object($value)) {
+					$json->$key = $this->recursiveMerge($json->$key, $value);
+				}
+				else {
+					$json->$key = $value;
+				}
+			}
+			else {
+				$json->$key = $value;
+			}
+		}
+
+		return $json;
+	}
 }

test/phpunit/Helper/Json/build.single-property-override.json

@@ -0,0 +1,7 @@
+{
+	"/tmp/phpgt/build/*.txt": {
+		"execute": {
+			"arguments": ["hello", "text", "single", "property"]
+		}
+	}
+}

test/phpunit/ManifestTest.php

@@ -35,4 +35,24 @@ public function testIterator_mode():void {
 			next($jsonObj);
 		}
 	}
+
+	public function testIterator_modeOnlyOverridesSingleProperty():void {
+		$jsonFile = "test/phpunit/Helper/Json/build.json";
+		$jsonObj = json_decode(file_get_contents($jsonFile), true);
+
+		$sut = new Manifest($jsonFile, "single-property-override");
+		/** @var TaskBlock $taskBlock */
+		foreach($sut as $taskBlock) {
+			$currentJsonObj = current($jsonObj);
+			self::assertSame($currentJsonObj["name"], $taskBlock->getName());
+
+			if($currentJsonObj["name"] === "Example dev TXT") {
+				self::assertSame(["hello", "text", "single", "property"], $taskBlock->getExecuteBlock()->arguments);
+			}
+			else {
+				self::assertSame($currentJsonObj["execute"]["arguments"], $taskBlock->getExecuteBlock()->arguments);
+			}
+			next($jsonObj);
+		}
+	}
 }