Add option to prevent merging of arrayOf, listOf defaults

Author: colinodell

src/Schema/Elements/Type.php

@@ -33,6 +33,9 @@ final class Type implements Schema
 	/** @var string|null */
 	private $pattern;
 
+	/** @var bool */
+	private $preventMergingDefaults = false;
+
 
 	public function __construct(string $type)
 	{
@@ -88,6 +91,13 @@ public function pattern(?string $pattern): self
 	}
 
 
+	public function preventMergingDefaults(bool $prevent = true): self
+	{
+		$this->preventMergingDefaults = $prevent;
+		return $this;
+	}
+
+
 	/********************* processing ****************d*g**/
 
 
@@ -165,6 +175,10 @@ public function complete($value, Context $context)
 			}
 		}
 
+		if ($this->preventMergingDefaults && is_array($value) && count($value) > 0) {
+			$value[Helpers::PREVENT_MERGING] = true;
+		}
+
 		$value = Helpers::merge($value, $this->default);
 		return $this->doFinalize($value, $context);
 	}

tests/Schema/Expect.array.phpt

@@ -231,6 +231,21 @@ test('arrayOf() & scalar', function () {
 });
 
 
+test('arrayOf() with defaults', function () {
+	$schema = Expect::arrayOf('string|int')->default(['foo', 42]);
+
+	Assert::same(['foo', 42], (new Processor)->process($schema, null));
+	Assert::same(['foo', 42], (new Processor)->process($schema, []));
+	Assert::same(['foo', 42, 'bar'], (new Processor)->process($schema, ['bar']));
+
+	$schema->preventMergingDefaults();
+
+	Assert::same(['foo', 42], (new Processor)->process($schema, null));
+	Assert::same(['foo', 42], (new Processor)->process($schema, []));
+	Assert::same(['bar'], (new Processor)->process($schema, ['bar']));
+});
+
+
 test('arrayOf() error', function () {
 	Assert::exception(function () {
 		Expect::arrayOf(['a' => Expect::string()]);

tests/Schema/Expect.list.phpt

@@ -88,6 +88,21 @@ test('listOf() & scalar', function () {
 });
 
 
+test('listOf() with defaults', function () {
+	$schema = Expect::listOf('string|int')->default(['foo', 42]);
+
+	Assert::same(['foo', 42], (new Processor)->process($schema, null));
+	Assert::same(['foo', 42], (new Processor)->process($schema, []));
+	Assert::same(['foo', 42, 'bar'], (new Processor)->process($schema, ['bar']));
+
+	$schema->preventMergingDefaults();
+
+	Assert::same(['foo', 42], (new Processor)->process($schema, null));
+	Assert::same(['foo', 42], (new Processor)->process($schema, []));
+	Assert::same(['bar'], (new Processor)->process($schema, ['bar']));
+});
+
+
 test('listOf() & error', function () {
 	Assert::exception(function () {
 		Expect::listOf(['a' => Expect::string()]);