cs

Author: slischka

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);
 		}
@@ -43,15 +45,16 @@ public static function extract(
 	 */
 	public static function fromOrNull(
 		mixed $value,
-		bool $getNullIfInvalid = false
+		bool $getNullIfInvalid = false,
+		mixed ...$params
 	): self | null
 	{
 		if ($value === null) {
 			return null;
 		}
 
 		try {
-			return self::from($value);
+			return self::from($value, ...$params);
 		} catch (InvalidTypeException $e) {
 			if ($getNullIfInvalid) {
 				return null;
@@ -68,7 +71,8 @@ public static function fromOrNull(
 	public static function extractOrNull(
 		array | \ArrayAccess $data,
 		string | int $key,
-		bool $nullIfInvalid = false
+		bool $nullIfInvalid = false,
+		mixed ...$params
 	): self | null
 	{
 		if (!\is_array($data)) {
@@ -86,7 +90,8 @@ public static function extractOrNull(
 		return self::tryToExtract(
 			$data,
 			$key,
-			$nullIfInvalid
+			$nullIfInvalid,
+			...$params
 		);
 	}
 
@@ -194,11 +199,12 @@ public static function extractArrayOfSkipInvalid(
 	private static function tryToExtract(
 		mixed $data,
 		string | int $key,
-		bool $nullIfInvalid
+		bool $nullIfInvalid,
+		mixed ...$params
 	): self | null
 	{
 		try {
-			return self::extract($data, $key);
+			return self::extract($data, $key, ...$params);
 		} catch (InvalidTypeException $e) {
 			if ($nullIfInvalid) {
 				return null;

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,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/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) {

tests/DurationTest.phpt

@@ -24,10 +24,12 @@ final class DurationTest extends TestCase
 
 		Assert::throws(
 			static function (): void {
-				Duration::from([
-					'value' => 0,
-					'unit' => 'week',
-				]);
+				Duration::from(
+					[
+						'value' => 0,
+						'unit' => 'week',
+					]
+				);
 			},
 			InvalidTypeException::class
 		);
@@ -66,10 +68,12 @@ final class DurationTest extends TestCase
 
 	public function testCreate(): void
 	{
-		Duration::from([
-			'value' => 1,
-			'unit' => TimeUnit::HOURS,
-		]);
+		Duration::from(
+			[
+				'value' => 1,
+				'unit' => TimeUnit::HOURS,
+			]
+		);
 
 		Duration::extract([
 			'duration' => [
@@ -87,21 +91,25 @@ final class DurationTest extends TestCase
 
 	public function testGetUnit(): void
 	{
-		$duration = Duration::from([
-			'value' => 1,
-			'unit' => TimeUnit::YEARS,
-		]);
+		$duration = Duration::from(
+			[
+				'value' => 1,
+				'unit' => TimeUnit::YEARS,
+			]
+		);
 
 		Assert::type(Duration::class, $duration);
 		Assert::type(TimeUnit::class, $duration->getUnit());
 	}
 
 	public function testGetValue(): void
 	{
-		$duration = Duration::from([
-			'value' => 1,
-			'unit' => TimeUnit::DAYS,
-		]);
+		$duration = Duration::from(
+			[
+				'value' => 1,
+				'unit' => TimeUnit::DAYS,
+			]
+		);
 
 		Assert::type(Duration::class, $duration);
 		Assert::type('int', $duration->getValue());
@@ -110,17 +118,21 @@ final class DurationTest extends TestCase
 
 	public function testLengthInSeconds(): void
 	{
-		$duration = Duration::from([
-			'value' => 3,
-			'unit' => TimeUnit::HOURS,
-		]);
+		$duration = Duration::from(
+			[
+				'value' => 3,
+				'unit' => TimeUnit::HOURS,
+			]
+		);
 		Assert::type(Duration::class, $duration);
 		Assert::equal(10800, $duration->getLengthInSeconds());
 
-		$duration = Duration::from([
-			'value' => 10,
-			'unit' => TimeUnit::MINUTES,
-		]);
+		$duration = Duration::from(
+			[
+				'value' => 10,
+				'unit' => TimeUnit::MINUTES,
+			]
+		);
 		Assert::type(Duration::class, $duration);
 		Assert::equal(600, $duration->getLengthInSeconds());
 	}