Merge branch 'hotfix/419'

Close #420
Fixes #419

Author: weierophinney

.docheader

@@ -1,5 +1,5 @@
 /**
  * @see       https://github.com/zendframework/zend-expressive for the canonical source repository
- * @copyright Copyright (c) %regexp:(20\d{2}-)?%%year% Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) %regexp:(20\d{2}-)20\d{2}% Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
  */

CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.0.6 - 2017-01-09
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#420](https://github.com/zendframework/zend-expressive/pull/420) fixes the
+  `routeMiddleware()`'s handling of 405 errors such that it now no longer emits
+  deprecation notices when running under the Stratigility 1.3 series.
+
 ## 1.0.5 - 2016-12-08
 
 ### Added

src/Application.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-expressive for the canonical source repository
- * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
  */
 
@@ -423,6 +423,10 @@ public function routeMiddleware(ServerRequestInterface $request, ResponseInterfa
             if ($result->isMethodFailure()) {
                 $response = $response->withStatus(405)
                     ->withHeader('Allow', implode(',', $result->getAllowedMethods()));
+
+                // Need to swallow deprecation notices, as this is how 405 errors
+                // are reported in the 1.0 series.
+                $this->swallowDeprecationNotices();
                 return $next($request, $response, 405);
             }
             return $next($request, $response);

src/Exception/MissingDependencyException.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-expressive for the canonical source repository
- * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2016-2017 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
  */
 

test/RouteMiddlewareTest.php

@@ -1,9 +1,7 @@
 <?php
 /**
- * Zend Framework (http://framework.zend.com/)
- *
  * @see       https://github.com/zendframework/zend-expressive for the canonical source repository
- * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
  */
 
@@ -13,6 +11,7 @@
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Http\Message\ResponseInterface;
+use SplQueue;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\ServerRequest;
 use Zend\Expressive\Application;
@@ -23,6 +22,10 @@
 use Zend\Expressive\Router\RouteResultObserverInterface;
 use Zend\Expressive\Router\RouterInterface;
 use Zend\Expressive\Router\ZendRouter;
+use Zend\Stratigility\Http\Request as StratigilityRequest;
+use Zend\Stratigility\Http\Response as StratigilityResponse;
+use Zend\Stratigility\Next;
+use Zend\Stratigility\Route;
 
 class RouteMiddlewareTest extends TestCase
 {
@@ -68,6 +71,45 @@ public function testRoutingFailureDueToHttpMethodCallsNextWithNotAllowedResponse
         $this->assertContains('POST', $allow);
     }
 
+    /**
+     * @todo Remove for 1.1.0. In that version, you either raise throwables, or
+     *     you opt in to the legacy error handling, and understand you will receive
+     *     deprecation notices.
+     * @group 419
+     */
+    public function testRoutingFailureDueToHttpMethodCallsNextWithoutEmittingDeprecationNotice()
+    {
+        // Stratigility request/response required for this test, due to usage of Next instance.
+        $request  = new StratigilityRequest(new ServerRequest());
+        $response = new StratigilityResponse(new Response());
+        $result   = RouteResult::fromRouteFailure(['GET', 'POST']);
+
+        $this->router->match($request)->willReturn($result);
+
+        $route = new Route('/', function ($error, $request, $response, $next) {
+            $this->assertEquals(405, $error);
+            $this->assertEquals(405, $response->getStatusCode());
+            return $response;
+        });
+
+        $queue = new SplQueue();
+        $queue->enqueue($route);
+
+        $done = function ($request, $response, $error = false) {
+            $this->fail('Should not reach final handler, but did');
+        };
+
+        $next = new Next($queue, $done);
+
+        $app  = $this->getApplication();
+        $test = $app->routeMiddleware($request, $response, $next);
+        $this->assertInstanceOf(ResponseInterface::class, $test);
+        $this->assertEquals(405, $test->getStatusCode());
+        $allow = $test->getHeaderLine('Allow');
+        $this->assertContains('GET', $allow);
+        $this->assertContains('POST', $allow);
+    }
+
     public function testGeneralRoutingFailureCallsNextWithSameRequestAndResponse()
     {
         $request  = new ServerRequest();

test/WhoopsErrorHandlerTest.php

@@ -1,9 +1,7 @@
 <?php
 /**
- * Zend Framework (http://framework.zend.com/)
- *
  * @see       http://github.com/zendframework/zend-expressive for the canonical source repository
- * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
  */
 
@@ -15,6 +13,7 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamInterface;
+use ReflectionClass;
 use Whoops\Handler\Handler;
 use Whoops\Handler\PrettyPageHandler;
 use Whoops\Run as Whoops;
@@ -29,7 +28,17 @@ class WhoopsErrorHandlerTest extends TestCase
 {
     public function getPrettyPageHandler()
     {
-        return $this->prophesize(PrettyPageHandler::class);
+        $handler = $this->prophesize(PrettyPageHandler::class);
+
+        // whoops 2.1.5 introduced a new method, which the runner calls when
+        // invoked; as such, we need to test if this method is present and mock
+        // a request to it if present.
+        $r = new ReflectionClass(PrettyPageHandler::class);
+        if ($r->hasMethod('contentType')) {
+            $handler->contentType()->willReturn('text/html');
+        }
+
+        return $handler;
     }
 
     public function testInstantiationRequiresWhoopsAndPageHandler()