Reduce number of references by discarding internal previous Exception

clue · clue · commit 3abb49d0b09c · 2018-09-27T17:23:33.000+02:00
diff --git a/src/SecureConnector.php b/src/SecureConnector.php
@@ -62,8 +62,7 @@ public function connect($uri)
 
                 throw new \RuntimeException(
                     'Connection to ' . $uri . ' failed during TLS handshake: ' . $error->getMessage(),
-                    0,
-                    $error
+                    $error->getCode()
                 );
             });
         });
diff --git a/src/SecureServer.php b/src/SecureServer.php
@@ -186,8 +186,7 @@ function ($conn) use ($that) {
             function ($error) use ($that, $connection) {
                 $error = new \RuntimeException(
                     'Connection from ' . $connection->getRemoteAddress() . ' failed during TLS handshake: ' . $error->getMessage(),
-                    $error->getCode(),
-                    $error
+                    $error->getCode()
                 );
 
                 $that->emit('error', array($error));
diff --git a/tests/FunctionalSecureServerTest.php b/tests/FunctionalSecureServerTest.php
@@ -425,6 +425,7 @@ public function testEmitsErrorIfConnectionIsClosedBeforeHandshake()
         $this->assertStringStartsWith('Connection from tcp://', $error->getMessage());
         $this->assertStringEndsWith('failed during TLS handshake: Connection lost during TLS handshake', $error->getMessage());
         $this->assertEquals(defined('SOCKET_ECONNRESET') ? SOCKET_ECONNRESET : 0, $error->getCode());
+        $this->assertNull($error->getPrevious());
     }
 
     public function testEmitsErrorIfConnectionIsClosedWithIncompleteHandshake()
@@ -452,6 +453,7 @@ public function testEmitsErrorIfConnectionIsClosedWithIncompleteHandshake()
         $this->assertStringStartsWith('Connection from tcp://', $error->getMessage());
         $this->assertStringEndsWith('failed during TLS handshake: Connection lost during TLS handshake', $error->getMessage());
         $this->assertEquals(defined('SOCKET_ECONNRESET') ? SOCKET_ECONNRESET : 0, $error->getCode());
+        $this->assertNull($error->getPrevious());
     }
 
     public function testEmitsNothingIfConnectionIsIdle()
diff --git a/tests/SecureConnectorTest.php b/tests/SecureConnectorTest.php
@@ -107,17 +107,13 @@ public function testStreamEncryptionWillBeEnabledAfterConnecting()
         $promise = $this->connector->connect('example.com:80');
     }
 
-    /**
-     * @expectedException RuntimeException
-     * @expectedExceptionMessage Connection to example.com:80 failed during TLS handshake: TLS error
-     */
     public function testConnectionWillBeRejectedIfStreamEncryptionFailsAndClosesConnection()
     {
         $connection = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->getMock();
         $connection->expects($this->once())->method('close');
 
         $encryption = $this->getMockBuilder('React\Socket\StreamEncryption')->disableOriginalConstructor()->getMock();
-        $encryption->expects($this->once())->method('enable')->willReturn(Promise\reject(new \RuntimeException('TLS error')));
+        $encryption->expects($this->once())->method('enable')->willReturn(Promise\reject(new \RuntimeException('TLS error', 123)));
 
         $ref = new \ReflectionProperty($this->connector, 'streamEncryption');
         $ref->setAccessible(true);
@@ -128,7 +124,13 @@ public function testConnectionWillBeRejectedIfStreamEncryptionFailsAndClosesConn
 
         $promise = $this->connector->connect('example.com:80');
 
-        $this->throwRejection($promise);
+        try {
+            $this->throwRejection($promise);
+        } catch (\RuntimeException $e) {
+            $this->assertEquals('Connection to example.com:80 failed during TLS handshake: TLS error', $e->getMessage());
+            $this->assertEquals(123, $e->getCode());
+            $this->assertNull($e->getPrevious());
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -425,6 +425,7 @@ public function testEmitsErrorIfConnectionIsClosedBeforeHandshake()`
`425`	`425`	`$this->assertStringStartsWith('Connection from tcp://', $error->getMessage());`
`426`	`426`	`$this->assertStringEndsWith('failed during TLS handshake: Connection lost during TLS handshake', $error->getMessage());`
`427`	`427`	`$this->assertEquals(defined('SOCKET_ECONNRESET') ? SOCKET_ECONNRESET : 0, $error->getCode());`
	`428`	`+ $this->assertNull($error->getPrevious());`
`428`	`429`	`}`
`429`	`430`
`430`	`431`	`public function testEmitsErrorIfConnectionIsClosedWithIncompleteHandshake()`
`@@ -452,6 +453,7 @@ public function testEmitsErrorIfConnectionIsClosedWithIncompleteHandshake()`
`452`	`453`	`$this->assertStringStartsWith('Connection from tcp://', $error->getMessage());`
`453`	`454`	`$this->assertStringEndsWith('failed during TLS handshake: Connection lost during TLS handshake', $error->getMessage());`
`454`	`455`	`$this->assertEquals(defined('SOCKET_ECONNRESET') ? SOCKET_ECONNRESET : 0, $error->getCode());`
	`456`	`+ $this->assertNull($error->getPrevious());`
`455`	`457`	`}`
`456`	`458`
`457`	`459`	`public function testEmitsNothingIfConnectionIsIdle()`