adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
mark_story 2011-11-06 09:59:33 -05:00
parent a7d08a6b39
commit cfe38985cf
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/Cake/Console/Command/CommandListShell.php
View file

@ -85,6 +85,7 @@ class CommandListShell extends Shell {
$shellList = $this->_appendShells('CORE', $shells, $shellList); $shellList = $this->_appendShells('CORE', $shells, $shellList);
$appShells = App::objects('Console/Command', null, false); $appShells = App::objects('Console/Command', null, false);
$appShells = array_diff($appShells, $shells);
$shellList = $this->_appendShells('app', $appShells, $shellList); $shellList = $this->_appendShells('app', $appShells, $shellList);
$plugins = CakePlugin::loaded(); $plugins = CakePlugin::loaded();

3
lib/Cake/Console/Command/Task/ExtractTask.php
View file

@ -353,6 +353,9 @@ class ExtractTask extends Shell {
foreach ($models as $model) { foreach ($models as $model) {
App::uses($model, $plugin . 'Model'); App::uses($model, $plugin . 'Model');
$reflection = new ReflectionClass($model); $reflection = new ReflectionClass($model);
if (!$reflection->isSubClassOf('Model')) {
continue;
}
$properties = $reflection->getDefaultProperties(); $properties = $reflection->getDefaultProperties();
$validate = $properties['validate']; $validate = $properties['validate'];
if (empty($validate)) { if (empty($validate)) {