Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit cfe38985cfa2d2352fb86e649b7094fc0cd145bb 1 parent a7d08a6
@markstory markstory authored
View
1  lib/Cake/Console/Command/CommandListShell.php
@@ -85,6 +85,7 @@ protected function _getShellList() {
$shellList = $this->_appendShells('CORE', $shells, $shellList);
$appShells = App::objects('Console/Command', null, false);
+ $appShells = array_diff($appShells, $shells);
$shellList = $this->_appendShells('app', $appShells, $shellList);
$plugins = CakePlugin::loaded();
View
3  lib/Cake/Console/Command/Task/ExtractTask.php
@@ -353,6 +353,9 @@ protected function _extractValidationMessages() {
foreach ($models as $model) {
App::uses($model, $plugin . 'Model');
$reflection = new ReflectionClass($model);
+ if (!$reflection->isSubClassOf('Model')) {
+ continue;
+ }
$properties = $reflection->getDefaultProperties();
$validate = $properties['validate'];
if (empty($validate)) {

0 comments on commit cfe3898

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