From 1c1cd863cadf87dde34d9b0ba5204aa85bd8c691 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Fri, 1 Nov 2013 03:30:40 +0400 Subject: [PATCH] Fixes #1107: Gii CRUD generator now validates same named model and search model class names --- framework/yii/gii/generators/crud/Generator.php | 1 + 1 file changed, 1 insertion(+) diff --git a/framework/yii/gii/generators/crud/Generator.php b/framework/yii/gii/generators/crud/Generator.php index cb4bce6..a38cf5e 100644 --- a/framework/yii/gii/generators/crud/Generator.php +++ b/framework/yii/gii/generators/crud/Generator.php @@ -44,6 +44,7 @@ class Generator extends \yii\gii\Generator 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()]],