From 160a507c931681904e0b35524e5496f7ff750474 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 14 Jun 2019 16:29:49 +0200
Subject: refresh with PR merged

---
 480.patch | 92 ---------------------------------------------------------------
 1 file changed, 92 deletions(-)
 delete mode 100644 480.patch

(limited to '480.patch')

diff --git a/480.patch b/480.patch
deleted file mode 100644
index e7edfb6..0000000
--- a/480.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 7cc30505aa9dea878526b3bc9cb9ffd6e2db1354 Mon Sep 17 00:00:00 2001
-From: Derick Rethans <github@derickrethans.nl>
-Date: Wed, 12 Jun 2019 19:57:49 +0100
-Subject: [PATCH 1/2] Remove overload for removed
- ZEND_DECLARE_INHERITED_CLASS_DELAYED opcode
-
----
- xdebug.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/xdebug.c b/xdebug.c
-index d3d2621dc..544e162a5 100644
---- a/xdebug.c
-+++ b/xdebug.c
-@@ -854,7 +854,6 @@ PHP_MINIT_FUNCTION(xdebug)
- #endif
- #if PHP_VERSION_ID >= 70400
- 		XDEBUG_SET_OPCODE_OVERRIDE_COMMON(ZEND_DECLARE_CLASS);
--		XDEBUG_SET_OPCODE_OVERRIDE_COMMON(ZEND_DECLARE_INHERITED_CLASS_DELAYED);
- #endif
- #if PHP_VERSION_ID >= 70200
- 		zend_set_user_opcode_handler(ZEND_SWITCH_STRING, xdebug_switch_handler);
-@@ -1038,7 +1037,6 @@ PHP_MSHUTDOWN_FUNCTION(xdebug)
- #endif
- #if PHP_VERSION_ID >= 70400
- 			zend_set_user_opcode_handler(ZEND_DECLARE_CLASS, NULL);
--			zend_set_user_opcode_handler(ZEND_DECLARE_INHERITED_CLASS_DELAYED, NULL);
- #endif
- #ifndef ZTS
- 		}
-
-From c84ba23a50b1c9a4929a6ce9416280173d7f3662 Mon Sep 17 00:00:00 2001
-From: Derick Rethans <github@derickrethans.nl>
-Date: Thu, 13 Jun 2019 00:15:58 +0100
-Subject: [PATCH 2/2] Fixed latest resolved breakpoints test
-
----
- tests/bug01388-19.phpt | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/tests/bug01388-19.phpt b/tests/bug01388-19.phpt
-index 7cd4c35b8..785889387 100644
---- a/tests/bug01388-19.phpt
-+++ b/tests/bug01388-19.phpt
-@@ -13,10 +13,10 @@ $filename = dirname(__FILE__) . '/bug01388-19.inc';
- $commands = array(
- 	'feature_set -n resolved_breakpoints -v 1',
- 	'step_into',
--	"breakpoint_set -t line -f file://{{$filename} -n 2",
--	"breakpoint_set -t line -f file://{{$filename} -n 4",
--	"breakpoint_set -t line -f file://{{$filename} -n 8",
--	"breakpoint_set -t line -f file://{{$filename} -n 9",
-+	"breakpoint_set -t line -f file://{$filename} -n 2",
-+	"breakpoint_set -t line -f file://{$filename} -n 4",
-+	"breakpoint_set -t line -f file://{$filename} -n 8",
-+	"breakpoint_set -t line -f file://{$filename} -n 9",
- 	'run',
- 	'run',
- 	'run',
-@@ -38,28 +38,28 @@ dbgpRunFile( $filename, $commands );
- <?xml version="1.0" encoding="iso-8859-1"?>
- <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="2" status="break" reason="ok"><xdebug:message filename="file://bug01388-19.inc" lineno="2"></xdebug:message></response>
- 
---> breakpoint_set -i 3 -t line -f /home/derick/dev/php/derickr-xdebug/tests/bug01388-19.inc -n 2
-+-> breakpoint_set -i 3 -t line -f file://bug01388-19.inc -n 2
- <?xml version="1.0" encoding="iso-8859-1"?>
- <notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="breakpoint_resolved"><breakpoint type="line" resolved="resolved" filename="file://bug01388-19.inc" lineno="2" state="enabled" hit_count="0" hit_value="0" id=""></breakpoint></notify>
- 
- <?xml version="1.0" encoding="iso-8859-1"?>
- <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="breakpoint_set" transaction_id="3" id="" resolved="resolved"></response>
- 
---> breakpoint_set -i 4 -t line -f /home/derick/dev/php/derickr-xdebug/tests/bug01388-19.inc -n 4
-+-> breakpoint_set -i 4 -t line -f file://bug01388-19.inc -n 4
- <?xml version="1.0" encoding="iso-8859-1"?>
- <notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="breakpoint_resolved"><breakpoint type="line" resolved="resolved" filename="file://bug01388-19.inc" lineno="5" state="enabled" hit_count="0" hit_value="0" id=""></breakpoint></notify>
- 
- <?xml version="1.0" encoding="iso-8859-1"?>
- <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="breakpoint_set" transaction_id="4" id="" resolved="resolved"></response>
- 
---> breakpoint_set -i 5 -t line -f /home/derick/dev/php/derickr-xdebug/tests/bug01388-19.inc -n 8
-+-> breakpoint_set -i 5 -t line -f file://bug01388-19.inc -n 8
- <?xml version="1.0" encoding="iso-8859-1"?>
- <notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="breakpoint_resolved"><breakpoint type="line" resolved="resolved" filename="file://bug01388-19.inc" lineno="8" state="enabled" hit_count="0" hit_value="0" id=""></breakpoint></notify>
- 
- <?xml version="1.0" encoding="iso-8859-1"?>
- <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="breakpoint_set" transaction_id="5" id="" resolved="resolved"></response>
- 
---> breakpoint_set -i 6 -t line -f /home/derick/dev/php/derickr-xdebug/tests/bug01388-19.inc -n 9
-+-> breakpoint_set -i 6 -t line -f file://bug01388-19.inc -n 9
- <?xml version="1.0" encoding="iso-8859-1"?>
- <notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="breakpoint_resolved"><breakpoint type="line" resolved="resolved" filename="file://bug01388-19.inc" lineno="9" state="enabled" hit_count="0" hit_value="0" id=""></breakpoint></notify>
- 
-- 
cgit