Merge branch 'hotfix/implicit-methods-testing' into release-3.0.0

Close #40

Author: weierophinney

CHANGELOG.md

@@ -2,6 +2,32 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 3.0.0rc2 - 2018-03-06
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- [#40](https://github.com/zendframework/zend-expressive-zendrouter/pull/40)
+  updates the minimum supported version of zend-expressive-router to 3.0.0rc2.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#40](https://github.com/zendframework/zend-expressive-zendrouter/pull/40)
+  fixes how the router creates a `RouteResult` when the path matches, but not
+  the HTTP method. In particular, it does not provide special handling for
+  `HEAD` requests, treating them like any other method mismatch.
+
 ## 3.0.0rc1 - 2018-03-05
 
 ### Added

composer.json

@@ -23,15 +23,16 @@
         "php": "^7.1",
         "fig/http-message-util": "^1.1.2",
         "psr/http-message": "^1.0.1",
-        "zendframework/zend-expressive-router": "^3.0.0rc1",
+        "zendframework/zend-expressive-router": "^3.0.0rc2",
         "zendframework/zend-psr7bridge": "^0.2.2 || ^1.0.0",
         "zendframework/zend-router": "^3.0.2"
     },
     "require-dev": {
         "malukenho/docheader": "^0.1.6",
         "phpunit/phpunit": "^7.0.2",
         "zendframework/zend-coding-standard": "~1.0.0",
-        "zendframework/zend-i18n": "^2.7.4"
+        "zendframework/zend-i18n": "^2.7.4",
+        "zendframework/zend-stratigility": "^3.0.0rc1"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -96,11 +96,6 @@ public function match(PsrRequest $request) : RouteResult
 
         $zendRequest = Psr7ServerRequest::toZend($request, true);
         $match = $this->zendRouter->match($zendRequest);
-        if ($request->getMethod() === RequestMethod::METHOD_HEAD
-            && (null === $match || null !== $match->getParam(self::METHOD_NOT_ALLOWED_ROUTE))
-        ) {
-            $match = $this->zendRouter->match($zendRequest->setMethod(RequestMethod::METHOD_GET));
-        }
 
         if (null === $match) {
             // No route matched at all; to indicate that it's not due to the

src/ZendRouter.php

@@ -9,6 +9,7 @@
 
 namespace ZendTest\Expressive\Router;
 
+use Generator;
 use Zend\Expressive\Router\RouterInterface;
 use Zend\Expressive\Router\Test\ImplicitMethodsIntegrationTest as RouterIntegrationTest;
 use Zend\Expressive\Router\ZendRouter;
@@ -19,4 +20,19 @@ public function getRouter() : RouterInterface
     {
         return new ZendRouter();
     }
+
+    public function implicitRoutesAndRequests() : Generator
+    {
+        $options = [
+            'constraints' => [
+                'version' => '\d+',
+            ],
+        ];
+
+        // @codingStandardsIgnoreStart
+        //                  route                route options, request       params
+        yield 'static'  => ['/api/v1/me',        $options,      '/api/v1/me', []];
+        yield 'dynamic' => ['/api/v:version/me', $options,      '/api/v3/me', ['version' => '3']];
+        // @codingStandardsIgnoreEnd
+    }
 }