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

Fixes failing tests

Browse source
This commit is contained in:
Joe 2018-09-03 00:45:34 -04:00
parent 013ecc3f9f
commit 34bfeba15d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Network/CakeRequest.php
View file

@ -303,7 +303,7 @@ class CakeRequest implements ArrayAccess {
return $this->base = $base; return $this->base = $base;
} }
if (!$baseUrl) { if (empty($baseUrl)) {
$base = dirname(env('PHP_SELF')); $base = dirname(env('PHP_SELF'));
// Clean up additional / which cause following code to fail.. // Clean up additional / which cause following code to fail..
$base = preg_replace('#/+#', '/', $base); $base = preg_replace('#/+#', '/', $base);

2
lib/Cake/Utility/ObjectCollection.php
View file

@ -126,7 +126,7 @@ abstract class ObjectCollection {
} }
$result = null; $result = null;
foreach ($list as $name) { foreach ($list as $name) {
$result = call_user_func_array(array($this->_loaded[$name], $callback), compact('subject') + $params); $result = call_user_func_array(array($this->_loaded[$name], $callback), array_filter(compact('subject')) + $params);
if ($options['collectReturn'] === true) { if ($options['collectReturn'] === true) {
$collected[] = $result; $collected[] = $result;
} }