Merge pull request #304 from CheckeredFlag/master

Fixed broken regex character class

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 #304: Fixed broken regex character class (CheckeredFlag)
 
 ## 1.1.4 - February 19, 2018
 - Enh: Check enableEmailConfirmation on registration (faenir)

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',

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],
         ];