From e91f04b52603194dbc90dbbaee730e171bee1449 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 7 Dec 2016 12:14:40 -0600 Subject: [PATCH] rename methods --- src/Illuminate/Routing/ResourceRegistrar.php | 30 ++++++++------------ src/Illuminate/Routing/Router.php | 10 +++---- tests/Routing/RoutingRouteTest.php | 2 +- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/Illuminate/Routing/ResourceRegistrar.php b/src/Illuminate/Routing/ResourceRegistrar.php index e9cbfd24bb4f..d1829dc517d0 100644 --- a/src/Illuminate/Routing/ResourceRegistrar.php +++ b/src/Illuminate/Routing/ResourceRegistrar.php @@ -42,11 +42,11 @@ class ResourceRegistrar protected static $singularParameters = true; /** - * Uri translations. + * The verbs used in the resource URIs. * * @var array */ - protected static $uriTranslations = [ + protected static $verbs = [ 'create' => 'create', 'edit' => 'edit', ]; @@ -300,7 +300,7 @@ protected function addResourceIndex($name, $base, $controller, $options) */ protected function addResourceCreate($name, $base, $controller, $options) { - $uri = $this->getResourceUri($name).'/'.static::$uriTranslations['create']; + $uri = $this->getResourceUri($name).'/'.static::$verbs['create']; $action = $this->getResourceAction($name, $controller, 'create', $options); @@ -354,7 +354,7 @@ protected function addResourceShow($name, $base, $controller, $options) */ protected function addResourceEdit($name, $base, $controller, $options) { - $uri = $this->getResourceUri($name).'/{'.$base.'}/'.static::$uriTranslations['edit']; + $uri = $this->getResourceUri($name).'/{'.$base.'}/'.static::$verbs['edit']; $action = $this->getResourceAction($name, $controller, 'edit', $options); @@ -430,23 +430,17 @@ public static function setParameters(array $parameters = []) } /** - * Get the uri translations. + * Get or set the action verbs used in the resource URIs. * + * @param array $verbs * @return array */ - public static function getUriTranslations() + public static function verbs(array $verbs = []) { - return static::$uriTranslations; - } - - /** - * Set the uri translations. - * - * @param array $translations - * @return void - */ - public static function setUriTranslations(array $translations = []) - { - static::$uriTranslations = array_merge(static::$uriTranslations, $translations); + if (empty($verbs)) { + return static::$verbs; + } else { + static::$verbs = array_merge(static::$verbs, $verbs); + } } } diff --git a/src/Illuminate/Routing/Router.php b/src/Illuminate/Routing/Router.php index 621037826f8b..cbfcdb224757 100644 --- a/src/Illuminate/Routing/Router.php +++ b/src/Illuminate/Routing/Router.php @@ -248,14 +248,14 @@ public function resourceParameters(array $parameters = []) } /** - * Set the uri translations. + * Get or set the verbs used in the resource URIs. * - * @param array $translations - * @return void + * @param array $verbs + * @return array|null */ - public function uriTranslations(array $translations = []) + public function resourceVerbs(array $verbs = []) { - ResourceRegistrar::setUriTranslations($translations); + return ResourceRegistrar::verbs($verbs); } /** diff --git a/tests/Routing/RoutingRouteTest.php b/tests/Routing/RoutingRouteTest.php index 3d37b54a8c1d..f0be3e4bd690 100644 --- a/tests/Routing/RoutingRouteTest.php +++ b/tests/Routing/RoutingRouteTest.php @@ -922,7 +922,7 @@ public function testResourceRouting() $this->assertEquals('foo-bars/{foo_bar}', $routes[0]->getUri()); $this->assertEquals('prefix.foo-bars.show', $routes[0]->getName()); - ResourceRegistrar::setUriTranslations([ + ResourceRegistrar::verbs([ 'create' => 'ajouter', 'edit' => 'modifier', ]);