refresh with PR merged

2 files changed, 5 insertions, 98 deletions

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>
- 
diff --git a/php-pecl-xdebug.spec b/php-pecl-xdebug.spec
index aaffb9a..ea7d070 100644
--- a/php-pecl-xdebug.spec
+++ b/php-pecl-xdebug.spec
@@ -19,9 +19,9 @@
 
 %global pecl_name   xdebug
 %global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
-%global gh_commit   4ae1efe757e42f2e1f27ab643de497ed0d1a4b92
+%global gh_commit   01167bd6f83956b39c5812772bdb3008cd36ab55
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_date     20190613
+%global gh_date     20190614
 %global with_tests  0%{!?_without_tests:1}
 %global upstream_version 2.8.0
 #global upstream_prever  dev
@@ -45,8 +45,6 @@ License:        BSD
 URL:            https://xdebug.org/
 Source0:        https://github.com/%{pecl_name}/%{pecl_name}/archive/%{gh_commit}/%{pecl_name}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tar.gz
 
-Patch0:         https://patch-diff.githubusercontent.com/raw/xdebug/xdebug/pull/480.patch
-
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel > 7
 BuildRequires:  %{?scl_prefix}php-pear
@@ -145,8 +143,6 @@ mv NTS/package.xml .
 %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
 
 cd NTS
-%patch0 -p1
-
 # Check extension version
 ver=$(sed -n '/XDEBUG_VERSION/{s/.* "//;s/".*$//;p}' php_xdebug.h)
 if test "$ver" != "%{upstream_version}%{?upstream_prever}%{?gh_date:-dev}"; then
@@ -308,6 +304,9 @@ fi
 
 
 %changelog
+* Fri Jun 14 2019 Remi Collet <remi@remirepo.net> - 2.8.0~DEV-1.20190614.01167bd
+- refresh with PR merged
+
 * Thu Jun 13 2019 Remi Collet <remi@remirepo.net> - 2.8.0~DEV-1.20190613.4ae1efe
 - update to 2.8.0-dev for PHP 7.4