Skip to content
This repository
Browse code

Fix failing tests caused by changes in App::objects()

  • Loading branch information...
commit cfe38985cfa2d2352fb86e649b7094fc0cd145bb 1 parent a7d08a6
Mark Story authored November 06, 2011
1  lib/Cake/Console/Command/CommandListShell.php
@@ -85,6 +85,7 @@ protected function _getShellList() {
85 85
 		$shellList = $this->_appendShells('CORE', $shells, $shellList);
86 86
 
87 87
 		$appShells = App::objects('Console/Command', null, false);
  88
+		$appShells = array_diff($appShells, $shells);
88 89
 		$shellList = $this->_appendShells('app', $appShells, $shellList);
89 90
 
90 91
 		$plugins = CakePlugin::loaded();
3  lib/Cake/Console/Command/Task/ExtractTask.php
@@ -353,6 +353,9 @@ protected function _extractValidationMessages() {
353 353
 		foreach ($models as $model) {
354 354
 			App::uses($model, $plugin . 'Model');
355 355
 			$reflection = new ReflectionClass($model);
  356
+			if (!$reflection->isSubClassOf('Model')) {
  357
+				continue;
  358
+			}
356 359
 			$properties = $reflection->getDefaultProperties();
357 360
 			$validate = $properties['validate'];
358 361
 			if (empty($validate)) {

0 notes on commit cfe3898

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