Take care of properly inflecting plugin name in route classes itself.

Refs #8085 #8091
cakephp · Jan 24, 2016 · 351faea · 351faea
1 parent 72db96b
commit 351faea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/Routing/Filter/ControllerFactoryFilter.php b/src/Routing/Filter/ControllerFactoryFilter.php
@@ -68,11 +68,7 @@ protected function _getController($request, $response)
             $controller = $request->params['controller'];
         }
         if (!empty($request->params['prefix'])) {
-            $prefixes = array_map(
-                'Cake\Utility\Inflector::camelize',
-                explode('/', $request->params['prefix'])
-            );
-            $namespace .= '/' . implode('/', $prefixes);
+            $namespace .= '/' . $request->params['prefix'];
         }
         if (strpos($controller, '\\') !== false || strpos($controller, '.') !== false) {
             return false;

diff --git a/src/Routing/Route/InflectedRoute.php b/src/Routing/Route/InflectedRoute.php
@@ -50,7 +50,12 @@ public function parse($url)
             $params['controller'] = Inflector::camelize($params['controller']);
         }
         if (!empty($params['plugin'])) {
-            $params['plugin'] = Inflector::camelize($params['plugin']);
+            if (strpos($params['plugin'], '/') === false) {
+                $params['plugin'] = Inflector::camelize($params['plugin']);
+            } else {
+                list($vendor, $plugin) = explode('/', $params['plugin'], 2);
+                $params['plugin'] = Inflector::camelize($vendor) . '/' . Inflector::camelize($plugin);
+            }
         }
         return $params;
     }