From 1e098ebd4bd57300a44a601079dd8ca6dfac4c8c Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Wed, 2 Apr 2014 21:20:27 -0400
Subject: [PATCH] simplified search model [skip ci]

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

diff --git a/extensions/gii/generators/crud/default/search.php b/extensions/gii/generators/crud/default/search.php
index 2c5754f1d4..6c2e655d57 100644
--- a/extensions/gii/generators/crud/default/search.php
+++ b/extensions/gii/generators/crud/default/search.php
@@ -25,17 +25,15 @@ echo "<?php\n";
 namespace <?= StringHelper::dirname(ltrim($generator->searchModelClass, '\\')) ?>;
 
 use Yii;
-use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use <?= ltrim($generator->modelClass, '\\') . (isset($modelAlias) ? " as $modelAlias" : "") ?>;
 
 /**
  * <?= $searchModelClass ?> represents the model behind the search form about `<?= $generator->modelClass ?>`.
  */
-class <?= $searchModelClass ?> extends Model
-{
-    public $<?= implode(";\n    public $", $searchAttributes) ?>;
+class <?= $searchModelClass ?> extends <?= isset($modelAlias) ? $modelAlias : $modelClass ?>
 
+{
     public function rules()
     {
         return [
@@ -43,21 +41,10 @@ class <?= $searchModelClass ?> extends Model
         ];
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function attributeLabels()
-    {
-        return [
-<?php foreach ($labels as $name => $label): ?>
-            <?= "'$name' => " . $generator->generateString($label) . ",\n" ?>
-<?php endforeach; ?>
-        ];
-    }
-
     public function search($params)
     {
-        $query = <?= isset($modelAlias) ? $modelAlias : $modelClass ?>::find();
+        $query = $this->find();
+
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
         ]);