Merge pull request php-amqplib#612 from cezarystepkowski/error_handler_restore

Fixed restoring previous error handler in StreamIO

Author: lukebakken

PhpAmqpLib/Wire/IO/StreamIO.php

@@ -147,8 +147,6 @@ public function connect()
             throw $e;
         }
 
-        restore_error_handler();
-
         if (false === $this->sock) {
             throw new AMQPRuntimeException(
                 sprintf(
@@ -300,7 +298,6 @@ public function write($data)
                 restore_error_handler();
                 throw new AMQPRuntimeException($e->getMessage());
             }
-            restore_error_handler();
 
             if ($buffer === false) {
                 throw new AMQPRuntimeException('Error sending data');
@@ -464,7 +461,6 @@ public function select($sec, $usec)
             restore_error_handler();
             throw $e;
         }
-        restore_error_handler();
 
         return $result;
     }

tests/Functional/StreamIOTest.php

@@ -12,6 +12,8 @@ class StreamIOTest extends TestCase
      */
     public function error_handler_is_restored_on_failed_connection()
     {
+        set_error_handler(array($this, 'custom_error_handler'));
+
         error_reporting(~E_NOTICE);
 
         $exceptionThrown = false;
@@ -33,5 +35,26 @@ public function error_handler_is_restored_on_failed_connection()
         $this->assertFalse($exceptionThrown, 'Default error handler was not restored.');
 
         error_reporting(E_ALL);
+
+        $previousErrorHandler = set_error_handler(array($this, 'custom_error_handler'));
+        $this->assertSame('custom_error_handler', $previousErrorHandler[1]);
+    }
+
+    /**
+     * @test
+     */
+    public function error_handler_is_restored_on_success()
+    {
+        set_error_handler(array($this, 'custom_error_handler'));
+
+        new AMQPStreamConnection(HOST, PORT, USER, PASS, VHOST);
+
+        $previousErrorHandler = set_error_handler(array($this, 'custom_error_handler'));
+
+        $this->assertSame('custom_error_handler', $previousErrorHandler[1]);
+    }
+
+    public function custom_error_handler($errno, $errstr, $errfile, $errline, $errcontext = null)
+    {
     }
 }