Skip to content

IP field nullable #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aleksanderkakol merged 5 commits into from
Nov 3, 2025
Merged

IP field nullable #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
653a761
Validate ipv6
aleksanderkakol Oct 31, 2025
122b6eb
fixer
aleksanderkakol Oct 31, 2025
0dc6987
fixer
aleksanderkakol Oct 31, 2025
1386fd3
ip nullable
aleksanderkakol Nov 3, 2025
a4f8151
Merge branch 'master' into DX-1359-add-ipv6-to-ip-field
aleksanderkakol Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/Model/Fields/Payer/IP.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@ class IP extends Field
{
protected $name = __CLASS__;
protected $type = self::STRING;
protected $minLength = 3;
protected $maxLength = 255;

protected function initValidators()
{
$this->addValidator(function ($value) {
if (false === filter_var($value, FILTER_VALIDATE_IP)) {
if (!empty($value) && false === filter_var($value, FILTER_VALIDATE_IP)) {
return new FieldValidationResult(false, 'Invalid IP address.');
}

Expand Down
23 changes: 14 additions & 9 deletions tests/Model/Fields/Payer/IpTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,36 +13,41 @@ public function testIpv4()
$ip = new Ip();
$ip->setValue('127.0.0.1');

$this->assertEquals('127.0.0.1', $ip->getValue());
$this->assertSame('127.0.0.1', $ip->getValue());
}

public function testIpv6()
{
$ip = new Ip();
$ip->setValue('2001:db8::1');

$this->assertEquals('2001:db8::1', $ip->getValue());
$this->assertSame('2001:db8::1', $ip->getValue());
}

public function testInvalidIp()
public function testEmptyString()
{
$ip = new Ip();
$ip->setValue('');

$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Validation failed for field Tpay\OpenApi\Model\Fields\Payer\IP: Invalid IP address.');

$ip->setValue('TEST123');
$this->assertSame('', $ip->getValue());
}

public function testNull()
{
$ip = new Ip();
$ip->setValue(null);

$this->assertSame(null, $ip->getValue());
}

public function testInvalidIp()
{
$ip = new Ip();

$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Value of field Tpay\OpenApi\Model\Fields\Payer\IP is too short. Min required 3');
$this->expectExceptionMessage('Validation failed for field Tpay\OpenApi\Model\Fields\Payer\IP: Invalid IP address.');

$ip->setValue(null);
$ip->setValue('TEST123');
}

public function testWrongType()
Expand Down