Skip to content
Permalink
Browse files

Fixing more strict warnings.

  • Loading branch information...
markstory committed Dec 13, 2010
1 parent f84871a commit 0ac8d042417899c51316ec499c70b9c74bb4eb5b
@@ -315,7 +315,8 @@ public function asset($url) {
$this->_stop();
}
$controller = null;
$ext = array_pop(explode('.', $url));
$pathSegments = explode('.', $url);
$ext = array_pop($pathSegments);
$parts = explode('/', $url);
$assetFile = null;
@@ -212,7 +212,7 @@ public function offset($offset = false, $seek = SEEK_SET) {
* @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";
@@ -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 @@ protected function _protected() {
*
* @return void
*/
public function redirect() {
public function redirect($url, $status = null, $exit = true) {
echo 'this should not be accessible';
}
}
@@ -195,8 +195,8 @@ function testOperations() {
$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);
@@ -2273,7 +2273,7 @@ public function testUrlProtocol() {
* @return void
*/
function testPatternOnAction() {
$route =& new CakeRoute(
$route = new CakeRoute(
'/blog/:action/*',
array('controller' => 'blog_posts'),
array('action' => 'other|actions')

0 comments on commit 0ac8d04

Please sign in to comment.
You can’t perform that action at this time.