Bladeren bron

Merge pull request #12 from maximal/patch-1

Remove redundant `else`s
Carsten Brandt 10 jaren geleden
bovenliggende
commit
038192fe50
3 gewijzigde bestanden met toevoegingen van 8 en 12 verwijderingen
  1. 6 8
      controllers/SiteController.php
  2. 1 2
      models/ContactForm.php
  3. 1 2
      models/LoginForm.php

+ 6 - 8
controllers/SiteController.php

@@ -61,11 +61,10 @@ class SiteController extends Controller
         $model = new LoginForm();
         if ($model->load(Yii::$app->request->post()) && $model->login()) {
             return $this->goBack();
-        } else {
-            return $this->render('login', [
-                'model' => $model,
-            ]);
         }
+        return $this->render('login', [
+            'model' => $model,
+        ]);
     }
 
     public function actionLogout()
@@ -82,11 +81,10 @@ class SiteController extends Controller
             Yii::$app->session->setFlash('contactFormSubmitted');
 
             return $this->refresh();
-        } else {
-            return $this->render('contact', [
-                'model' => $model,
-            ]);
         }
+        return $this->render('contact', [
+            'model' => $model,
+        ]);
     }
 
     public function actionAbout()

+ 1 - 2
models/ContactForm.php

@@ -57,8 +57,7 @@ class ContactForm extends Model
                 ->send();
 
             return true;
-        } else {
-            return false;
         }
+        return false;
     }
 }

+ 1 - 2
models/LoginForm.php

@@ -58,9 +58,8 @@ class LoginForm extends Model
     {
         if ($this->validate()) {
             return Yii::$app->user->login($this->getUser(), $this->rememberMe ? 3600*24*30 : 0);
-        } else {
-            return false;
         }
+        return false;
     }
 
     /**