diff --git a/src/Tempest/Validation/src/Rules/IP.php b/src/Tempest/Validation/src/Rules/IP.php index 9983b00a6..3847b78ff 100644 --- a/src/Tempest/Validation/src/Rules/IP.php +++ b/src/Tempest/Validation/src/Rules/IP.php @@ -16,16 +16,14 @@ public function __construct( private bool $allowPrivateRange = true, private bool $allowReservedRange = true, ) { - $options = 0; - $options = $options | FILTER_FLAG_IPV4; - $options = $options | FILTER_FLAG_IPV6; + $options = FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6; if (! $this->allowPrivateRange) { - $options = $options | FILTER_FLAG_NO_PRIV_RANGE; + $options |= FILTER_FLAG_NO_PRIV_RANGE; } if (! $this->allowReservedRange) { - $options = $options | FILTER_FLAG_NO_RES_RANGE; + $options |= FILTER_FLAG_NO_RES_RANGE; } $this->options = $options; diff --git a/src/Tempest/Validation/src/Rules/IPv4.php b/src/Tempest/Validation/src/Rules/IPv4.php index c72b3bfd5..689a4eac4 100644 --- a/src/Tempest/Validation/src/Rules/IPv4.php +++ b/src/Tempest/Validation/src/Rules/IPv4.php @@ -16,15 +16,14 @@ public function __construct( private bool $allowPrivateRange = true, private bool $allowReservedRange = true, ) { - $options = 0; - $options = $options | FILTER_FLAG_IPV4; + $options = FILTER_FLAG_IPV4; if (! $this->allowPrivateRange) { - $options = $options | FILTER_FLAG_NO_PRIV_RANGE; + $options |= FILTER_FLAG_NO_PRIV_RANGE; } if (! $this->allowReservedRange) { - $options = $options | FILTER_FLAG_NO_RES_RANGE; + $options |= FILTER_FLAG_NO_RES_RANGE; } $this->options = $options; diff --git a/src/Tempest/Validation/src/Rules/IPv6.php b/src/Tempest/Validation/src/Rules/IPv6.php index 3b8033174..14f3dac33 100644 --- a/src/Tempest/Validation/src/Rules/IPv6.php +++ b/src/Tempest/Validation/src/Rules/IPv6.php @@ -16,15 +16,14 @@ public function __construct( private bool $allowPrivateRange = true, private bool $allowReservedRange = true, ) { - $options = 0; - $options = $options | FILTER_FLAG_IPV6; + $options = FILTER_FLAG_IPV6; if (! $this->allowPrivateRange) { - $options = $options | FILTER_FLAG_NO_PRIV_RANGE; + $options |= FILTER_FLAG_NO_PRIV_RANGE; } if (! $this->allowReservedRange) { - $options = $options | FILTER_FLAG_NO_RES_RANGE; + $options |= FILTER_FLAG_NO_RES_RANGE; } $this->options = $options; diff --git a/src/Tempest/Validation/tests/Rules/IPv6Test.php b/src/Tempest/Validation/tests/Rules/IPv6Test.php index 5ebb6eea0..416893ac9 100644 --- a/src/Tempest/Validation/tests/Rules/IPv6Test.php +++ b/src/Tempest/Validation/tests/Rules/IPv6Test.php @@ -39,14 +39,8 @@ public function test_ip_address_without_private_range(): void public function test_ip_address_without_reserved_range(): void { - if (PHP_OS_FAMILY === 'Windows') { - $this->markTestSkipped('Some kind of problem with Windows. Needs further investigation.'); - /** @phpstan-ignore-next-line */ - return; - } - $rule = new IPv6(allowReservedRange: false); - $this->assertFalse($rule->isValid('2001:db8:ffff:ffff:ffff:ffff:ffff:ffff')); + $this->assertFalse($rule->isValid('::1')); $this->assertTrue($rule->isValid('2a03:b0c0:3:d0::11f5:3001')); $rule = new IPv6(allowReservedRange: true);