Context validation proposal

Author: slischka

src/Address.php

@@ -25,10 +25,10 @@ final class Address
 	private function __construct(
 		array $data
 	) {
-		$this->streetAndNumber = PrimitiveTypes::extractString($data, 'street_and_number');
-		$this->town = PrimitiveTypes::extractString($data, 'town');
-		$this->zipCode = ZipCode::extract($data, 'zip_code');
+		$this->streetAndNumber = (string) NonEmptyString::extract($data, 'street_and_number');
+		$this->town = (string) NonEmptyString::extract($data, 'town');
 		$this->country = CountryCode::extract($data, 'country');
+		$this->zipCode = ZipCode::extract($data, 'zip_code', countryCode: $this->country);
 	}
 
 	/**

src/ExtractableTraits/StringExtractableTrait.php

@@ -25,7 +25,7 @@ final public static function from(
 
 		$data = PrimitiveTypes::getString($data);
 
-		return new static($data);
+		return new static($data, ...$params);
 	}
 
 }

src/ZipCode.php

@@ -45,12 +45,13 @@ final class ZipCode implements ToStringInterface
 	];
 
 	private function __construct(
-		string $value
+		string $value,
+		?CountryCode $countryCode = null
 	) {
 		$value = StringHelpers::removeWhitespace($value);
 		$value = Strings::upper($value);
 
-		if (!$this->isValid($value)) {
+		if (!$this->isValid($value, $countryCode)) {
 			throw new InvalidTypeException('Invalid ZIP code: ' . $value);
 		}
 
@@ -63,15 +64,32 @@ public function getValue(): string
 	}
 
 	private function isValid(
-		string $value
+		string $value,
+		?CountryCode $countryCode
 	): bool {
+		if ($countryCode !== null) {
+			$pattern = self::$patternsByCountry[(string) $countryCode] ?? null;
+
+			if ($pattern !== null) {
+				return $this->validate($value, $pattern);
+			}
+		}
+
 		foreach (self::$patternsByCountry as $pattern) {
-			if (Strings::match($value, $pattern)) {
+			if ($this->validate($value, $pattern)) {
 				return true;
 			}
 		}
 
 		return false;
 	}
 
+	private function validate(
+        string $value,
+        string $pattern
+    ): bool
+	{
+		return Strings::match($value, $pattern) !== null;
+	}
+
 }

tests/ZipCodeTest.phpt

@@ -43,9 +43,23 @@ final class ZipCodeTest extends TestCase
 			Assert::equal($validValue, $zip->getValue());
 		}
 
+		Assert::equal('39174', ZipCode::extract($validValues, 0, countryCode: CountryCode::from(CountryCode::CZ))->getValue());
+
+		Assert::exception(
+			static fn () => ZipCode::extract($validValues, 0, countryCode: CountryCode::from(CountryCode::GB)),
+			InvalidTypeException::class
+		);
+
 		Assert::equal('WC2N5DU', ZipCode::from('WC2N 5DU')->getValue());
 
 		Assert::equal('W22LW', ZipCode::from('w2 2lw')->getValue());
+
+		Assert::equal('WC2N5DU', ZipCode::from('WC2N 5DU', countryCode: CountryCode::from(CountryCode::GB))->getValue());
+
+		Assert::exception(
+			static fn () => ZipCode::from('WC2N 5DU', countryCode: CountryCode::from(CountryCode::SK)),
+			InvalidTypeException::class
+		);
 	}
 
 }

tools/cs/ruleset.xml

@@ -37,6 +37,10 @@
 		<exclude name="SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration.MissingTrailingComma"/>
 
 		<exclude name="SlevomatCodingStandard.Numbers.RequireNumericLiteralSeparator.RequiredNumericLiteralSeparator"/>
+
+		<!-- todo -->
+		<exclude name="SlevomatCodingStandard.Functions.DisallowNamedArguments.DisallowedNamedArgument"/>
+		<exclude name="SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter"/>
 	</rule>
 	<rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">
 		<properties>