From 43cb44de2c4f67ed486981cc17a095c00e2d53c1 Mon Sep 17 00:00:00 2001
From: githubjeka <et.coder@gmail.com>
Date: Wed, 24 Jun 2015 10:31:25 +0300
Subject: [PATCH 1/2] Updates for Search-Form Model.

Now search model not inherit Active Record model.
This allows you to get rid of the duct tape method `scenarios()`.
And taught the right way of using models and active records.
---
 generators/crud/default/search.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/generators/crud/default/search.php b/generators/crud/default/search.php
index b868352a9..43c62ccc8 100644
--- a/generators/crud/default/search.php
+++ b/generators/crud/default/search.php
@@ -18,7 +18,7 @@
 $labels = $generator->generateSearchLabels();
 $searchAttributes = $generator->getSearchAttributes();
 $searchConditions = $generator->generateSearchConditions();
-
+$tableSchema = $generator->getTableSchema();
 echo "<?php\n";
 ?>
 
@@ -32,9 +32,16 @@
 /**
  * <?= $searchModelClass ?> represents the model behind the search form about `<?= $generator->modelClass ?>`.
  */
-class <?= $searchModelClass ?> extends <?= isset($modelAlias) ? $modelAlias : $modelClass ?>
-
+class <?= $searchModelClass ?> extends Model
 {
+    <?php foreach ($searchAttributes as $attribute) : ?>/**
+    * @var <?= ($tableSchema !== false) ? $tableSchema->columns[$attribute]->phpType : 'mixed'?>
+
+    */
+    public $<?= $attribute ?>;
+    <?php endforeach ?>
+
+
     /**
      * @inheritdoc
      */
@@ -45,15 +52,6 @@ public function rules()
         ];
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function scenarios()
-    {
-        // bypass scenarios() implementation in the parent class
-        return Model::scenarios();
-    }
-
     /**
      * Creates data provider instance with search query applied
      *

From 33fd86f030844b80c3bbe15fb7e1391fba9d943a Mon Sep 17 00:00:00 2001
From: githubjeka <et.coder@gmail.com>
Date: Wed, 24 Jun 2015 15:16:22 +0300
Subject: [PATCH 2/2] Added lostpussy.

---
 generators/crud/default/search.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/generators/crud/default/search.php b/generators/crud/default/search.php
index 43c62ccc8..dbc2697cd 100644
--- a/generators/crud/default/search.php
+++ b/generators/crud/default/search.php
@@ -35,9 +35,9 @@
 class <?= $searchModelClass ?> extends Model
 {
     <?php foreach ($searchAttributes as $attribute) : ?>/**
-    * @var <?= ($tableSchema !== false) ? $tableSchema->columns[$attribute]->phpType : 'mixed'?>
+     * @var <?= ($tableSchema !== false) ? $tableSchema->columns[$attribute]->phpType : 'mixed'?>
 
-    */
+     */
     public $<?= $attribute ?>;
     <?php endforeach ?>