@@ -102,27 +102,29 @@ public function boot()
102102 });
103103
104104 Validator::extend ("password_policy " , function ($ attribute , $ value , $ parameters , $ validator ){
105+ $ min_length = Config::get ("auth.password_min_length " );
106+ $ max_length = Config::get ("auth.password_max_length " );
107+ $ warning = Config::get ("auth.password_shape_warning " );
108+ $ pattern = Config::get ("auth.password_shape_pattern " );
109+
110+ $ validator ->addReplacer ('password_policy ' , function ($ message , $ attribute , $ rule , $ parameters ) use ($ validator , $ min_length , $ max_length , $ warning ) {
111+ return sprintf ("The %s must be %s–%s characters, and %s " , $ attribute , $ min_length , $ max_length , $ warning );
112+ });
113+
105114 $ password = TextUtils::trim ($ value );
106115
107- $ min_length = Config::get ("auth.password_min_length " );
108116 if (strlen ($ password ) < $ min_length ) {
109117 return false ;
110118 }
111119
112- $ max_length = Config::get ("auth.password_max_length " );
113120 if (strlen ($ password ) > $ max_length ) {
114121 return false ;
115122 }
116- $ warning = Config::get ("auth.password_shape_warning " );
117- $ pattern = Config::get ("auth.password_shape_pattern " );
123+
118124 if (!preg_match ("/ $ pattern/ " , $ password )) {
119125 return false ;
120126 }
121127
122- $ validator ->addReplacer ('password_policy ' , function ($ message , $ attribute , $ rule , $ parameters ) use ($ validator , $ min_length , $ max_length , $ warning ) {
123- return sprintf ("The %s must be %s–%s characters, and %s " , $ attribute , $ min_length , $ max_length , $ warning );
124- });
125-
126128 return true ;
127129 });
128130 }
0 commit comments