diff --git a/src/Routing/Route/DashedRoute.php b/src/Routing/Route/DashedRoute.php index 275c542032c..d9a6bcd2e80 100644 --- a/src/Routing/Route/DashedRoute.php +++ b/src/Routing/Route/DashedRoute.php @@ -65,11 +65,7 @@ public function parse($url) return false; } if (!empty($params['controller'])) { - $params['controller'] = Inflector::camelize(str_replace( - '-', - '_', - $params['controller'] - )); + $params['controller'] = Inflector::camelize($params['controller'], '-'); } if (!empty($params['plugin'])) { $params['plugin'] = $this->_camelizePlugin($params['plugin']); diff --git a/src/Utility/Inflector.php b/src/Utility/Inflector.php index fbd31ebdddd..84a3a9da817 100644 --- a/src/Utility/Inflector.php +++ b/src/Utility/Inflector.php @@ -720,7 +720,7 @@ public static function variable($string) if ($result === false) { $camelized = static::camelize(static::underscore($string)); $replace = strtolower(substr($camelized, 0, 1)); - $result = preg_replace('/\\w/', $replace, $camelized, 1); + $result = $replace . substr($camelized, 1); static::_cache(__FUNCTION__, $string, $result); }