removed support for key PreventMerging (BC break)

Author: dg

src/Schema/Elements/AnyOf.php

@@ -66,11 +66,6 @@ public function normalize(mixed $value, Context $context): mixed
 
 	public function merge(mixed $value, mixed $base): mixed
 	{
-		if (is_array($value) && isset($value[Helpers::PreventMerging])) {
-			unset($value[Helpers::PreventMerging]);
-			return $value;
-		}
-
 		return Helpers::merge($value, $base);
 	}
 

src/Schema/Elements/Structure.php

@@ -96,10 +96,6 @@ public function getShape(): array
 
 	public function normalize(mixed $value, Context $context): mixed
 	{
-		if ($prevent = (is_array($value) && isset($value[Helpers::PreventMerging]))) {
-			unset($value[Helpers::PreventMerging]);
-		}
-
 		$value = $this->doNormalize($value, $context);
 		if (is_object($value)) {
 			$value = (array) $value;
@@ -114,10 +110,6 @@ public function normalize(mixed $value, Context $context): mixed
 					array_pop($context->path);
 				}
 			}
-
-			if ($prevent) {
-				$value[Helpers::PreventMerging] = true;
-			}
 		}
 
 		return $value;

src/Schema/Elements/Type.php

@@ -113,10 +113,6 @@ public function pattern(?string $pattern): self
 
 	public function normalize(mixed $value, Context $context): mixed
 	{
-		if ($prevent = (is_array($value) && isset($value[Helpers::PreventMerging]))) {
-			unset($value[Helpers::PreventMerging]);
-		}
-
 		$value = $this->doNormalize($value, $context);
 		if (is_array($value) && $this->itemsValue) {
 			$res = [];
@@ -134,18 +130,13 @@ public function normalize(mixed $value, Context $context): mixed
 			$value = $res;
 		}
 
-		if ($prevent && is_array($value)) {
-			$value[Helpers::PreventMerging] = true;
-		}
-
 		return $value;
 	}
 
 
 	public function merge(mixed $value, mixed $base): mixed
 	{
-		if ($this->mergeMode === MergeMode::Replace || (is_array($value) && isset($value[Helpers::PreventMerging]))) {
-			unset($value[Helpers::PreventMerging]);
+		if ($this->mergeMode === MergeMode::Replace) {
 			return $value;
 		}
 
@@ -171,12 +162,6 @@ public function merge(mixed $value, mixed $base): mixed
 
 	public function complete(mixed $value, Context $context): mixed
 	{
-		$merge = $this->merge;
-		if (is_array($value) && isset($value[Helpers::PreventMerging])) {
-			unset($value[Helpers::PreventMerging]);
-			$merge = false;
-		}
-
 		if ($value === null && is_array($this->default)) {
 			$value = []; // is unable to distinguish null from array in NEON
 		}
@@ -188,7 +173,7 @@ public function complete(mixed $value, Context $context): mixed
 		$isOk() && Helpers::validateRange($value, $this->range, $context, $this->type);
 		$isOk() && $value !== null && $this->pattern !== null && Helpers::validatePattern($value, $this->pattern, $context);
 		$isOk() && is_array($value) && $this->validateItems($value, $context);
-		$isOk() && $merge && $value = Helpers::merge($value, $this->default);
+		$isOk() && $this->merge && $value = Helpers::merge($value, $this->default);
 		$isOk() && $value = $this->doTransform($value, $context);
 		if (!$isOk()) {
 			return null;

tests/Schema/Expect.array.phpt

@@ -3,7 +3,6 @@
 declare(strict_types=1);
 
 use Nette\Schema\Expect;
-use Nette\Schema\Helpers;
 use Nette\Schema\MergeMode;
 use Nette\Schema\Processor;
 use Tester\Assert;
@@ -96,39 +95,6 @@ test('merging default value', function () {
 			'arr' => ['newitem'],
 		]),
 	);
-
-	Assert::same(
-		[
-			'key1' => 'newval',
-			'key3' => 'newval',
-			'newval3',
-			'arr' => ['newitem'],
-		],
-		(new Processor)->process($schema, [
-			Helpers::PreventMerging => 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::PreventMerging => true, 'newitem'],
-		]),
-	);
 });