mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 11:28:25 +00:00
cleaning up some ;;
This commit is contained in:
parent
9b4e08e93b
commit
58b5c0d77d
5 changed files with 7 additions and 7 deletions
|
@ -251,7 +251,7 @@ class I18n extends Object {
|
||||||
$this->__noLocale = true;
|
$this->__noLocale = true;
|
||||||
$core = true;
|
$core = true;
|
||||||
$merge = array();
|
$merge = array();
|
||||||
$searchPaths = App::path('locales');;
|
$searchPaths = App::path('locales');
|
||||||
$plugins = App::objects('plugin');
|
$plugins = App::objects('plugin');
|
||||||
|
|
||||||
if (!empty($plugins)) {
|
if (!empty($plugins)) {
|
||||||
|
|
|
@ -954,7 +954,7 @@ class DispatcherTest extends CakeTestCase {
|
||||||
$expectedWebroot = '/';
|
$expectedWebroot = '/';
|
||||||
$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
|
$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
|
||||||
|
|
||||||
$Dispatcher->base = false;;
|
$Dispatcher->base = false;
|
||||||
$_SERVER['DOCUMENT_ROOT'] = '/some/apps/where';
|
$_SERVER['DOCUMENT_ROOT'] = '/some/apps/where';
|
||||||
$_SERVER['SCRIPT_FILENAME'] = '/some/apps/where/app/webroot/index.php';
|
$_SERVER['SCRIPT_FILENAME'] = '/some/apps/where/app/webroot/index.php';
|
||||||
$_SERVER['PHP_SELF'] = '/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');
|
Configure::write('App.dir', 'auth');
|
||||||
|
|
||||||
$Dispatcher->base = false;;
|
$Dispatcher->base = false;
|
||||||
$_SERVER['DOCUMENT_ROOT'] = '/cake/repo/branches';
|
$_SERVER['DOCUMENT_ROOT'] = '/cake/repo/branches';
|
||||||
$_SERVER['SCRIPT_FILENAME'] = '/cake/repo/branches/demos/auth/webroot/index.php';
|
$_SERVER['SCRIPT_FILENAME'] = '/cake/repo/branches/demos/auth/webroot/index.php';
|
||||||
$_SERVER['PHP_SELF'] = '/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');
|
Configure::write('App.dir', 'code');
|
||||||
|
|
||||||
$Dispatcher->base = false;;
|
$Dispatcher->base = false;
|
||||||
$_SERVER['DOCUMENT_ROOT'] = '/Library/WebServer/Documents';
|
$_SERVER['DOCUMENT_ROOT'] = '/Library/WebServer/Documents';
|
||||||
$_SERVER['SCRIPT_FILENAME'] = '/Library/WebServer/Documents/clients/PewterReport/code/webroot/index.php';
|
$_SERVER['SCRIPT_FILENAME'] = '/Library/WebServer/Documents/clients/PewterReport/code/webroot/index.php';
|
||||||
$_SERVER['PHP_SELF'] = '/clients/PewterReport/code/webroot/index.php';
|
$_SERVER['PHP_SELF'] = '/clients/PewterReport/code/webroot/index.php';
|
||||||
|
|
|
@ -995,7 +995,7 @@ class ControllerTest extends CakeTestCase {
|
||||||
'home'
|
'home'
|
||||||
);
|
);
|
||||||
$result = $Controller->referer($referer, false);
|
$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);
|
$this->assertIdentical($result, $expected);
|
||||||
|
|
||||||
$_SERVER['HTTP_REFERER'] = '';
|
$_SERVER['HTTP_REFERER'] = '';
|
||||||
|
|
|
@ -39,7 +39,7 @@ class I18nTest extends CakeTestCase {
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
function setUp() {
|
function setUp() {
|
||||||
$this->_localePaths = App::path('locales');;
|
$this->_localePaths = App::path('locales');
|
||||||
App::build(array(
|
App::build(array(
|
||||||
'locales' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale')
|
'locales' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale')
|
||||||
));
|
));
|
||||||
|
|
|
@ -229,7 +229,7 @@ class CodeCoverageManager {
|
||||||
} else {
|
} else {
|
||||||
$class = 'ignored';
|
$class = 'ignored';
|
||||||
}
|
}
|
||||||
$report .= $manager->__paintCodeline($class, $num, $line);;
|
$report .= $manager->__paintCodeline($class, $num, $line);
|
||||||
}
|
}
|
||||||
return $manager->__paintHeader($lineCount, $coveredCount, $report);
|
return $manager->__paintHeader($lineCount, $coveredCount, $report);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue