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

Merge branch '1.3-configure' into 1.3

Browse source
This commit is contained in:
gwoo 2009-06-30 20:04:25 -07:00
commit 8f801a975d
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/i18n.php
View file

@ -251,7 +251,7 @@ class I18n extends Object {
$this->__noLocale = true;
$core = true;
$merge = array();
$searchPaths = App::path('locales');;
$searchPaths = App::path('locales');
$plugins = App::objects('plugin');
if (!empty($plugins)) {

6
cake/tests/cases/dispatcher.test.php
View file

@ -954,7 +954,7 @@ class DispatcherTest extends CakeTestCase {
$expectedWebroot = '/';
$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
$Dispatcher->base = false;;
$Dispatcher->base = false;
$_SERVER['DOCUMENT_ROOT'] = '/some/apps/where';
$_SERVER['SCRIPT_FILENAME'] = '/some/apps/where/app/webroot/index.php';
$_SERVER['PHP_SELF'] = '/some/apps/where/app/webroot/index.php';
@ -967,7 +967,7 @@ class DispatcherTest extends CakeTestCase {
Configure::write('App.dir', 'auth');
$Dispatcher->base = false;;
$Dispatcher->base = false;
$_SERVER['DOCUMENT_ROOT'] = '/cake/repo/branches';
$_SERVER['SCRIPT_FILENAME'] = '/cake/repo/branches/demos/auth/webroot/index.php';
$_SERVER['PHP_SELF'] = '/demos/auth/webroot/index.php';
@ -980,7 +980,7 @@ class DispatcherTest extends CakeTestCase {
Configure::write('App.dir', 'code');
$Dispatcher->base = false;;
$Dispatcher->base = false;
$_SERVER['DOCUMENT_ROOT'] = '/Library/WebServer/Documents';
$_SERVER['SCRIPT_FILENAME'] = '/Library/WebServer/Documents/clients/PewterReport/code/webroot/index.php';
$_SERVER['PHP_SELF'] = '/clients/PewterReport/code/webroot/index.php';

2
cake/tests/cases/libs/controller/controller.test.php
View file

@ -995,7 +995,7 @@ class ControllerTest extends CakeTestCase {
'home'
);
$result = $Controller->referer($referer, false);
$expected = 'http://' . env('HTTP_HOST') . '/pages/display/home';;
$expected = 'http://' . env('HTTP_HOST') . '/pages/display/home';
$this->assertIdentical($result, $expected);
$_SERVER['HTTP_REFERER'] = '';

2
cake/tests/cases/libs/i18n.test.php
View file

@ -39,7 +39,7 @@ class I18nTest extends CakeTestCase {
* @return void
*/
function setUp() {
$this->_localePaths = App::path('locales');;
$this->_localePaths = App::path('locales');
App::build(array(
'locales' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale')
));

2
cake/tests/lib/code_coverage_manager.php
View file

@ -229,7 +229,7 @@ class CodeCoverageManager {
} else {
$class = 'ignored';
}
$report .= $manager->__paintCodeline($class, $num, $line);;
$report .= $manager->__paintCodeline($class, $num, $line);
}
return $manager->__paintHeader($lineCount, $coveredCount, $report);
}