Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix bad xml help generation.

Fixes #2619
  • Loading branch information...
commit 2a9a103d62d0a4ea8520882ba68ad01367ab99e3 1 parent 2840dc7
Mark Story markstory authored
4 lib/Cake/Console/Command/ConsoleShell.php
View
@@ -47,11 +47,11 @@ class ConsoleShell extends AppShell {
public $models = array();
/**
- * Override initialize of the Shell
+ * Override startup of the Shell
*
* @return void
*/
- public function initialize() {
+ public function startup() {
App::uses('Dispatcher', 'Routing');
$this->Dispatcher = new Dispatcher();
$this->models = App::objects('Model');
15 lib/Cake/Console/Command/SchemaShell.php
View
@@ -50,22 +50,15 @@ class SchemaShell extends AppShell {
protected $_dry = null;
/**
- * Override initialize
- *
- * @return string
- */
- public function initialize() {
- $this->_welcome();
- $this->out('Cake Schema Shell');
- $this->hr();
- }
-
-/**
* Override startup
*
* @return void
*/
public function startup() {
+ $this->_welcome();
+ $this->out('Cake Schema Shell');
+ $this->hr();
+
$name = $path = $connection = $plugin = null;
if (!empty($this->params['name'])) {
$name = $this->params['name'];
2  lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
View
@@ -188,7 +188,7 @@ public function testViewWithPlugins() {
$this->Shell->args = array('TestPlugin.schema');
$this->Shell->startup();
$this->Shell->expects($this->exactly(2))->method('_stop');
- $this->Shell->expects($this->exactly(2))->method('out');
+ $this->Shell->expects($this->atLeastOnce())->method('out');
$this->Shell->view();
$this->Shell->args = array();
Please sign in to comment.
Something went wrong with that request. Please try again.