Update view generators/crud/default/controller

src/generators/crud/default/controller.php

@@ -1,63 +1,73 @@
 <?php
 /**
  * This is the template for generating a CRUD controller class file.
+ *
+ * @var \yii\web\View $this
+ * @var \yii\gii\generators\crud\Generator $generator
  */
 
 use yii\db\ActiveRecordInterface;
 use yii\helpers\StringHelper;
 
-
 /** @var yii\web\View $this */
 /** @var yii\gii\generators\crud\Generator $generator */
-
 $controllerClass = StringHelper::basename($generator->controllerClass);
 $modelClass = StringHelper::basename($generator->modelClass);
-$searchModelClass = StringHelper::basename($generator->searchModelClass);
-if ($modelClass === $searchModelClass) {
-    $searchModelAlias = $searchModelClass . 'Search';
+if ($generator->searchModelClass !== '') {
+    $searchModelClass = StringHelper::basename($generator->searchModelClass);
+    if ($modelClass === $searchModelClass) {
+        $searchModelAlias = $searchModelClass . 'Search';
+    }
 }
 
-/* @var $class ActiveRecordInterface */
-$class = $generator->modelClass;
+/** @var $class ActiveRecordInterface */
+$class = ltrim($generator->modelClass, '\\');
 $pks = $class::primaryKey();
 $urlParams = $generator->generateUrlParams();
 $actionParams = $generator->generateActionParams();
 $actionParamComments = $generator->generateActionParamComments();
+$isPhp7 = PHP_MAJOR_VERSION === 7;
 
 echo "<?php\n";
 ?>
 
 namespace <?= StringHelper::dirname(ltrim($generator->controllerClass, '\\')) ?>;
 
-use <?= ltrim($generator->modelClass, '\\') ?>;
+use <?= $class ?>;
 <?php if (!empty($generator->searchModelClass)): ?>
-use <?= ltrim($generator->searchModelClass, '\\') . (isset($searchModelAlias) ? " as $searchModelAlias" : "") ?>;
+use <?= ltrim($generator->searchModelClass, '\\') . (isset($searchModelAlias) ? " as $searchModelAlias" : '') ?>;
 <?php else: ?>
 use yii\data\ActiveDataProvider;
 <?php endif; ?>
 use <?= ltrim($generator->baseControllerClass, '\\') ?>;
+use yii\web\Response;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
+use Yii;
 
 /**
- * <?= $controllerClass ?> implements the CRUD actions for <?= $modelClass ?> model.
+ * <?= $controllerClass ?> implements the CRUD actions for `<?= $modelClass ?>` model.
  */
 class <?= $controllerClass ?> extends <?= StringHelper::basename($generator->baseControllerClass) . "\n" ?>
 {
     /**
      * @inheritDoc
      */
-    public function behaviors()
+    public function behaviors()<?= ($isPhp7 ? ': array' : '') . "\n" ?>
     {
         return array_merge(
             parent::behaviors(),
             [
-                'verbs' => [
-                    'class' => VerbFilter::className(),
+                'verbFilter' => [
+                    'class' => VerbFilter::class<?= $isPhp7 ? '' : 'Name()' ?>,
                     'actions' => [
+                        'index' => ['GET'],
+                        'view' => ['GET'],
+                        'create' => ['GET', 'POST'],
+                        'update' => ['GET', 'POST'],
                         'delete' => ['POST'],
-                    ],
-                ],
+                    ]
+                ]
             ]
         );
     }
@@ -67,36 +77,40 @@ public function behaviors()
      *
      * @return string
      */
-    public function actionIndex()
+    public function actionIndex()<?= ($isPhp7 ? ': string' : '') . "\n" ?>
     {
 <?php if (!empty($generator->searchModelClass)): ?>
         $searchModel = new <?= isset($searchModelAlias) ? $searchModelAlias : $searchModelClass ?>();
         $dataProvider = $searchModel->search($this->request->queryParams);
 
-        return $this->render('index', [
-            'searchModel' => $searchModel,
-            'dataProvider' => $dataProvider,
-        ]);
+        return $this->render(
+            'index',
+            [
+                'searchModel' => $searchModel,
+                'dataProvider' => $dataProvider,
+            ]
+        );
 <?php else: ?>
-        $dataProvider = new ActiveDataProvider([
-            'query' => <?= $modelClass ?>::find(),
-            /*
-            'pagination' => [
-                'pageSize' => 50
-            ],
-            'sort' => [
-                'defaultOrder' => [
+        $dataProvider = Yii::createObject(
+            ActiveDataProvider::class<?= $isPhp7 ? '' : 'Name()' ?>,
+            [
+                'query' => <?= $modelClass ?>::find(),
+                /*
+                'pagination' => [
+                    'pageSize' => 50
+                ],
+                'sort' => [
+                    'defaultOrder' => [
 <?php foreach ($pks as $pk): ?>
-                    <?= "'$pk' => SORT_DESC,\n" ?>
+                        <?= "'$pk' => SORT_DESC,\n" ?>
 <?php endforeach; ?>
+                    ]
                 ]
-            ],
-            */
-        ]);
+                */
+            ]
+        );
 
