Type: PREVENT_MERGING prevents merging with defaults [Closes #14, Closes

nette/application#257, nette/di#229]
nette · Dec 20, 2020 · 3b6b970 · 3b6b970
1 parent 0bfe37c
commit 3b6b970
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 2 deletions.
diff --git a/src/Schema/Elements/Structure.php b/src/Schema/Elements/Structure.php
@@ -77,10 +77,15 @@ public function otherItems($type = 'mixed'): self
 
 	public function normalize($value, Context $context)
 	{
+		if ($prevent = (is_array($value) && isset($value[Helpers::PREVENT_MERGING]))) {
+			unset($value[Helpers::PREVENT_MERGING]);
+		}
+
 		$value = $this->doNormalize($value, $context);
 		if (is_object($value)) {
 			$value = (array) $value;
 		}
+
 		if (is_array($value)) {
 			foreach ($value as $key => $val) {
 				$itemSchema = $this->items[$key] ?? $this->otherItems;
@@ -90,6 +95,9 @@ public function normalize($value, Context $context)
 					array_pop($context->path);
 				}
 			}
+			if ($prevent) {
+				$value[Helpers::PREVENT_MERGING] = true;
+			}
 		}
 		return $value;
 	}

diff --git a/src/Schema/Elements/Type.php b/src/Schema/Elements/Type.php
@@ -103,6 +103,10 @@ public function pattern(?string $pattern): self
 
 	public function normalize($value, Context $context)
 	{
+		if ($prevent = (is_array($value) && isset($value[Helpers::PREVENT_MERGING]))) {
+			unset($value[Helpers::PREVENT_MERGING]);
+		}
+
 		$value = $this->doNormalize($value, $context);
 		if (is_array($value) && $this->items) {
 			foreach ($value as $key => $val) {
@@ -111,6 +115,9 @@ public function normalize($value, Context $context)
 				array_pop($context->path);
 			}
 		}
+		if ($prevent && is_array($value)) {
+			$value[Helpers::PREVENT_MERGING] = true;
+		}
 		return $value;
 	}
 
@@ -142,6 +149,12 @@ public function merge($value, $base)
 
 	public function complete($value, Context $context)
 	{
+		$merge = $this->merge;
+		if (is_array($value) && isset($value[Helpers::PREVENT_MERGING])) {
+			unset($value[Helpers::PREVENT_MERGING]);
+			$merge = false;
+		}
+
 		if ($value === null && is_array($this->default)) {
 			$value = []; // is unable to distinguish null from array in NEON
 		}
@@ -180,7 +193,7 @@ public function complete($value, Context $context)
 			}
 		}
 
-		if ($this->merge) {
+		if ($merge) {
 			$value = Helpers::merge($value, $this->default);
 		}
 		return $this->doFinalize($value, $context);

diff --git a/tests/Schema/Expect.array.phpt b/tests/Schema/Expect.array.phpt
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Nette\Schema\Expect;
+use Nette\Schema\Helpers;
 use Nette\Schema\Processor;
 use Tester\Assert;
 
@@ -90,7 +91,41 @@ test('merging', function () {
 		(new Processor)->process($schema, [
 			'key1' => 'newval',
 			'key3' => 'newval',
-			'newval3', 'arr' => ['newitem'],
+			'newval3',
+			'arr' => ['newitem'],
+		])
+	);
+
+	Assert::same(
+		[
+			'key1' => 'newval',
+			'key3' => 'newval',
+			'newval3',
+			'arr' => ['newitem'],
+		],
+		(new Processor)->process($schema, [
+			Helpers::PREVENT_MERGING => true,
+			'key1' => 'newval',
+			'key3' => 'newval',
+			'newval3',
+			'arr' => ['newitem'],
+		])
+	);
+
+	Assert::same(
+		[
+			'key1' => 'newval',
+			'key2' => 'val2',
+			'val3',
+			'arr' => ['newitem'],
+			'key3' => 'newval',
+			'newval3',
+		],
+		(new Processor)->process($schema, [
+			'key1' => 'newval',
+			'key3' => 'newval',
+			'newval3',
+			'arr' => [Helpers::PREVENT_MERGING => true, 'newitem'],
 		])
 	);
 });