From 5c5f7e87074a12a442e9e4f8131fb2349d2496c3 Mon Sep 17 00:00:00 2001 From: Nathanael Jones Date: Wed, 19 Aug 2026 10:15:46 +0100 Subject: [PATCH 01/12] Accept internationalized domain names in Website/URL fields The host pattern in FrmFieldUrl::validate() and its twin in checkUrlField() allowed ASCII only, so valid internationalized domains were rejected. The punycode spelling of the same domain already passed, and non-ASCII in the path, query and fragment already passed, so this removes an inconsistency rather than granting anything new. The two character ranges differ by design. PHP matches UTF-8 bytes, so it uses the raw byte range; JS matches UTF-16 code units, so it needs the code unit range. Copying one literal into both would accept Cyrillic and CJK hosts server side while silently rejecting them in the browser, so a test asserts the two JS files carry the code unit form and never the PHP one. The /u modifier is deliberately not added to the PHP pattern: preg_match() returns false on invalid UTF-8, and because the result is negated that would report valid Latin-1 input as invalid. Sanitizing, escaping, storage and the scheme allowlist are untouched. The new pattern was compared byte for byte with the old one across 1408 ASCII inputs with no difference, so no ASCII url changes behaviour. Help Scout ticket 257002. Co-Authored-By: Claude Opus 5 --- classes/models/fields/FrmFieldUrl.php | 5 +- js/formidable.js | 4 +- js/formidable.min.js | 2 +- .../fieldsInFormBuilder-validation.cy.js | 46 +++++++ .../phpunit/fields/test_FrmFieldValidate.php | 117 ++++++++++++++++++ 5 files changed, 170 insertions(+), 4 deletions(-) diff --git a/classes/models/fields/FrmFieldUrl.php b/classes/models/fields/FrmFieldUrl.php index 4f8fd92d68..c5f88c8243 100644 --- a/classes/models/fields/FrmFieldUrl.php +++ b/classes/models/fields/FrmFieldUrl.php @@ -82,8 +82,9 @@ public function validate( $args ) { $errors = array(); - // Validate the url format - if ( $value && ! preg_match( '/^http(s)?:\/\/(?:localhost|(?:[\da-z\.-]+\.[\da-z\.-]+))/i', $value ) ) { + // Validate the url format. The host class allows \x80-\xff so internationalized domain names pass. + // Byte range by design, and no /u modifier: with /u, preg_match() returns false on invalid UTF-8. + if ( $value && ! preg_match( '/^http(s)?:\/\/(?:localhost|(?:[\da-z\x80-\xff\.-]+\.[\da-z\x80-\xff\.-]+))/i', $value ) ) { $errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' ); // skipcq: PHP-W1067 -- $this->field is always a field object by the time validate() runs; FrmFieldType's constructor just accepts array|int|object for lazy construction elsewhere. } elseif ( $this->field->required == '1' && ! $value ) { // phpcs:ignore Universal.Operators.StrictComparisons diff --git a/js/formidable.js b/js/formidable.js index 94304d0a6b..b5e3c5b450 100644 --- a/js/formidable.js +++ b/js/formidable.js @@ -544,7 +544,9 @@ function frmFrontFormJS() { let fieldID; const url = field.value; - if ( url !== '' && ! /^http(s)?:\/\/(?:localhost|(?:[\da-z\.-]+\.[\da-z\.-]+))/i.test( url ) ) { + // Keep in sync with FrmFieldUrl::validate(), but the ranges differ by design: JS matches UTF-16 + // code units, so this needs \u0080-\uFFFF where the PHP side matches raw UTF-8 bytes instead. + if ( url !== '' && ! /^http(s)?:\/\/(?:localhost|(?:[\da-z\u0080-\uFFFF\.-]+\.[\da-z\u0080-\uFFFF\.-]+))/i.test( url ) ) { fieldID = getFieldId( field, true ); if ( ! ( fieldID in errors ) ) { errors[ fieldID ] = getFieldValidationMessage( field, 'data-invmsg' ); diff --git a/js/formidable.min.js b/js/formidable.min.js index 78e659e531..be27314fe8 100644 --- a/js/formidable.min.js +++ b/js/formidable.min.js @@ -12,7 +12,7 @@ errors,onSubmit);else if(field.type==="url")checkUrlField(field,errors);else if( "")}if(errors[fileID]===undefined)val=getFileVals(fileID);fieldID=fileID}else{if(hasClass(field,"frm_pos_none"))return errors;val=jQuery(field).val();if(val===null)val="";else if(typeof val!=="string"){tempVal=val;val="";for(i=0;i()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/i;if(""!==field.value&&pattern.test(field.value)=== false)errors[fieldID]=getFieldValidationMessage(field,"data-invmsg");if(shouldCheckConfirmField(field,onSubmit))confirmField(field,errors)}function checkPasswordField(field,errors,onSubmit){if(shouldCheckConfirmField(field,onSubmit))confirmField(field,errors)}function confirmField(field,errors){const fieldID=getFieldId(field,true);const strippedId=field.id.replace("conf_","");const strippedFieldID=fieldID.replace("conf_","");const confirmField=document.getElementById(strippedId.replace("field_","field_conf_")); if(!confirmField||errors[`conf_${strippedFieldID}`]!==undefined)return;if(fieldID!==strippedFieldID){const firstField=document.getElementById(strippedId);const {value}=firstField;const confirmValue=confirmField.value;if(value!==confirmValue)errors[`conf_${strippedFieldID}`]=getFieldValidationMessage(confirmField,"data-confmsg")}else validateField(confirmField)}function checkNumberField(field,errors){let fieldID;const number=field.value;if(number!==""&&isNaN(number/1)!==false){fieldID=getFieldId(field, diff --git a/tests/cypress/e2e/Forms/fieldsInFormBuilder-validation.cy.js b/tests/cypress/e2e/Forms/fieldsInFormBuilder-validation.cy.js index e77c399cfd..20cc395da0 100644 --- a/tests/cypress/e2e/Forms/fieldsInFormBuilder-validation.cy.js +++ b/tests/cypress/e2e/Forms/fieldsInFormBuilder-validation.cy.js @@ -193,6 +193,52 @@ describe( 'Fields in the form builder', () => { cy.get( '#frm_submit_side_top' ).should( 'contain', 'Update' ); } ); + it( 'should accept an internationalized domain name in a Website/URL field', () => { + cy.openForm(); + + cy.log( 'Create a text field and a Website/URL field' ); + // Plain, always-visible sidebar links - see the identical unforced click elsewhere in this file. + cy.get( 'li[id="text"] a[title="Text"]' ).should( 'be.visible' ).click(); + cy.get( 'li[id="url"] a[title="Website/URL"]' ).should( 'be.visible' ).click(); + + cy.log( 'Update form' ); + cy.get( '#frm_submit_side_top' ).should( 'contain', 'Update' ).click(); + + cy.log( "Enabling the 'Validate this form with javascript' setting" ); + cy.xpath( "//ul[@class='frm_form_nav']//a[contains(text(),'Settings')]" ).should( 'contain', 'Settings' ).click(); + // Same #wpbody-content visibility workaround as the javascript setting test above. + cy.get( '#js_validate' ).scrollIntoView().should( 'be.visible' ).click(); + cy.get( '#frm_submit_side_top' ).should( 'contain', 'Update' ).click(); + + cy.log( 'Click on Preview - Blank Page' ); + cy.get( '#frm-previewDrop', { timeout: 5000 } ).should( 'contain', 'Preview' ).click(); + cy.get( '.preview > .frm-dropdown-menu > :nth-child(1) > a' ).should( 'contain', 'On Blank Page' ).invoke( 'removeAttr', 'target' ).click(); + + /** + * A host with no dot must still be rejected. This proves the javascript validator really is + * running on this field, so the assertion further down cannot pass for the wrong reason. + */ + cy.log( 'A host with no dot is still rejected' ); + cy.get( '[id^="field_"]' ).filter( 'input' ).eq( 1 ).type( 'münchen' ); + cy.get( '[id^="field_"]' ).filter( 'input' ).eq( 0 ).click(); + cy.get( '[id^="frm_error_field_"]' ).should( 'exist' ); + + /** + * An accented host must be accepted. The regex runs out of the committed js/formidable.min.js, + * which is rebuilt into js/frm.min.js when the plugin is activated, so a stale minified + * artifact fails right here. + */ + cy.log( 'An internationalized domain name is accepted' ); + cy.get( '[id^="field_"]' ).filter( 'input' ).eq( 1 ).clear().type( 'https://ernährung.ch' ); + cy.get( '[id^="field_"]' ).filter( 'input' ).eq( 0 ).click(); + cy.get( '[id^="frm_error_field_"]' ).should( 'not.exist' ); + + cy.log( 'Navigate back to the formidable form page' ); + cy.go( 'back' ); + // Same settle-before-teardown guard as the required-field test above. + cy.get( '#frm_submit_side_top' ).should( 'contain', 'Update' ); + } ); + afterEach( () => { // Navigate to the list directly rather than clicking the builder's own "Close" link - a // test that failed mid-way can leave the builder in a state where that link isn't diff --git a/tests/phpunit/fields/test_FrmFieldValidate.php b/tests/phpunit/fields/test_FrmFieldValidate.php index ff01993a6e..ef15719cae 100644 --- a/tests/phpunit/fields/test_FrmFieldValidate.php +++ b/tests/phpunit/fields/test_FrmFieldValidate.php @@ -125,6 +125,21 @@ protected function expected_format_errors() { 'value' => 'http://', 'invalid' => false, ), + array( + 'type' => 'url', + 'value' => 'https://ernährung.ch', + 'invalid' => false, + ), + array( + 'type' => 'url', + 'value' => 'https://пример.рф', + 'invalid' => false, + ), + array( + 'type' => 'url', + 'value' => 'https://a/b.com', + 'invalid' => true, + ), ); } @@ -185,6 +200,108 @@ public function test_url_value() { $this->assertArrayHasKey( 'field' . $field->id, $errors, 'http:// passed required validation ' . print_r( $errors, 1 ) ); } + /** + * Internationalized domain names must pass validation. + * + * The host pattern in FrmFieldUrl::validate() matches UTF-8 bytes, so non-ASCII hosts are + * accepted. These are real registrable domains - .ch permits accented vowels - and the punycode + * spelling of the same domain has always passed, so accepting these adds no new capability. + * + * @covers FrmFieldUrl::validate + */ + public function test_url_idn_validation() { + $field = $this->factory->field->get_object_by_id( $this->get_field_key( 'url' ) ); + $this->assertNotEmpty( $field ); + + $should_pass = array( + 'https://ernährung.ch', + 'https://münchen.de', + 'https://café.fr', + 'https://пример.рф', + 'https://例え.jp', + 'https://ÄPFEL.DE', + 'https://xn--ernhrung-2za.ch', + 'https://example.com', + 'http://localhost', + 'https://ernährung.ch/über-uns?q=grüße#süß', + 'ernährung.ch', + ); + + foreach ( $should_pass as $url ) { + $errors = $this->check_single_value( array( $field->id => $url ) ); + $this->assertArrayNotHasKey( 'field' . $field->id, $errors, 'A valid url failed validation: ' . $url ); + } + + /** + * The last two must fail even though the class now allows non-ASCII: the pattern still + * requires a dotted host, and a hyphen placed after the byte range would turn it into the + * range 0x2E-0x80 and let path and query characters through. + */ + $should_fail = array( + 'münchen', + 'https://ä', + 'https://a/b.com', + 'https://a?b.com', + ); + + foreach ( $should_fail as $url ) { + $errors = $this->check_single_value( array( $field->id => $url ) ); + $this->assertArrayHasKey( 'field' . $field->id, $errors, 'An invalid url passed validation: ' . $url ); + } + } + + /** + * A raw Latin-1 host byte must still validate. + * + * This guards against adding the /u modifier to the host pattern. With /u, preg_match() returns + * false on invalid UTF-8, and because the result is negated the value would be reported invalid. + * + * @covers FrmFieldUrl::validate + */ + public function test_url_non_utf8_host_byte() { + $field = $this->factory->field->get_object_by_id( $this->get_field_key( 'url' ) ); + $this->assertNotEmpty( $field ); + + $url = "https://ex\xE4mple.com"; + + // Without this the assertion below would pass vacuously if the byte were stripped first. + $this->assertNotEmpty( esc_url_raw( $url ), 'The Latin-1 host byte did not survive sanitizing, so this test proves nothing.' ); + + $errors = $this->check_single_value( array( $field->id => $url ) ); + $this->assertArrayNotHasKey( 'field' . $field->id, $errors, 'A Latin-1 host byte failed validation, which suggests the /u modifier was added to the host pattern.' ); + } + + /** + * The JS copy of the host pattern must stay in step with the PHP one, and the minified artifact + * must be rebuilt whenever the source changes. + * + * There is no JS engine in this suite, so this asserts the rules on the source rather than + * running the regex: the code unit range is present, the PHP byte range was not copied across by + * mistake, the old ASCII-only class is gone, and the minified file carries the same class. + * + * @covers FrmFieldUrl::validate + */ + public function test_url_field_js_regex_parity() { + $source = FrmAppHelper::plugin_path() . '/js/formidable.js'; + $minified = FrmAppHelper::plugin_path() . '/js/formidable.min.js'; + + foreach ( array( $source, $minified ) as $file ) { + $this->assertFileExists( $file ); + + $contents = file_get_contents( $file ); + $name = basename( $file ); + + $this->assertStringContainsString( '\u0080-\uFFFF', $contents, 'The JS host pattern is missing the code unit range in ' . $name ); + $this->assertStringNotContainsString( '\x80-\xff', $contents, 'The PHP byte range was copied into ' . $name . '. JS matches UTF-16 code units, so that would reject the Cyrillic and CJK hosts the server accepts.' ); + $this->assertStringNotContainsString( '[\da-z\.-]', $contents, 'The old ASCII-only host class is still present in ' . $name ); + } + + // The host class in the source must appear verbatim in the minified artifact. + $matched = preg_match( '/\[\\\\da-z[^\]]*\]/', file_get_contents( $source ), $matches ); + $this->assertSame( 1, $matched, 'Could not find the url host class in js/formidable.js' ); + $this->assertStringContainsString( $matches[0], file_get_contents( $minified ), 'js/formidable.min.js is stale. Rebuild it so it carries the same url host class as js/formidable.js.' ); + } + public function test_email_value() { $field = $this->factory->field->get_object_by_id( $this->get_field_key( 'email' ) ); $this->assertNotEmpty( $field ); From 1ccd1e5e3a8d7adb1680c2724f23dc3bff58c457 Mon Sep 17 00:00:00 2001 From: Nathanael Jones Date: Wed, 19 Aug 2026 10:27:03 +0100 Subject: [PATCH 02/12] Address PHPCS and DeepSource findings on the URL field IDN fix PHPCS: two assertion messages in test_FrmFieldValidate.php exceeded the 180 character limit (SlevomatCodingStandard.Files.LineLength). Shortened them; the detail they carried is already in the method docblocks. DeepSource JS-0117 wanted the u flag on the JS host pattern, which uses unicode escapes. Adding it required widening the class to a code point range, since under the u flag the old code unit range would no longer match astral characters that the PHP side accepts as bytes. Verified in node: the u variant is identical to the previous one on all 15 sample urls and across 640 generated ASCII cases, and an astral host still matches, so PHP and JS stay in step. DeepSource JS-R1004: four backtick strings in the new Cypress block had no interpolation. Converted to plain strings. The parity test needle and the explanatory comment were updated to match the new JS form. The PHP pattern deliberately still has no u modifier, because preg_match() returns false on malformed UTF-8 and the negated result would report valid Latin-1 input as invalid. Co-Authored-By: Claude Opus 5 --- js/formidable.js | 5 +++-- js/formidable.min.js | 2 +- tests/phpunit/fields/test_FrmFieldValidate.php | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/js/formidable.js b/js/formidable.js index b5e3c5b450..421445edf1 100644 --- a/js/formidable.js +++ b/js/formidable.js @@ -545,8 +545,9 @@ function frmFrontFormJS() { const url = field.value; // Keep in sync with FrmFieldUrl::validate(), but the ranges differ by design: JS matches UTF-16 - // code units, so this needs \u0080-\uFFFF where the PHP side matches raw UTF-8 bytes instead. - if ( url !== '' && ! /^http(s)?:\/\/(?:localhost|(?:[\da-z\u0080-\uFFFF\.-]+\.[\da-z\u0080-\uFFFF\.-]+))/i.test( url ) ) { + // code units, so it uses the u flag and a code point range where the PHP side matches raw + // UTF-8 bytes. PHP must NOT gain /u: preg_match() returns false on malformed UTF-8. + if ( url !== '' && ! /^http(s)?:\/\/(?:localhost|(?:[\da-z\u0080-\u{10FFFF}\.-]+\.[\da-z\u0080-\u{10FFFF}\.-]+))/iu.test( url ) ) { fieldID = getFieldId( field, true ); if ( ! ( fieldID in errors ) ) { errors[ fieldID ] = getFieldValidationMessage( field, 'data-invmsg' ); diff --git a/js/formidable.min.js b/js/formidable.min.js index be27314fe8..f6b81f35f1 100644 --- a/js/formidable.min.js +++ b/js/formidable.min.js @@ -12,7 +12,7 @@ errors,onSubmit);else if(field.type==="url")checkUrlField(field,errors);else if( "")}if(errors[fileID]===undefined)val=getFileVals(fileID);fieldID=fileID}else{if(hasClass(field,"frm_pos_none"))return errors;val=jQuery(field).val();if(val===null)val="";else if(typeof val!=="string"){tempVal=val;val="";for(i=0;i()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/i;if(""!==field.value&&pattern.test(field.value)=== false)errors[fieldID]=getFieldValidationMessage(field,"data-invmsg");if(shouldCheckConfirmField(field,onSubmit))confirmField(field,errors)}function checkPasswordField(field,errors,onSubmit){if(shouldCheckConfirmField(field,onSubmit))confirmField(field,errors)}function confirmField(field,errors){const fieldID=getFieldId(field,true);const strippedId=field.id.replace("conf_","");const strippedFieldID=fieldID.replace("conf_","");const confirmField=document.getElementById(strippedId.replace("field_","field_conf_")); if(!confirmField||errors[`conf_${strippedFieldID}`]!==undefined)return;if(fieldID!==strippedFieldID){const firstField=document.getElementById(strippedId);const {value}=firstField;const confirmValue=confirmField.value;if(value!==confirmValue)errors[`conf_${strippedFieldID}`]=getFieldValidationMessage(confirmField,"data-confmsg")}else validateField(confirmField)}function checkNumberField(field,errors){let fieldID;const number=field.value;if(number!==""&&isNaN(number/1)!==false){fieldID=getFieldId(field, diff --git a/tests/phpunit/fields/test_FrmFieldValidate.php b/tests/phpunit/fields/test_FrmFieldValidate.php index ef15719cae..69a9432ad6 100644 --- a/tests/phpunit/fields/test_FrmFieldValidate.php +++ b/tests/phpunit/fields/test_FrmFieldValidate.php @@ -291,15 +291,15 @@ public function test_url_field_js_regex_parity() { $contents = file_get_contents( $file ); $name = basename( $file ); - $this->assertStringContainsString( '\u0080-\uFFFF', $contents, 'The JS host pattern is missing the code unit range in ' . $name ); - $this->assertStringNotContainsString( '\x80-\xff', $contents, 'The PHP byte range was copied into ' . $name . '. JS matches UTF-16 code units, so that would reject the Cyrillic and CJK hosts the server accepts.' ); + $this->assertStringContainsString( '\u0080-\u{10FFFF}', $contents, 'The JS host pattern is missing the code unit range in ' . $name ); + $this->assertStringNotContainsString( '\x80-\xff', $contents, 'The PHP byte range was copied into ' . $name . '; that rejects Cyrillic and CJK hosts.' ); $this->assertStringNotContainsString( '[\da-z\.-]', $contents, 'The old ASCII-only host class is still present in ' . $name ); } // The host class in the source must appear verbatim in the minified artifact. $matched = preg_match( '/\[\\\\da-z[^\]]*\]/', file_get_contents( $source ), $matches ); $this->assertSame( 1, $matched, 'Could not find the url host class in js/formidable.js' ); - $this->assertStringContainsString( $matches[0], file_get_contents( $minified ), 'js/formidable.min.js is stale. Rebuild it so it carries the same url host class as js/formidable.js.' ); + $this->assertStringContainsString( $matches[0], file_get_contents( $minified ), 'js/formidable.min.js is stale. Rebuild it.' ); } public function test_email_value() { From cd2f5e59566d78cf4912e662e5e9d764ee4b8dea Mon Sep 17 00:00:00 2001 From: Nathanael Jones Date: Fri, 21 Aug 2026 21:36:52 +0100 Subject: [PATCH 03/12] Drop the inaccurate @covers on the JS regex parity test Franky's non-blocking note on #3256: test_url_field_js_regex_parity() carried @covers FrmFieldUrl::validate but never calls validate() -- it reads js/formidable.js and js/formidable.min.js and asserts on their contents. The annotation credited the method with coverage the test does not provide. Removed rather than replaced with @coversNothing, since this suite uses no @coversNothing anywhere and sets no forceCoversAnnotation/requireCoverageMetadata, so an absent @covers is the existing convention for a test that isn't a unit test of one method. Left a note in the docblock saying it deliberately carries none, and pointing at test_url_value() as the test that does exercise validate() -- confirmed that test exists and carries that annotation rather than assuming it. Fixed here instead of in a follow-up because the PR is still open and it is a one-line docblock change. Verified: php -l clean. Co-Authored-By: Claude Opus 5 (1M context) --- tests/phpunit/fields/test_FrmFieldValidate.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/phpunit/fields/test_FrmFieldValidate.php b/tests/phpunit/fields/test_FrmFieldValidate.php index 69a9432ad6..be64869ecf 100644 --- a/tests/phpunit/fields/test_FrmFieldValidate.php +++ b/tests/phpunit/fields/test_FrmFieldValidate.php @@ -279,7 +279,9 @@ public function test_url_non_utf8_host_byte() { * running the regex: the code unit range is present, the PHP byte range was not copied across by * mistake, the old ASCII-only class is gone, and the minified file carries the same class. * - * @covers FrmFieldUrl::validate + * Deliberately carries no @covers: it reads js/formidable.js and js/formidable.min.js and never + * executes FrmFieldUrl::validate, so claiming to cover that method would credit it with + * coverage it does not provide. test_url_value() below is the test that exercises it. */ public function test_url_field_js_regex_parity() { $source = FrmAppHelper::plugin_path() . '/js/formidable.js'; From ec64cfe52b50453a1db5bb428cfec865c65c50e1 Mon Sep 17 00:00:00 2001 From: Truong Giang Date: Mon, 24 Aug 2026 17:42:33 +0700 Subject: [PATCH 04/12] Add a Vietnamese URL --- tests/phpunit/fields/test_FrmFieldValidate.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/phpunit/fields/test_FrmFieldValidate.php b/tests/phpunit/fields/test_FrmFieldValidate.php index be64869ecf..90885ce582 100644 --- a/tests/phpunit/fields/test_FrmFieldValidate.php +++ b/tests/phpunit/fields/test_FrmFieldValidate.php @@ -135,6 +135,11 @@ protected function expected_format_errors() { 'value' => 'https://пример.рф', 'invalid' => false, ), + array( + 'type' => 'url', + 'value' => 'https://càphê.vn', + 'invalid' => false, + ), array( 'type' => 'url', 'value' => 'https://a/b.com', @@ -219,6 +224,7 @@ public function test_url_idn_validation() { 'https://café.fr', 'https://пример.рф', 'https://例え.jp', + 'https://càphê.vn', 'https://ÄPFEL.DE', 'https://xn--ernhrung-2za.ch', 'https://example.com', From be1492707c390c0c9ebfe6ab21616588176c606e Mon Sep 17 00:00:00 2001 From: Truong Giang Date: Mon, 24 Aug 2026 17:50:54 +0700 Subject: [PATCH 05/12] Add deepsource stubs file --- composer.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/composer.json b/composer.json index 3b945dd3c4..2befca26e1 100644 --- a/composer.json +++ b/composer.json @@ -29,6 +29,11 @@ "classes/views/" ] }, + "autoload-dev": { + "files": [ + "stubs.php" + ] + }, "require-dev": { "php-stubs/wordpress-stubs": "^5.9", "yoast/phpunit-polyfills": "^4.0", From 3b7831741339a63134ecb38ced1a129420c5bcc9 Mon Sep 17 00:00:00 2001 From: Truong Giang Date: Tue, 25 Aug 2026 00:29:39 +0700 Subject: [PATCH 06/12] Revert "Add deepsource stubs file" This reverts commit 460811d4636675c78693b3eabab7fd88f02f6e27. --- composer.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/composer.json b/composer.json index 2befca26e1..3b945dd3c4 100644 --- a/composer.json +++ b/composer.json @@ -29,11 +29,6 @@ "classes/views/" ] }, - "autoload-dev": { - "files": [ - "stubs.php" - ] - }, "require-dev": { "php-stubs/wordpress-stubs": "^5.9", "yoast/phpunit-polyfills": "^4.0", From 4447c0bbe94d128b5f106740b84c5550a6278e3b Mon Sep 17 00:00:00 2001 From: Truong Giang Date: Tue, 25 Aug 2026 01:35:07 +0700 Subject: [PATCH 07/12] Apply suggestion from @franky-the-going-merry[bot] Co-authored-by: franky-the-going-merry[bot] <300681989+franky-the-going-merry[bot]@users.noreply.github.com> --- classes/models/fields/FrmFieldUrl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/models/fields/FrmFieldUrl.php b/classes/models/fields/FrmFieldUrl.php index c5f88c8243..4719c4c022 100644 --- a/classes/models/fields/FrmFieldUrl.php +++ b/classes/models/fields/FrmFieldUrl.php @@ -86,7 +86,7 @@ public function validate( $args ) { // Byte range by design, and no /u modifier: with /u, preg_match() returns false on invalid UTF-8. if ( $value && ! preg_match( '/^http(s)?:\/\/(?:localhost|(?:[\da-z\x80-\xff\.-]+\.[\da-z\x80-\xff\.-]+))/i', $value ) ) { $errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' ); - // skipcq: PHP-W1067 -- $this->field is always a field object by the time validate() runs; FrmFieldType's constructor just accepts array|int|object for lazy construction elsewhere. + // skipcq: PHP-W1067 -- $this->field is always a real object here; array|int|object only matters during lazy construction elsewhere. } elseif ( $this->field->required == '1' && ! $value ) { // phpcs:ignore Universal.Operators.StrictComparisons $errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'blank' ); } From 6752bce86b1ed16e3ed176326b03e0177469252b Mon Sep 17 00:00:00 2001 From: Truong Giang Date: Tue, 25 Aug 2026 14:37:06 +0700 Subject: [PATCH 08/12] Remove unnecessary change --- classes/models/fields/FrmFieldUrl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/models/fields/FrmFieldUrl.php b/classes/models/fields/FrmFieldUrl.php index 4719c4c022..ff44311efb 100644 --- a/classes/models/fields/FrmFieldUrl.php +++ b/classes/models/fields/FrmFieldUrl.php @@ -86,7 +86,7 @@ public function validate( $args ) { // Byte range by design, and no /u modifier: with /u, preg_match() returns false on invalid UTF-8. if ( $value && ! preg_match( '/^http(s)?:\/\/(?:localhost|(?:[\da-z\x80-\xff\.-]+\.[\da-z\x80-\xff\.-]+))/i', $value ) ) { $errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' ); - // skipcq: PHP-W1067 -- $this->field is always a real object here; array|int|object only matters during lazy construction elsewhere. + // skipcq: PHP-W1067 -- $this->field is always a field object by the time validate() runs; FrmFieldType's constructor just accepts array|int|object for lazy construction elsewhere. } elseif ( $this->field->required == '1' && ! $value ) { // phpcs:ignore Universal.Operators.StrictComparisons $errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'blank' ); } From 9f4f4f68ed925d2ca0fce0b9a935848c26044f42 Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Wed, 30 Sep 2026 12:48:57 -0300 Subject: [PATCH 09/12] Get caught up with master --- classes/models/fields/FrmFieldUrl.php | 61 ++++++++-- .../views/frm-fields/back-end/settings.php | 9 ++ js/formidable.js | 12 +- js/formidable.min.js | 59 +++++----- .../fieldsInFormBuilder-validation.cy.js | 18 ++- .../phpunit/fields/test_FrmFieldValidate.php | 105 +++++++++++++----- 6 files changed, 195 insertions(+), 69 deletions(-) diff --git a/classes/models/fields/FrmFieldUrl.php b/classes/models/fields/FrmFieldUrl.php index ff44311efb..e04ece0096 100644 --- a/classes/models/fields/FrmFieldUrl.php +++ b/classes/models/fields/FrmFieldUrl.php @@ -25,10 +25,11 @@ class FrmFieldUrl extends FrmFieldType { */ protected function field_settings_for_type() { return array( - 'size' => true, - 'clear_on_focus' => true, - 'invalid' => true, - 'show_image' => true, + 'size' => true, + 'clear_on_focus' => true, + 'invalid' => true, + 'show_image' => true, + 'allow_intl_domains' => true, ); } @@ -37,7 +38,8 @@ protected function field_settings_for_type() { */ protected function extra_field_opts() { return array( - 'show_image' => 0, + 'show_image' => 0, + 'allow_intl_domains' => 0, ); } @@ -82,9 +84,8 @@ public function validate( $args ) { $errors = array(); - // Validate the url format. The host class allows \x80-\xff so internationalized domain names pass. - // Byte range by design, and no /u modifier: with /u, preg_match() returns false on invalid UTF-8. - if ( $value && ! preg_match( '/^http(s)?:\/\/(?:localhost|(?:[\da-z\x80-\xff\.-]+\.[\da-z\x80-\xff\.-]+))/i', $value ) ) { + // Validate the url format. + if ( $value && ! preg_match( $this->get_url_pattern(), $value ) ) { $errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' ); // skipcq: PHP-W1067 -- $this->field is always a field object by the time validate() runs; FrmFieldType's constructor just accepts array|int|object for lazy construction elsewhere. } elseif ( $this->field->required == '1' && ! $value ) { // phpcs:ignore Universal.Operators.StrictComparisons @@ -94,6 +95,50 @@ public function validate( $args ) { return $errors; } + /** + * Gets the regular expression used to validate the url format. + * + * @since x.x + * + * @return string + */ + private function get_url_pattern() { + if ( ! $this->allows_intl_domains() ) { + return '/^http(s)?:\/\/(?:localhost|(?:[\da-z\.-]+\.[\da-z\.-]+))/i'; + } + + // The host class allows \x80-\xff so internationalized domain names pass. + // Byte range by design, and no /u modifier: with /u, preg_match() returns false on invalid UTF-8. + return '/^http(s)?:\/\/(?:localhost|(?:[\da-z\x80-\xff\.-]+\.[\da-z\x80-\xff\.-]+))/i'; + } + + /** + * Checks if the field accepts internationalized domain names, like https://ernährung.ch. + * + * @since x.x + * + * @return bool + */ + private function allows_intl_domains() { + return (bool) FrmField::get_option( $this->field, 'allow_intl_domains' ); + } + + /** + * Flags the input so the javascript validation accepts internationalized domain names too. + * + * @since x.x + * + * @param array $args Field arguments. + * @param string $input_html The HTML attributes for the input. + * + * @return void + */ + protected function add_extra_html_atts( $args, &$input_html ) { + if ( $this->allows_intl_domains() ) { + $input_html .= ' data-intl-domains="1"'; + } + } + protected function prepare_display_value( $value, $atts ) { if ( ! $atts['html'] ) { return $value; diff --git a/classes/views/frm-fields/back-end/settings.php b/classes/views/frm-fields/back-end/settings.php index a0401197d5..e2c6a593e3 100644 --- a/classes/views/frm-fields/back-end/settings.php +++ b/classes/views/frm-fields/back-end/settings.php @@ -380,6 +380,15 @@

+ +

+ +

+ +

From 2858cda891460be21360b5f9df913537da49a2a3 Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Wed, 30 Sep 2026 15:23:20 -0300 Subject: [PATCH 12/12] Try to fix tests --- .../cypress/e2e/Form Templates/FormTemplates.cy.js | 8 +++++++- tests/cypress/support/commands.js | 14 +++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/tests/cypress/e2e/Form Templates/FormTemplates.cy.js b/tests/cypress/e2e/Form Templates/FormTemplates.cy.js index a4c4b30d63..7ed0a57919 100644 --- a/tests/cypress/e2e/Form Templates/FormTemplates.cy.js +++ b/tests/cypress/e2e/Form Templates/FormTemplates.cy.js @@ -463,7 +463,13 @@ describe( 'Form Templates page', () => { cy.get( '#frm-confirmed-click' ).should( 'contain', 'Confirm' ).click(); cy.log( 'Delete forms' ); - cy.get( '#cb-select-all-1' ).click(); + // Skip the default contact-form rather than using the header "select all" checkbox. Specs + // later in the same shard preview it by key, and deleteForms.cy.js empties the Trash, so + // trashing it here deletes it for good. + cy.get( '#the-list tr' ) + .filter( ( index, element ) => Cypress.$( element ).find( '.column-form_key' ).text().trim() !== 'contact-form' ) + .find( '.check-column input[type="checkbox"]' ) + .check(); cy.get( '#bulk-action-selector-top' ).select( 'Move to Trash' ); cy.get( '#doaction' ).should( 'contain', 'Apply' ).click(); } ); diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js index a30a277b58..372e7ba8ac 100644 --- a/tests/cypress/support/commands.js +++ b/tests/cypress/support/commands.js @@ -141,16 +141,20 @@ Cypress.Commands.add( 'ensureContactUsFormExists', () => { cy.visit( '/wp-admin/admin.php?page=formidable-form-templates' ); cy.contains( 'li', 'Contact Us', { timeout: 10000 } ) .first() - // Wait for the template card itself to be visible before triggering the hover - - // the templates grid populates async, and triggering on a not-yet-rendered card - // was the actual reason force was needed here, not the hover-only child button. + // Wait for the template card itself to be visible first - the templates grid + // populates async. The button row is `display: none` until a real CSS `:hover`, + // which trigger( 'mouseover' ) can't produce, so reveal it the way the hover + // would (same as FormTemplates.cy.js), then click normally. .should( 'be.visible' ) - .trigger( 'mouseover' ) + .find( '.frm-form-templates-item-buttons' ) + .invoke( 'css', 'display', 'flex' ) .find( '.frm-form-templates-use-template-button' ) .should( 'contain', 'Use Template' ) .click(); - cy.get( "svg[aria-label='Close']", { timeout: 7000 } ).should( 'be.visible' ).click(); + // A successful install opens the new form in the builder, same as FormTemplates.cy.js. + cy.location( 'search', { timeout: 10000 } ).should( 'include', 'frm_action=edit' ); + cy.get( '#frm_form_editor_container' ).should( 'be.visible' ); restoreFromTrash(); } );