Merge branch 'hotfix/404'

Close #404

Author: weierophinney

CHANGELOG.md

@@ -33,6 +33,9 @@ All notable changes to this project will be documented in this file, in reverse
   it now creates a new `Zend\Diactoros\Stream`, writes to that, and returns a
   new response with that new stream, guaranteeing it only contains the new
   contents.
+- [#404](https://github.com/zendframework/zend-expressive/pull/404) fixes the
+  `swallowDeprecationNotices()` handler such that it will not swallow a global
+  handler once application execution completes.
 
 ## 1.0.4 - 2016-12-07
 

src/Application.php

@@ -677,24 +677,17 @@ private function checkForDuplicateRoute($path, $methods = null)
      */
     private function swallowDeprecationNotices()
     {
-        $handler = function ($errno, $errstr) {
-            if ($errno !== E_USER_DEPRECATED) {
-                return false;
+        $previous = null;
+        $handler = function ($errno, $errstr, $errfile, $errline, $errcontext) use (&$previous) {
+            $swallow = $errno === E_USER_DEPRECATED && false !== strstr($errstr, 'error middleware is deprecated');
+
+            if ($swallow || $previous === null) {
+                return $swallow;
             }
-            return false !== strstr($errstr, 'error middleware is deprecated');
+
+            $previous($errno, $errstr, $errfile, $errline, $errcontext);
         };
 
         $previous = set_error_handler($handler);
-        if (! $previous) {
-            return;
-        }
-
-        set_error_handler(function ($errno, $errstr, $errfile, $errline, $errcontext) use ($handler, $previous) {
-            if ($handler($errno, $errstr)) {
-                return true;
-            }
-
-            return $previous($errno, $errstr, $errfile, $errline, $errcontext);
-        });
     }
 }

test/IntegrationTest.php

@@ -84,9 +84,9 @@ public function testInjectedFinalHandlerCanEmitA404WhenNoMiddlewareMatches()
      */
     public function testErrorMiddlewareDeprecationErrorHandlerWillNotOverridePreviouslyRegisteredErrorHandler()
     {
-        $triggered = false;
+        $triggered = 0;
         $this->errorHandler = set_error_handler(function ($errno, $errstr) use (&$triggered) {
-            $triggered = true;
+            $triggered++;
             return true;
         });
 
@@ -104,6 +104,10 @@ public function testErrorMiddlewareDeprecationErrorHandlerWillNotOverridePreviou
 
         $app->run($request, $response);
 
-        $this->assertTrue($triggered);
+        trigger_error('Triggered', E_USER_NOTICE);
+
+        restore_error_handler();
+
+        $this->assertSame(2, $triggered);
     }
 }