Skip to content

Refactor domain validation logic in ValidateDomainSniff #77

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
merged 7 commits into from
Oct 1, 2025
Merged

Refactor domain validation logic in ValidateDomainSniff #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aa5867f
Refactor domain validation logic in ValidateDomainSniff
slaFFik Oct 1, 2025
8e7fa93
Fix formatting issue in ValidateDomainSniff.php
slaFFik Oct 1, 2025
f3fff76
Fix comment on esc_html__ usage in ValidateDomain.php
slaFFik Oct 1, 2025
b321ff0
Update test cases for ValidateDomainSniff
slaFFik Oct 1, 2025
035ffea
Update ValidateDomainTest.php
slaFFik Oct 1, 2025
876e19d
Update test for multi-domain validation errors
slaFFik Oct 1, 2025
d05e6fc
Merge branch 'main' into slaFFik-patch-1
kagg-design Oct 1, 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
15 changes: 14 additions & 1 deletion WPForms/Sniffs/PHP/ValidateDomainSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,20 @@ public function process( File $phpcsFile, $stackPtr ) {
return;
}

if ( ! $currentDomain || ! $expectedDomain ) {
if ( ! $currentDomain ) {
$phpcsFile->addError(
sprintf(
"Domain name is not set. You should be using '%s'.",
$expectedDomain
),
$stackPtr,
'InvalidDomain'
);

return;
}

if ( ! $expectedDomain ) {
return;
}

Expand Down
4 changes: 2 additions & 2 deletions WPForms/Tests/TestFiles/PHP/ValidateDomain.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
_nx( 'Invalid', 'Invalid', 10, 'Invalid', 'wpforms' );


// Valid syntax when the text domain is not specified.
esc_html__( 'Valid' );
// Invalid syntax when the text domain is not specified.
esc_html__( 'Invalid' );

// Invalid - not a string as the last argument.
$bulk_counts['read'] = 25;
Expand Down
6 changes: 3 additions & 3 deletions WPForms/Tests/Tests/PHP/ValidateDomainTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function testProcess() {

$phpcsFile = $this->process( new ValidateDomainSniff() );

$this->fileHasErrors( $phpcsFile, 'InvalidDomain', [ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 41 ] );
$this->fileHasErrors( $phpcsFile, 'InvalidDomain', [ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 34, 41 ] );
$this->fileHasErrors( $phpcsFile, 'NotStringDomain', [ 38 ] );
}

Expand All @@ -34,7 +34,7 @@ public function testProcessWithMultiDomains() {

$phpcsFile = $this->process( new ValidateDomainSniff(), 'MultiDomains' );

$this->fileHasErrors( $phpcsFile, 'InvalidDomain', [ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 21, 22, 23, 24, 25, 26 ] );
$this->fileHasErrors( $phpcsFile, 'InvalidDomain', [ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 21, 22, 23, 24, 25, 26, 34 ] );
}

/**
Expand All @@ -46,6 +46,6 @@ public function testProcessWithRewrittenPaths() {

$phpcsFile = $this->process( new ValidateDomainSniff(), 'ValidateDomainWithRewrites' );

$this->fileHasErrors( $phpcsFile, 'InvalidDomain', [ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 19, 20, 27, 28, 29, 30, 41 ] );
$this->fileHasErrors( $phpcsFile, 'InvalidDomain', [ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 19, 20, 27, 28, 29, 30, 34, 41 ] );
}
}