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

"Fixing path search for fixtures in the test suite"

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6039 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-11-22 01:55:50 +00:00
parent 306b577368
commit c83ae0e1a9
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/model/schema.php
View file

@ -167,6 +167,8 @@ class CakeSchema extends Object {
$db =& ConnectionManager::getDataSource($connection);
$prefix = null;
App::import('Model', 'AppModel');
$tables = array();
$currentTables = $db->sources();
if (isset($db->config['prefix'])) {

2
cake/tests/cases/libs/model/model2.test.php
View file

@ -517,7 +517,7 @@ class ModelTest extends CakeTestCase {
)
)
);
foreach ($samples as $i => $sample) {
if (isset($sample['model'])) {
$Model =& $sample['model'];

6
cake/tests/lib/cake_test_case.php
View file

@ -448,9 +448,9 @@ class CakeTestCase extends UnitTestCase {
if (strpos($fixture, 'core.') === 0) {
$fixture = substr($fixture, strlen('core.'));
$fixturePaths = array(
CAKE_CORE_INCLUDE_PATH . DS . 'cake' . DS . 'tests' . DS . 'fixtures'
);
foreach (Configure::corePaths('cake') as $key => $path) {
$fixturePaths[] = $path . DS . 'tests' . DS . 'fixtures';
}
} elseif (strpos($fixture, 'app.') === 0) {
$fixture = substr($fixture, strlen('app.'));
$fixturePaths = array(