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

Merge branch '2.0' into 2.1

Browse source
This commit is contained in:
mark_story 2011-11-06 11:39:01 -05:00
commit a2b6f18000
4 changed files with 12 additions and 3 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);
$appShells = App::objects('Console/Command', null, false);
$appShells = array_diff($appShells, $shells);
$shellList = $this->_appendShells('app', $appShells, $shellList);
$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) {
App::uses($model, $plugin . 'Model');
$reflection = new ReflectionClass($model);
if (!$reflection->isSubClassOf('Model')) {
continue;
}
$properties = $reflection->getDefaultProperties();
$validate = $properties['validate'];
if (empty($validate)) {

3
lib/Cake/Core/App.php
View file

@ -447,9 +447,6 @@ class App {
if (empty($path)) {
$path = self::path($type, $plugin);
if (empty($plugin)) {
$path = array_merge($path, App::core($type));
}
}
foreach ((array)$path as $dir) {

8
lib/Cake/Test/Case/Core/AppTest.php
View file

@ -303,6 +303,14 @@ class AppTest extends CakeTestCase {
$this->assertTrue(in_array('Dispatcher', $result));
$this->assertTrue(in_array('Router', $result));
App::build(array(
'Model/Behavior' => App::core('Model/Behavior'),
'Controller' => App::core('Controller'),
'Controller/Component' => App::core('Controller/Component'),
'View' => App::core('View'),
'Model' => App::core('Model'),
'View/Helper' => App::core('View/Helper'),
), App::RESET);
$result = App::objects('behavior', null, false);
$this->assertTrue(in_array('TreeBehavior', $result));
$result = App::objects('Model/Behavior', null, false);