adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-05 11:02:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.6

Browse source 
Conflicts:
	lib/Cake/VERSION.txt
This commit is contained in:
mark_story 2014-12-17 21:38:32 -05:00
commit 4d6611b328
36 changed files with 260 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/Routing/Route/CakeRoute.php
View file

@ -448,8 +448,7 @@ class CakeRoute {
}
// pull out named params if named params are greedy or a rule exists.
if (
($greedyNamed || isset($allowedNamedParams[$key])) &&
if (($greedyNamed || isset($allowedNamedParams[$key])) &&
($value !== false && $value !== null) &&
(!in_array($key, $prefixes))
) {

3
lib/Cake/Routing/Router.php
View file

@ -227,8 +227,7 @@ class Router {
* @throws RouterException
*/
protected static function _validateRouteClass($routeClass) {
if (
$routeClass !== 'CakeRoute' &&
if ($routeClass !== 'CakeRoute' &&
(!class_exists($routeClass) || !is_subclass_of($routeClass, 'CakeRoute'))
) {
throw new RouterException(__d('cake_dev', 'Route class not found, or route class is not a subclass of CakeRoute'));