From 5e10735d07578fcf656e40d0a967a9bc557ad838 Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Mon, 2 May 2016 18:48:50 +0100
Subject: [PATCH] improve test coverage of multicatch

---
 Zend/tests/try/exceptions.inc          |  1 +
 Zend/tests/try/try_multicatch_006.phpt | 22 ++++++++++++++++++++++
 Zend/tests/try/try_multicatch_007.phpt | 22 ++++++++++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 Zend/tests/try/try_multicatch_006.phpt
 create mode 100644 Zend/tests/try/try_multicatch_007.phpt

diff --git a/Zend/tests/try/exceptions.inc b/Zend/tests/try/exceptions.inc
index 8a8777914c..68cb1c62f7 100644
--- a/Zend/tests/try/exceptions.inc
+++ b/Zend/tests/try/exceptions.inc
@@ -3,3 +3,4 @@
 class Exception1 extends Exception {}
 class Exception2 extends Exception {}
 class Exception3 extends Exception {}
+class Exception4 extends Exception {}
diff --git a/Zend/tests/try/try_multicatch_006.phpt b/Zend/tests/try/try_multicatch_006.phpt
new file mode 100644
index 0000000000..e4505f1b24
--- /dev/null
+++ b/Zend/tests/try/try_multicatch_006.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Catch first exception in the second multicatch
+--FILE--
+<?php
+require_once __DIR__ . '/exceptions.inc';
+
+try {
+	echo 'TRY' . PHP_EOL;
+	throw new Exception3;
+} catch(Exception1 | Exception2 $e) {
+	echo get_class($e) . PHP_EOL;
+} catch(Exception3 | Exception4 $e) {
+	echo get_class($e) . PHP_EOL;
+} finally {
+	echo 'FINALLY' . PHP_EOL;
+}
+?>
+--EXPECT--
+TRY
+Exception3
+FINALLY
+
diff --git a/Zend/tests/try/try_multicatch_007.phpt b/Zend/tests/try/try_multicatch_007.phpt
new file mode 100644
index 0000000000..aa073b0592
--- /dev/null
+++ b/Zend/tests/try/try_multicatch_007.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Catch second exception in the second multicatch
+--FILE--
+<?php
+require_once __DIR__ . '/exceptions.inc';
+
+try {
+	echo 'TRY' . PHP_EOL;
+	throw new Exception4;
+} catch(Exception1 | Exception2 $e) {
+	echo get_class($e) . PHP_EOL;
+} catch(Exception3 | Exception4 $e) {
+	echo get_class($e) . PHP_EOL;
+} finally {
+	echo 'FINALLY' . PHP_EOL;
+}
+?>
+--EXPECT--
+TRY
+Exception4
+FINALLY
+
-- 
2.50.1