Context validaction proposal

Author: slischka

src/Address.php

@@ -27,8 +27,8 @@ private function __construct(
 	) {
 		$this->streetAndNumber = PrimitiveTypes::extractString($data, 'street_and_number');
 		$this->town = PrimitiveTypes::extractString($data, 'town');
-		$this->zipCode = ZipCode::extract($data, 'zip_code');
 		$this->country = CountryCode::extract($data, 'country');
+		$this->zipCode = ZipCode::extract($data, 'zip_code', countryCode: $this->country);
 	}
 
 	/**

src/Duration.php

@@ -34,7 +34,8 @@ private function __construct(
 	}
 
 	public static function from(
-		mixed $data
+		mixed $data,
+		mixed ...$params
 	): Duration {
 		if ($data instanceof self) {
 			return $data;

src/ExtractableTraits/ArrayExtractableTrait.php

@@ -19,7 +19,8 @@ abstract public function __construct(
 	);
 
 	final public static function from(
-		mixed $data
+		mixed $data,
+		mixed ...$params
 	): self {
 		if ($data instanceof self) {
 			return $data;

src/ExtractableTraits/EnumExtractableTrait.php

@@ -23,7 +23,8 @@ abstract public static function get(
 	 * @return static
 	 */
 	final public static function from(
-		mixed $data
+		mixed $data,
+		mixed ...$params
 	): static {
 		if ($data instanceof self) {
 			return $data;

src/ExtractableTraits/ExtractableTrait.php

@@ -13,7 +13,8 @@ trait ExtractableTrait
 {
 
 	abstract public static function from(
-		mixed $data
+		mixed $data,
+		mixed ...$params
 	): self;
 
 	/**
@@ -23,7 +24,8 @@ abstract public static function from(
 	 */
 	public static function extract(
 		array | \ArrayAccess $data,
-		string | int $key
+		string | int $key,
+		mixed ...$params
 	): static {
 		$value = ExtractableHelpers::extractValue($data, $key);
 
@@ -32,7 +34,7 @@ public static function extract(
 		}
 
 		try {
-			return self::from($value);
+			return self::from($value, ...$params);
 		} catch (InvalidTypeException $e) {
 			throw $e->wrap($key);
 		}

src/ExtractableTraits/FloatExtractableTrait.php

@@ -16,7 +16,8 @@ abstract public function __construct(
 	);
 
 	final public static function from(
-		mixed $data
+		mixed $data,
+		mixed ...$params
 	): self {
 		if ($data instanceof self) {
 			return $data;

src/ExtractableTraits/IntExtractableTrait.php

@@ -16,7 +16,8 @@ abstract public function __construct(
 	);
 
 	final public static function from(
-		mixed $data
+		mixed $data,
+		mixed ...$params
 	): self {
 		if ($data instanceof self) {
 			return $data;

src/ExtractableTraits/StringExtractableTrait.php

@@ -16,15 +16,16 @@ abstract public function __construct(
 	);
 
 	final public static function from(
-		mixed $data
+		mixed $data,
+		mixed ...$params
 	): self {
 		if ($data instanceof self) {
 			return $data;
 		}
 
 		$data = PrimitiveTypes::getString($data);
 
-		return new static($data);
+		return new static($data, ...$params);
 	}
 
 }

src/JsonString.php

@@ -32,7 +32,8 @@ private function __construct(
 	 * @throws \SmartEmailing\Types\InvalidTypeException
 	 */
 	public static function from(
-		mixed $data
+		mixed $data,
+		mixed ...$params
 	): JsonString
 	{
 		if ($data instanceof self) {

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;
+	}
+
 }