Merge pull request #1524 from natanfelles/test_routes

Test routes resource with 'websafe' option

system/Router/RouteCollection.php

@@ -436,7 +436,7 @@ protected function discoverRoutes()
 
 	/**
 	 * Sets the default constraint to be used in the system. Typically
-	 * for use with the 'resources' method.
+	 * for use with the 'resource' method.
 	 *
 	 * @param string $placeholder
 	 *
@@ -722,7 +722,7 @@ public function getRedirectCode(string $from): int
 	 * Example:
 	 *     // Creates route: admin/users
 	 *     $route->group('admin', function() {
-	 *            $route->resources('users');
+	 *            $route->resource('users');
 	 *     });
 	 *
 	 * @param string $name The name to group/prefix the routes with.
@@ -777,7 +777,7 @@ public function group($name, ...$params)
 	 *      'placeholder'   - The regex used by the Router. Defaults to '(:any)'
 	 *
 	 * Example:
-	 *      $route->resources('photos');
+	 *      $route->resource('photos');
 	 *
 	 *      // Generates the following routes:
 	 *      HTTP Verb | Path        | Action        | Used for...
@@ -864,8 +864,8 @@ public function resource(string $name, array $options = null): RouteCollectionIn
 		if (in_array('update', $methods))
 		{
 			$this->put($name . '/' . $id, $new_name . '::update/$1', $options);
+			$this->patch($name . '/' . $id, $new_name . '::update/$1', $options);
 		}
-		$this->patch($name . '/' . $id, $new_name . '::update/$1', $options);
 		if (in_array('delete', $methods))
 		{
 			$this->delete($name . '/' . $id, $new_name . '::delete/$1', $options);

tests/system/Router/RouteCollectionTest.php

@@ -458,6 +458,24 @@ public function testResourcesWithExcept()
 
 	//--------------------------------------------------------------------
 
+	public function testResourcesWithWebsafe()
+	{
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$routes                    = $this->getCollector();
+
+		$routes->resource('photos', ['websafe' => true]);
+
+		$expected = [
+			'photos'             => '\Photos::create',
+			'photos/(.*)'        => '\Photos::update/$1',
+			'photos/(.*)/delete' => '\Photos::delete/$1',
+		];
+
+		$this->assertEquals($expected, $routes->getRoutes());
+	}
+
+	//--------------------------------------------------------------------
+
 	public function testMatchSupportsMultipleMethods()
 	{
 		$_SERVER['REQUEST_METHOD'] = 'GET';