From 1ad28095061822e556e5f8af2d23c57a221004e9 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Sun, 14 Jan 2024 14:45:06 +0100 Subject: [PATCH 1/2] Form: Add regex validation rule --- libraries/src/Form/Rule/RegexRule.php | 55 +++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 libraries/src/Form/Rule/RegexRule.php diff --git a/libraries/src/Form/Rule/RegexRule.php b/libraries/src/Form/Rule/RegexRule.php new file mode 100644 index 0000000000000..6c9328702e449 --- /dev/null +++ b/libraries/src/Form/Rule/RegexRule.php @@ -0,0 +1,55 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +namespace Joomla\CMS\Form\Rule; + +use Joomla\CMS\Form\Form; +use Joomla\CMS\Form\FormRule; +use Joomla\Registry\Registry; + +// phpcs:disable PSR1.Files.SideEffects +\defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects + +/** + * Form Rule class for the Joomla Platform. + * + * @since __DEPLOY_VERSION__ + */ +class RegexRule extends FormRule +{ + /** + * Method to test the value. + * + * @param \SimpleXMLElement $element The SimpleXMLElement object representing the `` tag for the form field object. + * @param mixed $value The form field value to validate. + * @param string $group The field name group control value. This acts as as an array container for the field. + * For example if the field has name="foo" and the group value is set to "bar" then the + * full field name would end up being "bar[foo]". + * @param ?Registry $input An optional Registry object with the entire data set to validate against the entire form. + * @param ?Form $form The form object for which the field is being tested. + * + * @return boolean True if the value is valid, false otherwise. + * + * @since __DEPLOY_VERSION__ + * @throws \UnexpectedValueException if rule is invalid. + */ + public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null) + { + if ((string) $element['validate_regex']) { + $this->regex = (string) $element['validate_regex']; + } + + if ((string) $element['validate_modifier']) { + $this->modifiers = (string) $element['validate_modifier']; + } + + return parent::test($element, $value, $group, $input, $form); + } +} From 70a3a536f61e0da389eba91ce0d93f9c5db11ea8 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Mon, 15 Jan 2024 09:53:16 +0100 Subject: [PATCH 2/2] Update libraries/src/Form/Rule/RegexRule.php Co-authored-by: Brian Teeman --- libraries/src/Form/Rule/RegexRule.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/src/Form/Rule/RegexRule.php b/libraries/src/Form/Rule/RegexRule.php index 6c9328702e449..ec7d5d7f9d648 100644 --- a/libraries/src/Form/Rule/RegexRule.php +++ b/libraries/src/Form/Rule/RegexRule.php @@ -29,7 +29,7 @@ class RegexRule extends FormRule * * @param \SimpleXMLElement $element The SimpleXMLElement object representing the `` tag for the form field object. * @param mixed $value The form field value to validate. - * @param string $group The field name group control value. This acts as as an array container for the field. + * @param string $group The field name group control value. This acts as an array container for the field. * For example if the field has name="foo" and the group value is set to "bar" then the * full field name would end up being "bar[foo]". * @param ?Registry $input An optional Registry object with the entire data set to validate against the entire form.