From 4c13a39f3e7f38128fc1b2b4aba1b6750e763e13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 8 Aug 2013 21:07:46 +0200
Subject: [PATCH] Removed else clauses after redirects and added return before
 redirect() and flash() calls

---
 app/Controller/PagesController.php            |  2 +-
 .../default/actions/controller_actions.ctp    | 22 +++++++++----------
 .../skel/Controller/PagesController.php       |  2 +-
 lib/Cake/Controller/Scaffold.php              |  5 ++---
 .../test_app/Controller/PagesController.php   |  2 +-
 .../Controller/TestsAppsController.php        |  2 +-
 6 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/app/Controller/PagesController.php b/app/Controller/PagesController.php
index fd2398a4d..dd723c539 100644
--- a/app/Controller/PagesController.php
+++ b/app/Controller/PagesController.php
@@ -56,7 +56,7 @@ class PagesController extends AppController {
 
 		$count = count($path);
 		if (!$count) {
-			$this->redirect('/');
+			return $this->redirect('/');
 		}
 		$page = $subpage = $title_for_layout = null;
 
diff --git a/lib/Cake/Console/Templates/default/actions/controller_actions.ctp b/lib/Cake/Console/Templates/default/actions/controller_actions.ctp
index e3df02186..ecc3363ad 100644
--- a/lib/Cake/Console/Templates/default/actions/controller_actions.ctp
+++ b/lib/Cake/Console/Templates/default/actions/controller_actions.ctp
@@ -58,13 +58,12 @@
 				$this->Session->setFlash(__('The <?php echo strtolower($singularHumanName); ?> has been saved'));
 				return $this->redirect(array('action' => 'index'));
 <?php else: ?>
-				$this->flash(__('<?php echo ucfirst(strtolower($currentModelName)); ?> saved.'), array('action' => 'index'));
-<?php endif; ?>
-			} else {
-<?php if ($wannaUseSession): ?>
-				$this->Session->setFlash(__('The <?php echo strtolower($singularHumanName); ?> could not be saved. Please, try again.'));
+				return $this->flash(__('<?php echo ucfirst(strtolower($currentModelName)); ?> saved.'), array('action' => 'index'));
 <?php endif; ?>
 			}
+<?php if ($wannaUseSession): ?>
+			$this->Session->setFlash(__('The <?php echo strtolower($singularHumanName); ?> could not be saved. Please, try again.'));
+<?php endif; ?>
 		}
 <?php
 	foreach (array('belongsTo', 'hasAndBelongsToMany') as $assoc):
@@ -101,13 +100,12 @@
 				$this->Session->setFlash(__('The <?php echo strtolower($singularHumanName); ?> has been saved'));
 				return $this->redirect(array('action' => 'index'));
 <?php else: ?>
-				$this->flash(__('The <?php echo strtolower($singularHumanName); ?> has been saved.'), array('action' => 'index'));
-<?php endif; ?>
-			} else {
-<?php if ($wannaUseSession): ?>
-				$this->Session->setFlash(__('The <?php echo strtolower($singularHumanName); ?> could not be saved. Please, try again.'));
+				return $this->flash(__('The <?php echo strtolower($singularHumanName); ?> has been saved.'), array('action' => 'index'));
 <?php endif; ?>
 			}
+<?php if ($wannaUseSession): ?>
+			$this->Session->setFlash(__('The <?php echo strtolower($singularHumanName); ?> could not be saved. Please, try again.'));
+<?php endif; ?>
 		} else {
 			$options = array('conditions' => array('<?php echo $currentModelName; ?>.' . $this-><?php echo $currentModelName; ?>->primaryKey => $id));
 			$this->request->data = $this-><?php echo $currentModelName; ?>->find('first', $options);
@@ -147,13 +145,13 @@
 			$this->Session->setFlash(__('<?php echo ucfirst(strtolower($singularHumanName)); ?> deleted'));
 			return $this->redirect(array('action' => 'index'));
 <?php else: ?>
-			$this->flash(__('<?php echo ucfirst(strtolower($singularHumanName)); ?> deleted'), array('action' => 'index'));
+			return $this->flash(__('<?php echo ucfirst(strtolower($singularHumanName)); ?> deleted'), array('action' => 'index'));
 <?php endif; ?>
 		}
 <?php if ($wannaUseSession): ?>
 		$this->Session->setFlash(__('<?php echo ucfirst(strtolower($singularHumanName)); ?> was not deleted'));
 <?php else: ?>
-		$this->flash(__('<?php echo ucfirst(strtolower($singularHumanName)); ?> was not deleted'), array('action' => 'index'));
+		return $this->flash(__('<?php echo ucfirst(strtolower($singularHumanName)); ?> was not deleted'), array('action' => 'index'));
 <?php endif; ?>
 		return $this->redirect(array('action' => 'index'));
 	}
diff --git a/lib/Cake/Console/Templates/skel/Controller/PagesController.php b/lib/Cake/Console/Templates/skel/Controller/PagesController.php
index 2b2903050..7b4e45a8f 100644
--- a/lib/Cake/Console/Templates/skel/Controller/PagesController.php
+++ b/lib/Cake/Console/Templates/skel/Controller/PagesController.php
@@ -57,7 +57,7 @@ class PagesController extends AppController {
 
 		$count = count($path);
 		if (!$count) {
-			$this->redirect('/');
+			return $this->redirect('/');
 		}
 		$page = $subpage = $title_for_layout = null;
 
diff --git a/lib/Cake/Controller/Scaffold.php b/lib/Cake/Controller/Scaffold.php
index c63ab7b32..af1f3c940 100644
--- a/lib/Cake/Controller/Scaffold.php
+++ b/lib/Cake/Controller/Scaffold.php
@@ -329,10 +329,9 @@ class Scaffold {
 	protected function _sendMessage($message) {
 		if ($this->_validSession) {
 			$this->controller->Session->setFlash($message);
-			$this->controller->redirect($this->redirect);
-		} else {
-			$this->controller->flash($message, $this->redirect);
+			return $this->controller->redirect($this->redirect);
 		}
+		$this->controller->flash($message, $this->redirect);
 	}
 
 /**
diff --git a/lib/Cake/Test/test_app/Controller/PagesController.php b/lib/Cake/Test/test_app/Controller/PagesController.php
index c1e60e3f1..98b2ed779 100644
--- a/lib/Cake/Test/test_app/Controller/PagesController.php
+++ b/lib/Cake/Test/test_app/Controller/PagesController.php
@@ -57,7 +57,7 @@ class PagesController extends AppController {
 
 		$count = count($path);
 		if (!$count) {
-			$this->redirect('/');
+			return $this->redirect('/');
 		}
 		$page = $subpage = $titleForLayout = null;
 
diff --git a/lib/Cake/Test/test_app/Controller/TestsAppsController.php b/lib/Cake/Test/test_app/Controller/TestsAppsController.php
index cc0028246..d75b8ed39 100644
--- a/lib/Cake/Test/test_app/Controller/TestsAppsController.php
+++ b/lib/Cake/Test/test_app/Controller/TestsAppsController.php
@@ -49,7 +49,7 @@ class TestsAppsController extends AppController {
 	}
 
 	public function redirect_to() {
-		$this->redirect('http://cakephp.org');
+		return $this->redirect('http://cakephp.org');
 	}
 
 }