From 5496ca234bf5537ecf44311bcd7c50502c1982e2 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Thu, 26 Jun 2014 14:02:20 +0200 Subject: dont strip the s from the resource --- lib/private/appframework/routing/routeconfig.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/private/appframework') diff --git a/lib/private/appframework/routing/routeconfig.php b/lib/private/appframework/routing/routeconfig.php index 91ea7778d08..634bc888bdb 100644 --- a/lib/private/appframework/routing/routeconfig.php +++ b/lib/private/appframework/routing/routeconfig.php @@ -88,7 +88,7 @@ class RouteConfig { ->method($verb) ->action($handler); - // optionally register requirements for route. This is used to + // optionally register requirements for route. This is used to // tell the route parser how url parameters should be matched if(array_key_exists('requirements', $simpleRoute)) { $router->requirements($simpleRoute['requirements']); @@ -174,7 +174,7 @@ class RouteConfig { * @return string */ private function buildResourceId($resource) { - return '{'.$this->underScoreToCamelCase(rtrim($resource, 's')).'Id}'; + return '{' . $this->underScoreToCamelCase($resource) . 'Id}'; } /** -- cgit v1.2.3 From 2662c4c61b5f8dcb274a1a205de1c2b0d8980b1c Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Thu, 26 Jun 2014 14:20:35 +0200 Subject: use id instead of resourceId --- lib/private/appframework/routing/routeconfig.php | 12 +----------- tests/lib/appframework/routing/RoutingTest.php | 4 ++-- 2 files changed, 3 insertions(+), 13 deletions(-) (limited to 'lib/private/appframework') diff --git a/lib/private/appframework/routing/routeconfig.php b/lib/private/appframework/routing/routeconfig.php index 634bc888bdb..5b4d411a355 100644 --- a/lib/private/appframework/routing/routeconfig.php +++ b/lib/private/appframework/routing/routeconfig.php @@ -122,14 +122,13 @@ class RouteConfig { foreach ($resources as $resource => $config) { // the url parameter used as id to the resource - $resourceId = $this->buildResourceId($resource); foreach($actions as $action) { $url = $config['url']; $method = $action['name']; $verb = isset($action['verb']) ? strtoupper($action['verb']) : 'GET'; $collectionAction = isset($action['on-collection']) ? $action['on-collection'] : false; if (!$collectionAction) { - $url = $url . '/' . $resourceId; + $url = $url . '/{id}'; } if (isset($action['url-postfix'])) { $url = $url . '/' . $action['url-postfix']; @@ -168,15 +167,6 @@ class RouteConfig { return $this->underScoreToCamelCase($action); } - /** - * Generates the id used in the url part o the route url - * @param string $resource - * @return string - */ - private function buildResourceId($resource) { - return '{' . $this->underScoreToCamelCase($resource) . 'Id}'; - } - /** * Underscored strings are converted to camel case strings * @param string $str diff --git a/tests/lib/appframework/routing/RoutingTest.php b/tests/lib/appframework/routing/RoutingTest.php index 89cc77d684a..7cd07db6ce1 100644 --- a/tests/lib/appframework/routing/RoutingTest.php +++ b/tests/lib/appframework/routing/RoutingTest.php @@ -78,14 +78,14 @@ class RoutingTest extends \PHPUnit_Framework_TestCase { $routes = array('resources' => array('account' => array('url' => '/accounts'))); - $this->assertResource($routes, 'account', '/accounts', 'AccountController', 'accountId'); + $this->assertResource($routes, 'account', '/accounts', 'AccountController', 'id'); } public function testResourceWithUnderScoreName() { $routes = array('resources' => array('admin_accounts' => array('url' => '/admin/accounts'))); - $this->assertResource($routes, 'admin_accounts', '/admin/accounts', 'AdminAccountsController', 'adminAccountsId'); + $this->assertResource($routes, 'admin_accounts', '/admin/accounts', 'AdminAccountsController', 'id'); } /** -- cgit v1.2.3