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 more strict warnings.

Browse source
This commit is contained in:
mark_story 2010-12-12 21:02:42 -05:00
parent f84871ae47
commit 0ac8d04241
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cake/libs/dispatcher.php
View file

@ -315,7 +315,8 @@ class Dispatcher {
$this->_stop();
}
$controller = null;
$ext = array_pop(explode('.', $url));
$pathSegments = explode('.', $url);
$ext = array_pop($pathSegments);
$parts = explode('/', $url);
$assetFile = null;

2
cake/libs/file.php
View file

@ -212,7 +212,7 @@ class File {
* @param string $data Data to prepare for writing.
* @return string The with converted line endings.
*/
public function prepare($data, $forceWindows = false) {
public static function prepare($data, $forceWindows = false) {
$lineBreak = "\n";
if (DIRECTORY_SEPARATOR == '\\' || $forceWindows === true) {
$lineBreak = "\r\n";

9
cake/tests/cases/libs/dispatcher.test.php
View file

@ -49,12 +49,11 @@ class TestDispatcher extends Dispatcher {
* invoke method
*
* @param mixed $controller
* @param mixed $params
* @param mixed $missingAction
* @param mixed $request
* @return void
*/
protected function _invoke(&$controller, $params) {
if ($result = parent::_invoke($controller, $params)) {
protected function _invoke(Controller $controller, CakeRequest $request) {
if ($result = parent::_invoke($controller, $request)) {
if ($result[0] === 'missingAction') {
return $result;
}
@ -192,7 +191,7 @@ class SomePagesController extends AppController {
*
* @return void
*/
public function redirect() {
public function redirect($url, $status = null, $exit = true) {
echo 'this should not be accessible';
}
}

4
cake/tests/cases/libs/folder.test.php
View file

@ -195,8 +195,8 @@ class FolderTest extends CakeTestCase {
$this->assertFalse($result);
$expected = $new . ' is a file';
$result = array_pop($Folder->errors());
$this->assertEqual($result, $expected);
$result = $Folder->errors();
$this->assertEqual($result[0], $expected);
$new = TMP . 'test_folder_new';
$result = $Folder->create($new);

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

@ -2273,7 +2273,7 @@ class RouterTest extends CakeTestCase {
* @return void
*/
function testPatternOnAction() {
$route =& new CakeRoute(
$route = new CakeRoute(
'/blog/:action/*',
array('controller' => 'blog_posts'),
array('action' => 'other|actions')