adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-04-23 17:33:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing failing test.

Browse source
This commit is contained in:
mark_story 2010-07-10 11:32:12 -04:00
parent f202f89974
commit d28f7f4144
2 changed files with 1 additions and 2 deletions
cake
libs
configure.php
tests/cases/libs
configure.test.php

2
cake/libs/configure.php
View file

@ -615,7 +615,7 @@ class App {
$merge = array_merge($merge, (array)$core[$type]); $merge = array_merge($merge, (array)$core[$type]);
} }
if (empty($_this->{$type}) || empty($paths)) { if (empty(self::${$type}) || empty($paths)) {
self::${$type} = $default; self::${$type} = $default;
} }

1
cake/tests/cases/libs/configure.test.php
View file

@ -638,7 +638,6 @@ class AppImportTest extends CakeTestCase {
$file = App::import('File', 'NoFile', false, array(), TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'cake' . DS . 'config.php'); $file = App::import('File', 'NoFile', false, array(), TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'cake' . DS . 'config.php');
$this->assertFalse($file); $this->assertFalse($file);
} }
// import($type = null, $name = null, $parent = true, $file = null, $search = array(), $return = false) {
/** /**
* testFileLoadingWithArray method * testFileLoadingWithArray method