Fix expected domain calculation for dirs not specified in the ValidateDomain property.

kagg-design · kagg-design · commit 922cad395397 · 2022-09-09T18:38:35.000+03:00
diff --git a/WPForms/Sniffs/PHP/ValidateDomainSniff.php b/WPForms/Sniffs/PHP/ValidateDomainSniff.php
@@ -184,13 +184,16 @@ private function getExpectedDomain( $phpcsFile ) {
 			return strtolower( $currentDomain );
 		}
 
+		$basename = basename( $root );
+
 		if ( ! Config::getConfigData( 'multi_domains' ) ) {
-			return basename( $root );
+			return $basename;
 		}
 
-		preg_match( '/([\w.-]+)/', $filePath, $domain );
+		$relativeDir = str_replace( [ '\\', '/', '.' ], [ '-', '-', '' ], dirname( $filePath ) );
+		$relativeDir = strtolower( trim( $relativeDir, '-' ) );
 
-		return ! empty( $domain[0] ) ? strtolower( $domain[0] ) : '';
+		return $relativeDir ? $relativeDir : $basename;
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -184,13 +184,16 @@ private function getExpectedDomain( $phpcsFile ) {`
`184`	`184`	`return strtolower( $currentDomain );`
`185`	`185`	`}`
`186`	`186`
	`187`	`+ $basename = basename( $root );`
	`188`	`+`
`187`	`189`	`if ( ! Config::getConfigData( 'multi_domains' ) ) {`
`188`		`- return basename( $root );`
	`190`	`+ return $basename;`
`189`	`191`	`}`
`190`	`192`
`191`		`- preg_match( '/([\w.-]+)/', $filePath, $domain );`
	`193`	`+ $relativeDir = str_replace( [ '\\', '/', '.' ], [ '-', '-', '' ], dirname( $filePath ) );`
	`194`	`+ $relativeDir = strtolower( trim( $relativeDir, '-' ) );`
`192`	`195`
`193`		`- return ! empty( $domain[0] ) ? strtolower( $domain[0] ) : '';`
	`196`	`+ return $relativeDir ? $relativeDir : $basename;`
`194`	`197`	`}`
`195`	`198`
`196`	`199`	`/**`