-        return $this->render('index', [
-            'dataProvider' => $dataProvider,
-        ]);
+        return $this->render('index', ['dataProvider' => $dataProvider]);
 <?php endif; ?>
     }
 
@@ -106,16 +120,15 @@ public function actionIndex()
      * @return string
      * @throws NotFoundHttpException if the model cannot be found
      */
-    public function actionView(<?= $actionParams ?>)
+    public function actionView(<?= $actionParams ?>)<?= ($isPhp7 ? ': string' : '') . "\n" ?>
     {
-        return $this->render('view', [
-            'model' => $this->findModel(<?= $actionParams ?>),
-        ]);
+        return $this->render('view', ['model' => $this->findModel(<?= $actionParams ?>)]);
     }
 
     /**
      * Creates a new <?= $modelClass ?> model.
      * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return Response|string
      * @return string|\yii\web\Response
      */
     public function actionCreate()
@@ -130,15 +143,14 @@ public function actionCreate()
             $model->loadDefaultValues();
         }
 
-        return $this->render('create', [
-            'model' => $model,
-        ]);
+        return $this->render('create', ['model' => $model]);
     }
 
     /**
      * Updates an existing <?= $modelClass ?> model.
      * If update is successful, the browser will be redirected to the 'view' page.
      * <?= implode("\n     * ", $actionParamComments) . "\n" ?>
+     * @return Response|string
      * @return string|\yii\web\Response
      * @throws NotFoundHttpException if the model cannot be found
      */
@@ -150,19 +162,18 @@ public function actionUpdate(<?= $actionParams ?>)
             return $this->redirect(['view', <?= $urlParams ?>]);
         }
 
-        return $this->render('update', [
-            'model' => $model,
-        ]);
+        return $this->render('update', ['model' => $model]);
     }
 
     /**
      * Deletes an existing <?= $modelClass ?> model.
      * If deletion is successful, the browser will be redirected to the 'index' page.
      * <?= implode("\n     * ", $actionParamComments) . "\n" ?>
+     * @return Response
      * @return \yii\web\Response
      * @throws NotFoundHttpException if the model cannot be found
      */
-    public function actionDelete(<?= $actionParams ?>)
+    public function actionDelete(<?= $actionParams ?>)<?= ($isPhp7 ? ': Response' : '') . "\n" ?>
     {
         $this->findModel(<?= $actionParams ?>)->delete();
 
@@ -176,7 +187,7 @@ public function actionDelete(<?= $actionParams ?>)
      * @return <?= $modelClass ?> the loaded model
      * @throws NotFoundHttpException if the model cannot be found
      */
-    protected function findModel(<?= $actionParams ?>)
+    protected function findModel(<?= $actionParams ?>)<?= ($isPhp7 ? ': ' . $modelClass : '') . "\n" ?>
     {
 <?php
 $condition = [];
@@ -185,10 +196,11 @@ protected function findModel(<?= $actionParams ?>)
 }
 $condition = '[' . implode(', ', $condition) . ']';
 ?>
-        if (($model = <?= $modelClass ?>::findOne(<?= $condition ?>)) !== null) {
-            return $model;
+        $model = <?= $modelClass ?>::findOne(<?= $condition ?>);
+        if ($model === null) {
+            throw new NotFoundHttpException(<?= $generator->generateString('The requested page does not exist.') ?>);
         }
 
-        throw new NotFoundHttpException(<?= $generator->generateString('The requested page does not exist.') ?>);
+        return $model;
     }
 }