Removing some of the hadrcoded calls to Inflector::underscore() used in

the Router.

src/Config/routes.php

@@ -46,9 +46,6 @@ use Cake\Utility\Inflector;
 $prefixes = Router::prefixes();
 $prefixPattern = implode('|', $prefixes);
 $plugins = Plugin::loaded();
-foreach ($plugins as $key => $value) {
-	$plugins[$key] = Inflector::underscore($value);
-}
 $pluginPattern = implode('|', $plugins);
 $indexParams = ['action' => 'index'];
 $pluginShortMatch = [

src/Routing/Router.php

@@ -446,12 +446,9 @@ class Router {
 		foreach ((array)$controller as $name) {
 			list($plugin, $name) = pluginSplit($name);
 			$urlName = Inflector::underscore($name);
-
-			if ($plugin) {
-				$plugin = Inflector::underscore($plugin);
-			}
-
+			$pluginUrl = $plugin ? Inflector::underscore($plugin) : null;
 			$prefix = $ext = null;
+
 			if (!empty($options['prefix'])) {
 				$prefix = $options['prefix'];
 			}
@@ -461,10 +458,10 @@ class Router {
 
 			foreach (static::$_resourceMap as $params) {
 				$id = $params['id'] ? ':id' : '';
-				$url = '/' . implode('/', array_filter(array($prefix, $plugin, $urlName, $id)));
+				$url = '/' . implode('/', array_filter(array($prefix, $pluginUrl, $urlName, $id)));
 				$params = array(
 					'plugin' => $plugin,
-					'controller' => $urlName,
+					'controller' => $name,
 					'action' => $params['action'],
 					'[method]' => $params['method'],
 					'_ext' => $ext

tests/TestCase/Routing/RouterTest.php

@@ -114,7 +114,7 @@ class RouterTest extends TestCase {
 		$expected = [
 			'pass' => [],
 			'plugin' => null,
-			'controller' => 'posts',
+			'controller' => 'Posts',
 			'action' => 'index',
 			'[method]' => 'GET',
 			'_ext' => null
@@ -127,7 +127,7 @@ class RouterTest extends TestCase {
 		$expected = [
 			'pass' => ['13'],
 			'plugin' => null,
-			'controller' => 'posts',
+			'controller' => 'Posts',
 			'action' => 'view',
 			'id' => '13',
 			'[method]' => 'GET',
@@ -140,7 +140,7 @@ class RouterTest extends TestCase {
 		$expected = [
 			'pass' => [],
 			'plugin' => null,
-			'controller' => 'posts',
+			'controller' => 'Posts',
 			'action' => 'add',
 			'[method]' => 'POST',
 			'_ext' => null
@@ -152,7 +152,7 @@ class RouterTest extends TestCase {
 		$expected = [
 			'pass' => ['13'],
 			'plugin' => null,
-			'controller' => 'posts',
+			'controller' => 'Posts',
 			'action' => 'edit',
 			'id' => '13',
 			'[method]' => 'PUT',
@@ -164,7 +164,7 @@ class RouterTest extends TestCase {
 		$expected = [
 			'pass' => ['475acc39-a328-44d3-95fb-015000000000'],
 			'plugin' => null,
-			'controller' => 'posts',
+			'controller' => 'Posts',
 			'action' => 'edit',
 			'id' => '475acc39-a328-44d3-95fb-015000000000',
 			'[method]' => 'PUT',
@@ -177,7 +177,7 @@ class RouterTest extends TestCase {
 		$expected = [
 			'pass' => ['13'],
 			'plugin' => null,
-			'controller' => 'posts',
+			'controller' => 'Posts',
 			'action' => 'delete',
 			'id' => '13',
 			'[method]' => 'DELETE',
@@ -198,7 +198,7 @@ class RouterTest extends TestCase {
 		$expected = [
 			'pass' => ['add'],
 			'plugin' => null,
-			'controller' => 'posts',
+			'controller' => 'Posts',
 			'action' => 'view',
 			'id' => 'add',
 			'[method]' => 'GET',
@@ -211,7 +211,7 @@ class RouterTest extends TestCase {
 		$expected = [
 			'pass' => ['name'],
 			'plugin' => null,
-			'controller' => 'posts',
+			'controller' => 'Posts',
 			'action' => 'edit',
 			'id' => 'name',
 			'[method]' => 'PUT',
@@ -233,8 +233,8 @@ class RouterTest extends TestCase {
 		$result = Router::parse('/test_plugin/test_plugin');
 		$expected = array(
 			'pass' => [],
-			'plugin' => 'test_plugin',
-			'controller' => 'test_plugin',
+			'plugin' => 'TestPlugin',
+			'controller' => 'TestPlugin',
 			'action' => 'index',
 			'[method]' => 'GET',
 			'_ext' => null
@@ -246,8 +246,8 @@ class RouterTest extends TestCase {
 		$result = Router::parse('/test_plugin/test_plugin/13');
 		$expected = array(
 			'pass' => array('13'),
-			'plugin' => 'test_plugin',
-			'controller' => 'test_plugin',
+			'plugin' => 'TestPlugin',
+			'controller' => 'TestPlugin',
 			'action' => 'view',
 			'id' => '13',
 			'[method]' => 'GET',
@@ -270,7 +270,7 @@ class RouterTest extends TestCase {
 
 		$expected = array(
 			'plugin' => null,
-			'controller' => 'posts',
+			'controller' => 'Posts',
 			'action' => 'index',
 			'pass' => [],
 			'prefix' => 'api',
@@ -294,7 +294,7 @@ class RouterTest extends TestCase {
 
 		$expected = array(
 			'plugin' => null,
-			'controller' => 'posts',
+			'controller' => 'Posts',
 			'action' => 'index',
 			'pass' => [],
 			'[method]' => 'GET',
@@ -361,8 +361,8 @@ class RouterTest extends TestCase {
 		$result = Router::parse('/api/test_plugin/test_plugin');
 		$expected = array(
 			'pass' => [],
-			'plugin' => 'test_plugin',
-			'controller' => 'test_plugin',
+			'plugin' => 'TestPlugin',
+			'controller' => 'TestPlugin',
 			'prefix' => 'api',
 			'action' => 'index',
 			'[method]' => 'GET',
@@ -378,7 +378,7 @@ class RouterTest extends TestCase {
 		$expected = array(
 			'pass' => [],
 			'plugin' => null,
-			'controller' => 'posts',
+			'controller' => 'Posts',
 			'action' => 'index',
 			'[method]' => 'GET',
 			'prefix' => 'api',
@@ -427,7 +427,7 @@ class RouterTest extends TestCase {
 		Router::mapResources('Posts');
 
 		$result = Router::url([
-			'controller' => 'posts',
+			'controller' => 'Posts',
 			'action' => 'index',
 			'[method]' => 'GET'
 		]);
@@ -435,7 +435,7 @@ class RouterTest extends TestCase {
 		$this->assertEquals($expected, $result);
 
 		$result = Router::url([
-			'controller' => 'posts',
+			'controller' => 'Posts',
 			'action' => 'view',
 			'[method]' => 'GET',
 			'id' => 10
@@ -443,19 +443,19 @@ class RouterTest extends TestCase {
 		$expected = '/posts/10';
 		$this->assertEquals($expected, $result);
 
-		$result = Router::url(['controller' => 'posts', 'action' => 'add', '[method]' => 'POST']);
+		$result = Router::url(['controller' => 'Posts', 'action' => 'add', '[method]' => 'POST']);
 		$expected = '/posts';
 		$this->assertEquals($expected, $result);
 
-		$result = Router::url(['controller' => 'posts', 'action' => 'edit', '[method]' => 'PUT', 'id' => 10]);
+		$result = Router::url(['controller' => 'Posts', 'action' => 'edit', '[method]' => 'PUT', 'id' => 10]);
 		$expected = '/posts/10';
 		$this->assertEquals($expected, $result);
 
-		$result = Router::url(['controller' => 'posts', 'action' => 'delete', '[method]' => 'DELETE', 'id' => 10]);
+		$result = Router::url(['controller' => 'Posts', 'action' => 'delete', '[method]' => 'DELETE', 'id' => 10]);
 		$expected = '/posts/10';
 		$this->assertEquals($expected, $result);
 
-		$result = Router::url(['controller' => 'posts', 'action' => 'edit', '[method]' => 'POST', 'id' => 10]);
+		$result = Router::url(['controller' => 'Posts', 'action' => 'edit', '[method]' => 'POST', 'id' => 10]);
 		$expected = '/posts/10';
 		$this->assertEquals($expected, $result);
 	}