Skip to content
This repository
Browse code

Fix bad xml help generation.

Fixes #2619
  • Loading branch information...
commit 2a9a103d62d0a4ea8520882ba68ad01367ab99e3 1 parent 2840dc7
Mark Story authored February 26, 2012
4  lib/Cake/Console/Command/ConsoleShell.php
@@ -47,11 +47,11 @@ class ConsoleShell extends AppShell {
47 47
 	public $models = array();
48 48
 
49 49
 /**
50  
- * Override initialize of the Shell
  50
+ * Override startup of the Shell
51 51
  *
52 52
  * @return void
53 53
  */
54  
-	public function initialize() {
  54
+	public function startup() {
55 55
 		App::uses('Dispatcher', 'Routing');
56 56
 		$this->Dispatcher = new Dispatcher();
57 57
 		$this->models = App::objects('Model');
15  lib/Cake/Console/Command/SchemaShell.php
@@ -50,22 +50,15 @@ class SchemaShell extends AppShell {
50 50
 	protected $_dry = null;
51 51
 
52 52
 /**
53  
- * Override initialize
54  
- *
55  
- * @return string
56  
- */
57  
-	public function initialize() {
58  
-		$this->_welcome();
59  
-		$this->out('Cake Schema Shell');
60  
-		$this->hr();
61  
-	}
62  
-
63  
-/**
64 53
  * Override startup
65 54
  *
66 55
  * @return void
67 56
  */
68 57
 	public function startup() {
  58
+		$this->_welcome();
  59
+		$this->out('Cake Schema Shell');
  60
+		$this->hr();
  61
+	
69 62
 		$name = $path = $connection = $plugin = null;
70 63
 		if (!empty($this->params['name'])) {
71 64
 			$name = $this->params['name'];
2  lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
@@ -188,7 +188,7 @@ public function testViewWithPlugins() {
188 188
 		$this->Shell->args = array('TestPlugin.schema');
189 189
 		$this->Shell->startup();
190 190
 		$this->Shell->expects($this->exactly(2))->method('_stop');
191  
-		$this->Shell->expects($this->exactly(2))->method('out');
  191
+		$this->Shell->expects($this->atLeastOnce())->method('out');
192 192
 		$this->Shell->view();
193 193
 
194 194
 		$this->Shell->args = array();

0 notes on commit 2a9a103

Please sign in to comment.
Something went wrong with that request. Please try again.