From 4084c555924f94cb1578dfffb59c3fa9f6fd9293 Mon Sep 17 00:00:00 2001 From: Marco Moreno Date: Fri, 15 Mar 2019 16:31:09 -0400 Subject: [PATCH 1/3] Fixed broken regex character class --- src/User/Model/AbstractAuthItem.php | 2 +- src/User/Model/Rule.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/User/Model/AbstractAuthItem.php b/src/User/Model/AbstractAuthItem.php index 9080582..573c3e8 100644 --- a/src/User/Model/AbstractAuthItem.php +++ b/src/User/Model/AbstractAuthItem.php @@ -98,7 +98,7 @@ abstract class AbstractAuthItem extends Model return [ ['itemName', 'safe'], ['name', 'required'], - ['name', 'match', 'pattern' => '/^[\w][\w-.:]+[\w]$/'], + ['name', 'match', 'pattern' => '/^[\w][\w.:-]+[\w]$/'], [['name', 'description', 'rule'], 'trim'], [ 'name', diff --git a/src/User/Model/Rule.php b/src/User/Model/Rule.php index a8d1f55..b0b415d 100644 --- a/src/User/Model/Rule.php +++ b/src/User/Model/Rule.php @@ -53,7 +53,7 @@ class Rule extends Model return [ [['name', 'className'], 'trim'], [['name', 'className'], 'required'], - [['name', 'previousName'], 'match', 'pattern' => '/^[\w][\w-.:]+[\w]$/'], + [['name', 'previousName'], 'match', 'pattern' => '/^[\w][\w.:-]+[\w]$/'], [['name'], RbacRuleNameValidator::class, 'previousName' => $this->previousName], [['className'], RbacRuleValidator::class], ]; From 1d5d2a51e0a07b1f7bc8ed92096d4c78832368fb Mon Sep 17 00:00:00 2001 From: Marco Moreno Date: Fri, 15 Mar 2019 17:15:50 -0400 Subject: [PATCH 2/3] Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3ea7b7..95cb0b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Enh #249: Show message `email send if possible` any time on reset password request (bscheshirwork) - Enh #282: Allows customization of controller namespace (maxxer) - Enh #303: Added French translation (pde159) + - Fix: Fixed broken regex character class (CheckeredFlag) ## 1.1.4 - February 19, 2018 - Enh: Check enableEmailConfirmation on registration (faenir) From 0986f4f75646204ad2e99562e68fca25e90933fc Mon Sep 17 00:00:00 2001 From: Antonio Ramirez Date: Fri, 15 Mar 2019 22:46:42 +0100 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95cb0b0..389dc32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ - Enh #249: Show message `email send if possible` any time on reset password request (bscheshirwork) - Enh #282: Allows customization of controller namespace (maxxer) - Enh #303: Added French translation (pde159) - - Fix: Fixed broken regex character class (CheckeredFlag) + - Fix #304: Fixed broken regex character class (CheckeredFlag) ## 1.1.4 - February 19, 2018 - Enh: Check enableEmailConfirmation on registration (faenir)