From ecc557ef92f62d0200113ea6dd833550abf8a702 Mon Sep 17 00:00:00 2001 From: slavcodev Date: Tue, 12 Nov 2013 16:39:23 +0200 Subject: [PATCH] Refactor all models to new rules format --- apps/advanced/common/models/LoginForm.php | 6 +++--- apps/advanced/common/models/User.php | 24 +++++++++++----------- apps/advanced/frontend/models/ContactForm.php | 6 +++--- apps/basic/models/ContactForm.php | 6 +++--- apps/basic/models/LoginForm.php | 6 +++--- extensions/gii/Generator.php | 4 ++-- extensions/gii/generators/controller/Generator.php | 12 +++++------ extensions/gii/generators/crud/Generator.php | 22 ++++++++++---------- extensions/gii/generators/form/Generator.php | 16 +++++++-------- extensions/gii/generators/model/Generator.php | 22 ++++++++++---------- extensions/gii/generators/module/Generator.php | 10 ++++----- tests/unit/data/base/Singer.php | 6 +++--- .../validators/models/FakedValidationModel.php | 6 +++--- 13 files changed, 73 insertions(+), 73 deletions(-) diff --git a/apps/advanced/common/models/LoginForm.php b/apps/advanced/common/models/LoginForm.php index 339005b..795c378 100644 --- a/apps/advanced/common/models/LoginForm.php +++ b/apps/advanced/common/models/LoginForm.php @@ -21,11 +21,11 @@ class LoginForm extends Model { return [ // username and password are both required - ['username, password', 'required'], + [['username', 'password'], 'required'], // password is validated by validatePassword() - ['password', 'validatePassword'], + [['password'], 'validatePassword'], // rememberMe must be a boolean value - ['rememberMe', 'boolean'], + [['rememberMe'], 'boolean'], ]; } diff --git a/apps/advanced/common/models/User.php b/apps/advanced/common/models/User.php index 17bd630..85e5539 100644 --- a/apps/advanced/common/models/User.php +++ b/apps/advanced/common/models/User.php @@ -104,18 +104,18 @@ class User extends ActiveRecord implements IdentityInterface public function rules() { return [ - ['username', 'filter', 'filter' => 'trim'], - ['username', 'required'], - ['username', 'string', 'min' => 2, 'max' => 255], - - ['email', 'filter', 'filter' => 'trim'], - ['email', 'required'], - ['email', 'email'], - ['email', 'unique', 'message' => 'This email address has already been taken.', 'on' => 'signup'], - ['email', 'exist', 'message' => 'There is no user with such email.', 'on' => 'requestPasswordResetToken'], - - ['password', 'required'], - ['password', 'string', 'min' => 6], + [['username'], 'filter', 'filter' => 'trim'], + [['username'], 'required'], + [['username'], 'string', 'min' => 2, 'max' => 255], + + [['email'], 'filter', 'filter' => 'trim'], + [['email'], 'required'], + [['email'], 'email'], + [['email'], 'unique', 'message' => 'This email address has already been taken.', 'on' => 'signup'], + [['email'], 'exist', 'message' => 'There is no user with such email.', 'on' => 'requestPasswordResetToken'], + + [['password'], 'required'], + [['password'], 'string', 'min' => 6], ]; } diff --git a/apps/advanced/frontend/models/ContactForm.php b/apps/advanced/frontend/models/ContactForm.php index a3c56b8..45b0da0 100644 --- a/apps/advanced/frontend/models/ContactForm.php +++ b/apps/advanced/frontend/models/ContactForm.php @@ -23,11 +23,11 @@ class ContactForm extends Model { return [ // name, email, subject and body are required - ['name, email, subject, body', 'required'], + [['name', 'email', 'subject', 'body'], 'required'], // email has to be a valid email address - ['email', 'email'], + [['email'], 'email'], // verifyCode needs to be entered correctly - ['verifyCode', 'captcha'], + [['verifyCode'], 'captcha'], ]; } diff --git a/apps/basic/models/ContactForm.php b/apps/basic/models/ContactForm.php index 58f8d26..dbdde8b 100644 --- a/apps/basic/models/ContactForm.php +++ b/apps/basic/models/ContactForm.php @@ -23,11 +23,11 @@ class ContactForm extends Model { return [ // name, email, subject and body are required - ['name, email, subject, body', 'required'], + [['name', 'email', 'subject', 'body'], 'required'], // email has to be a valid email address - ['email', 'email'], + [['email'], 'email'], // verifyCode needs to be entered correctly - ['verifyCode', 'captcha'], + [['verifyCode'], 'captcha'], ]; } diff --git a/apps/basic/models/LoginForm.php b/apps/basic/models/LoginForm.php index 339cf31..cdff17b 100644 --- a/apps/basic/models/LoginForm.php +++ b/apps/basic/models/LoginForm.php @@ -21,11 +21,11 @@ class LoginForm extends Model { return [ // username and password are both required - ['username, password', 'required'], + [['username', 'password'], 'required'], // password is validated by validatePassword() - ['password', 'validatePassword'], + [['password'], 'validatePassword'], // rememberMe must be a boolean value - ['rememberMe', 'boolean'], + [['rememberMe'], 'boolean'], ]; } diff --git a/extensions/gii/Generator.php b/extensions/gii/Generator.php index fb856d5..05c45a7 100644 --- a/extensions/gii/Generator.php +++ b/extensions/gii/Generator.php @@ -178,8 +178,8 @@ abstract class Generator extends Model public function rules() { return [ - ['template', 'required', 'message' => 'A code template must be selected.'], - ['template', 'validateTemplate'], + [['template'], 'required', 'message' => 'A code template must be selected.'], + [['template'], 'validateTemplate'], ]; } diff --git a/extensions/gii/generators/controller/Generator.php b/extensions/gii/generators/controller/Generator.php index f23bcd4..08b29d5 100644 --- a/extensions/gii/generators/controller/Generator.php +++ b/extensions/gii/generators/controller/Generator.php @@ -69,12 +69,12 @@ class Generator extends \yii\gii\Generator public function rules() { return array_merge(parent::rules(), [ - ['controller, actions, baseClass, ns', 'filter', 'filter' => 'trim'], - ['controller, baseClass', 'required'], - ['controller', 'match', 'pattern' => '/^[a-z\\-\\/]*$/', 'message' => 'Only a-z, dashes (-) and slashes (/) are allowed.'], - ['actions', 'match', 'pattern' => '/^[a-z\\-,\\s]*$/', 'message' => 'Only a-z, dashes (-), spaces and commas are allowed.'], - ['baseClass', 'match', 'pattern' => '/^[\w\\\\]*$/', 'message' => 'Only word characters and backslashes are allowed.'], - ['ns', 'match', 'pattern' => '/^[\w\\\\]*$/', 'message' => 'Only word characters and backslashes are allowed.'], + [['controller', 'actions', 'baseClass', 'ns'], 'filter', 'filter' => 'trim'], + [['controller', 'baseClass'], 'required'], + [['controller'], 'match', 'pattern' => '/^[a-z\\-\\/]*$/', 'message' => 'Only a-z, dashes (-) and slashes (/) are allowed.'], + [['actions'], 'match', 'pattern' => '/^[a-z\\-,\\s]*$/', 'message' => 'Only a-z, dashes (-), spaces and commas are allowed.'], + [['baseClass'], 'match', 'pattern' => '/^[\w\\\\]*$/', 'message' => 'Only word characters and backslashes are allowed.'], + [['ns'], 'match', 'pattern' => '/^[\w\\\\]*$/', 'message' => 'Only word characters and backslashes are allowed.'], ]); } diff --git a/extensions/gii/generators/crud/Generator.php b/extensions/gii/generators/crud/Generator.php index ea347e1..8ea1ff6 100644 --- a/extensions/gii/generators/crud/Generator.php +++ b/extensions/gii/generators/crud/Generator.php @@ -42,17 +42,17 @@ class Generator extends \yii\gii\Generator public function rules() { return array_merge(parent::rules(), [ - ['moduleID, controllerClass, modelClass, searchModelClass, baseControllerClass', 'filter', 'filter' => 'trim'], - ['modelClass, searchModelClass, controllerClass, baseControllerClass, indexWidgetType', 'required'], - ['searchModelClass', 'compare', 'compareAttribute' => 'modelClass', 'operator' => '!==', 'message' => 'Search Model Class must not be equal to Model Class.'], - ['modelClass, controllerClass, baseControllerClass, searchModelClass', 'match', 'pattern' => '/^[\w\\\\]*$/', 'message' => 'Only word characters and backslashes are allowed.'], - ['modelClass', 'validateClass', 'params' => ['extends' => ActiveRecord::className()]], - ['baseControllerClass', 'validateClass', 'params' => ['extends' => Controller::className()]], - ['controllerClass', 'match', 'pattern' => '/Controller$/', 'message' => 'Controller class name must be suffixed with "Controller".'], - ['controllerClass, searchModelClass', 'validateNewClass'], - ['indexWidgetType', 'in', 'range' => ['grid', 'list']], - ['modelClass', 'validateModelClass'], - ['moduleID', 'validateModuleID'], + [['moduleID', 'controllerClass', 'modelClass', 'searchModelClass', 'baseControllerClass'], 'filter', 'filter' => 'trim'], + [['modelClass', 'searchModelClass', 'controllerClass', 'baseControllerClass', 'indexWidgetType'], 'required'], + [['searchModelClass'], 'compare', 'compareAttribute' => 'modelClass', 'operator' => '!==', 'message' => 'Search Model Class must not be equal to Model Class.'], + [['modelClass', 'controllerClass', 'baseControllerClass', 'searchModelClass'], 'match', 'pattern' => '/^[\w\\\\]*$/', 'message' => 'Only word characters and backslashes are allowed.'], + [['modelClass'], 'validateClass', 'params' => ['extends' => ActiveRecord::className()]], + [['baseControllerClass'], 'validateClass', 'params' => ['extends' => Controller::className()]], + [['controllerClass'], 'match', 'pattern' => '/Controller$/', 'message' => 'Controller class name must be suffixed with "Controller".'], + [['controllerClass', 'searchModelClass'], 'validateNewClass'], + [['indexWidgetType'], 'in', 'range' => ['grid', 'list']], + [['modelClass'], 'validateModelClass'], + [['moduleID'], 'validateModuleID'], ]); } diff --git a/extensions/gii/generators/form/Generator.php b/extensions/gii/generators/form/Generator.php index 749f9d8..3bc0be6 100644 --- a/extensions/gii/generators/form/Generator.php +++ b/extensions/gii/generators/form/Generator.php @@ -60,14 +60,14 @@ class Generator extends \yii\gii\Generator public function rules() { return array_merge(parent::rules(), [ - ['modelClass, viewName, scenarioName, viewPath', 'filter', 'filter' => 'trim'], - ['modelClass, viewName, viewPath', 'required'], - ['modelClass', 'match', 'pattern' => '/^[\w\\\\]*$/', 'message' => 'Only word characters and backslashes are allowed.'], - ['modelClass', 'validateClass', 'params' => ['extends' => Model::className()]], - ['viewName', 'match', 'pattern' => '/^\w+[\\-\\/\w]*$/', 'message' => 'Only word characters, dashes and slashes are allowed.'], - ['viewPath', 'match', 'pattern' => '/^@?\w+[\\-\\/\w]*$/', 'message' => 'Only word characters, dashes, slashes and @ are allowed.'], - ['viewPath', 'validateViewPath'], - ['scenarioName', 'match', 'pattern' => '/^[\w\\-]+$/', 'message' => 'Only word characters and dashes are allowed.'], + [['modelClass', 'viewName', 'scenarioName', 'viewPath'], 'filter', 'filter' => 'trim'], + [['modelClass', 'viewName', 'viewPath'], 'required'], + [['modelClass'], 'match', 'pattern' => '/^[\w\\\\]*$/', 'message' => 'Only word characters and backslashes are allowed.'], + [['modelClass'], 'validateClass', 'params' => ['extends' => Model::className()]], + [['viewName'], 'match', 'pattern' => '/^\w+[\\-\\/\w]*$/', 'message' => 'Only word characters, dashes and slashes are allowed.'], + [['viewPath'], 'match', 'pattern' => '/^@?\w+[\\-\\/\w]*$/', 'message' => 'Only word characters, dashes, slashes and @ are allowed.'], + [['viewPath'], 'validateViewPath'], + [['scenarioName'], 'match', 'pattern' => '/^[\w\\-]+$/', 'message' => 'Only word characters and dashes are allowed.'], ]); } diff --git a/extensions/gii/generators/model/Generator.php b/extensions/gii/generators/model/Generator.php index 5804d30..976fde8 100644 --- a/extensions/gii/generators/model/Generator.php +++ b/extensions/gii/generators/model/Generator.php @@ -53,17 +53,17 @@ class Generator extends \yii\gii\Generator public function rules() { return array_merge(parent::rules(), [ - ['db, ns, tableName, modelClass, baseClass', 'filter', 'filter' => 'trim'], - ['db, ns, tableName, baseClass', 'required'], - ['db, modelClass', 'match', 'pattern' => '/^\w+$/', 'message' => 'Only word characters are allowed.'], - ['ns, baseClass', 'match', 'pattern' => '/^[\w\\\\]+$/', 'message' => 'Only word characters and backslashes are allowed.'], - ['tableName', 'match', 'pattern' => '/^(\w+\.)?([\w\*]+)$/', 'message' => 'Only word characters, and optionally an asterisk and/or a dot are allowed.'], - ['db', 'validateDb'], - ['ns', 'validateNamespace'], - ['tableName', 'validateTableName'], - ['modelClass', 'validateModelClass', 'skipOnEmpty' => false], - ['baseClass', 'validateClass', 'params' => ['extends' => ActiveRecord::className()]], - ['generateRelations, generateLabelsFromComments', 'boolean'], + [['db', 'ns', 'tableName', 'modelClass', 'baseClass'], 'filter', 'filter' => 'trim'], + [['db', 'ns', 'tableName', 'baseClass'], 'required'], + [['db', 'modelClass'], 'match', 'pattern' => '/^\w+$/', 'message' => 'Only word characters are allowed.'], + [['ns', 'baseClass'], 'match', 'pattern' => '/^[\w\\\\]+$/', 'message' => 'Only word characters and backslashes are allowed.'], + [['tableName'], 'match', 'pattern' => '/^(\w+\.)?([\w\*]+)$/', 'message' => 'Only word characters, and optionally an asterisk and/or a dot are allowed.'], + [['db'], 'validateDb'], + [['ns'], 'validateNamespace'], + [['tableName'], 'validateTableName'], + [['modelClass'], 'validateModelClass', 'skipOnEmpty' => false], + [['baseClass'], 'validateClass', 'params' => ['extends' => ActiveRecord::className()]], + [['generateRelations', 'generateLabelsFromComments'], 'boolean'], ]); } diff --git a/extensions/gii/generators/module/Generator.php b/extensions/gii/generators/module/Generator.php index fcb385d..23e9b45 100644 --- a/extensions/gii/generators/module/Generator.php +++ b/extensions/gii/generators/module/Generator.php @@ -45,11 +45,11 @@ class Generator extends \yii\gii\Generator public function rules() { return array_merge(parent::rules(), [ - ['moduleID, moduleClass', 'filter', 'filter' => 'trim'], - ['moduleID, moduleClass', 'required'], - ['moduleID', 'match', 'pattern' => '/^[\w\\-]+$/', 'message' => 'Only word characters and dashes are allowed.'], - ['moduleClass', 'match', 'pattern' => '/^[\w\\\\]*$/', 'message' => 'Only word characters and backslashes are allowed.'], - ['moduleClass', 'validateModuleClass'], + [['moduleID', 'moduleClass'], 'filter', 'filter' => 'trim'], + [['moduleID', 'moduleClass'], 'required'], + [['moduleID'], 'match', 'pattern' => '/^[\w\\-]+$/', 'message' => 'Only word characters and dashes are allowed.'], + [['moduleClass'], 'match', 'pattern' => '/^[\w\\\\]*$/', 'message' => 'Only word characters and backslashes are allowed.'], + [['moduleClass'], 'validateModuleClass'], ]); } diff --git a/tests/unit/data/base/Singer.php b/tests/unit/data/base/Singer.php index 5c0f0fe..547cee8 100644 --- a/tests/unit/data/base/Singer.php +++ b/tests/unit/data/base/Singer.php @@ -14,9 +14,9 @@ class Singer extends Model public function rules() { return [ - ['lastName', 'default', 'value' => 'Lennon'], - ['lastName', 'required'], - ['underscore_style', 'yii\captcha\CaptchaValidator'], + [['lastName'], 'default', 'value' => 'Lennon'], + [['lastName'], 'required'], + [['underscore_style'], 'yii\captcha\CaptchaValidator'], ]; } } diff --git a/tests/unit/data/validators/models/FakedValidationModel.php b/tests/unit/data/validators/models/FakedValidationModel.php index 6e9c8b1..73f8192 100644 --- a/tests/unit/data/validators/models/FakedValidationModel.php +++ b/tests/unit/data/validators/models/FakedValidationModel.php @@ -28,8 +28,8 @@ class FakedValidationModel extends Model public function rules() { return [ - ['val_attr_a, val_attr_b', 'required', 'on' => 'reqTest'], - ['val_attr_c', 'integer'], + [['val_attr_a', 'val_attr_b'], 'required', 'on' => 'reqTest'], + [['val_attr_c'], 'integer'], ]; } @@ -60,4 +60,4 @@ class FakedValidationModel extends Model { return $attr; } -} \ No newline at end of file +}