From 22a4a2f5de782c79eacba1feeed9048bd730e28c Mon Sep 17 00:00:00 2001 From: euromark Date: Tue, 23 Dec 2014 15:36:25 +0100 Subject: [PATCH 1/3] Correct argument. Should not have a default string. --- lib/Cake/TestSuite/ControllerTestCase.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Cake/TestSuite/ControllerTestCase.php b/lib/Cake/TestSuite/ControllerTestCase.php index e7577a6af..8ed11c7da 100644 --- a/lib/Cake/TestSuite/ControllerTestCase.php +++ b/lib/Cake/TestSuite/ControllerTestCase.php @@ -210,12 +210,12 @@ abstract class ControllerTestCase extends CakeTestCase { * - `result` Get the return value of the controller action. Useful * for testing requestAction methods. * - * @param string $url The url to test + * @param string $url The URL to test * @param array $options See options * @return mixed The specified return type. * @triggers ControllerTestCase $Dispatch, array('request' => $request) */ - protected function _testAction($url = '', $options = array()) { + protected function _testAction($url, $options = array()) { $this->vars = $this->result = $this->view = $this->contents = $this->headers = null; $options += array( From 5cf5fe53ee2592e9a082e16dcb562ff75b5e7cbe Mon Sep 17 00:00:00 2001 From: mark_story Date: Tue, 23 Dec 2014 11:18:32 -0500 Subject: [PATCH 2/3] Clarify question. Fixes #1870 --- lib/Cake/Console/Command/Task/ModelTask.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Cake/Console/Command/Task/ModelTask.php b/lib/Cake/Console/Command/Task/ModelTask.php index 3b6282739..89756170f 100644 --- a/lib/Cake/Console/Command/Task/ModelTask.php +++ b/lib/Cake/Console/Command/Task/ModelTask.php @@ -926,7 +926,7 @@ class ModelTask extends BakeTask { $tableIsGood = $this->in(__d('cake_console', 'Do you want to use this table?'), array('y', 'n'), 'y'); } if (strtolower($tableIsGood) === 'n') { - $useTable = $this->in(__d('cake_console', 'What is the name of the table?')); + $useTable = $this->in(__d('cake_console', 'What is the name of the table (without prefix)?')); } } return $useTable; From 667e2be2d27ad210769f919fefdb35e45ab354d5 Mon Sep 17 00:00:00 2001 From: mark_story Date: Tue, 23 Dec 2014 11:21:16 -0500 Subject: [PATCH 3/3] Update version number to 2.5.8 --- lib/Cake/VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Cake/VERSION.txt b/lib/Cake/VERSION.txt index 85172b1d3..82b63a71f 100644 --- a/lib/Cake/VERSION.txt +++ b/lib/Cake/VERSION.txt @@ -17,4 +17,4 @@ // @license http://www.opensource.org/licenses/mit-license.php MIT License // +--------------------------------------------------------------------------------------------+ // //////////////////////////////////////////////////////////////////////////////////////////////////// -2.5.7 +2.5.8