php-pecl-xdebug: 2.5.0-dev (for PHP 7.1)

3 files changed, 322 insertions, 6 deletions

diff --git a/REFLECTION-DEV b/REFLECTION-DEV
new file mode 100644
index 0000000..1798110
--- /dev/null
+++ b/REFLECTION-DEV
@@ -0,0 +1,276 @@
+Extension [ <persistent> extension #51 xdebug version 2.5.0-dev ] {
+
+  - INI {
+    Entry [ xdebug.auto_trace <ALL> ]
+      Current = '0'
+    }
+    Entry [ xdebug.trace_enable_trigger <PERDIR,SYSTEM> ]
+      Current = '0'
+    }
+    Entry [ xdebug.trace_enable_trigger_value <PERDIR,SYSTEM> ]
+      Current = ''
+    }
+    Entry [ xdebug.trace_output_dir <ALL> ]
+      Current = '/tmp'
+    }
+    Entry [ xdebug.trace_output_name <ALL> ]
+      Current = 'trace.%c'
+    }
+    Entry [ xdebug.trace_format <ALL> ]
+      Current = '0'
+    }
+    Entry [ xdebug.trace_options <ALL> ]
+      Current = '0'
+    }
+    Entry [ xdebug.coverage_enable <SYSTEM> ]
+      Current = '1'
+    }
+    Entry [ xdebug.collect_includes <ALL> ]
+      Current = '1'
+    }
+    Entry [ xdebug.collect_params <ALL> ]
+      Current = '0'
+    }
+    Entry [ xdebug.collect_return <ALL> ]
+      Current = '0'
+    }
+    Entry [ xdebug.collect_vars <ALL> ]
+      Current = '0'
+    }
+    Entry [ xdebug.collect_assignments <ALL> ]
+      Current = '0'
+    }
+    Entry [ xdebug.default_enable <ALL> ]
+      Current = '1'
+    }
+    Entry [ xdebug.extended_info <SYSTEM> ]
+      Current = '1'
+    }
+    Entry [ xdebug.file_link_format <ALL> ]
+      Current = ''
+    }
+    Entry [ xdebug.force_display_errors <SYSTEM> ]
+      Current = '0'
+    }
+    Entry [ xdebug.force_error_reporting <SYSTEM> ]
+      Current = '0'
+    }
+    Entry [ xdebug.halt_level <ALL> ]
+      Current = '0'
+    }
+    Entry [ xdebug.max_nesting_level <ALL> ]
+      Current = '256'
+    }
+    Entry [ xdebug.max_stack_frames <ALL> ]
+      Current = '-1'
+    }
+    Entry [ xdebug.overload_var_dump <ALL> ]
+      Current = '2'
+    }
+    Entry [ xdebug.show_error_trace <ALL> ]
+      Current = '0'
+    }
+    Entry [ xdebug.show_exception_trace <ALL> ]
+      Current = '0'
+    }
+    Entry [ xdebug.show_local_vars <ALL> ]
+      Current = '0'
+    }
+    Entry [ xdebug.show_mem_delta <ALL> ]
+      Current = '0'
+    }
+    Entry [ xdebug.dump.COOKIE <ALL> ]
+      Current = ''
+    }
+    Entry [ xdebug.dump.ENV <ALL> ]
+      Current = ''
+    }
+    Entry [ xdebug.dump.FILES <ALL> ]
+      Current = ''
+    }
+    Entry [ xdebug.dump.GET <ALL> ]
+      Current = ''
+    }
+    Entry [ xdebug.dump.POST <ALL> ]
+      Current = ''
+    }
+    Entry [ xdebug.dump.REQUEST <ALL> ]
+      Current = ''
+    }
+    Entry [ xdebug.dump.SERVER <ALL> ]
+      Current = ''
+    }
+    Entry [ xdebug.dump.SESSION <ALL> ]
+      Current = ''
+    }
+    Entry [ xdebug.dump_globals <ALL> ]
+      Current = '1'
+    }
+    Entry [ xdebug.dump_once <ALL> ]
+      Current = '1'
+    }
+    Entry [ xdebug.dump_undefined <ALL> ]
+      Current = '0'
+    }
+    Entry [ xdebug.profiler_enable <PERDIR,SYSTEM> ]
+      Current = '0'
+    }
+    Entry [ xdebug.profiler_output_dir <PERDIR,SYSTEM> ]
+      Current = '/tmp'
+    }
+    Entry [ xdebug.profiler_output_name <PERDIR,SYSTEM> ]
+      Current = 'cachegrind.out.%p'
+    }
+    Entry [ xdebug.profiler_enable_trigger <PERDIR,SYSTEM> ]
+      Current = '0'
+    }
+    Entry [ xdebug.profiler_enable_trigger_value <PERDIR,SYSTEM> ]
+      Current = ''
+    }
+    Entry [ xdebug.profiler_append <PERDIR,SYSTEM> ]
+      Current = '0'
+    }
+    Entry [ xdebug.profiler_aggregate <PERDIR,SYSTEM> ]
+      Current = '0'
+    }
+    Entry [ xdebug.remote_enable <PERDIR,SYSTEM> ]
+      Current = '0'
+    }
+    Entry [ xdebug.remote_handler <ALL> ]
+      Current = 'dbgp'
+    }
+    Entry [ xdebug.remote_host <ALL> ]
+      Current = 'localhost'
+    }
+    Entry [ xdebug.remote_mode <ALL> ]
+      Current = 'req'
+    }
+    Entry [ xdebug.remote_port <ALL> ]
+      Current = '9000'
+    }
+    Entry [ xdebug.remote_autostart <ALL> ]
+      Current = '0'
+    }
+    Entry [ xdebug.remote_connect_back <ALL> ]
+      Current = '0'
+    }
+    Entry [ xdebug.remote_log <ALL> ]
+      Current = ''
+    }
+    Entry [ xdebug.idekey <ALL> ]
+      Current = ''
+    }
+    Entry [ xdebug.remote_cookie_expire_time <ALL> ]
+      Current = '3600'
+    }
+    Entry [ xdebug.remote_addr_header <ALL> ]
+      Current = ''
+    }
+    Entry [ xdebug.var_display_max_children <ALL> ]
+      Current = '128'
+    }
+    Entry [ xdebug.var_display_max_data <ALL> ]
+      Current = '512'
+    }
+    Entry [ xdebug.var_display_max_depth <ALL> ]
+      Current = '3'
+    }
+    Entry [ xdebug.cli_color <ALL> ]
+      Current = '0'
+    }
+    Entry [ xdebug.scream <ALL> ]
+      Current = '0'
+    }
+  }
+
+  - Constants [8] {
+    Constant [ integer XDEBUG_TRACE_APPEND ] { 1 }
+    Constant [ integer XDEBUG_TRACE_COMPUTERIZED ] { 2 }
+    Constant [ integer XDEBUG_TRACE_HTML ] { 4 }
+    Constant [ integer XDEBUG_TRACE_NAKED_FILENAME ] { 8 }
+    Constant [ integer XDEBUG_CC_UNUSED ] { 1 }
+    Constant [ integer XDEBUG_CC_DEAD_CODE ] { 2 }
+    Constant [ integer XDEBUG_CC_BRANCH_CHECK ] { 4 }
+    Constant [ integer XDEBUG_STACK_NO_DESC ] { 1 }
+  }
+
+  - Functions {
+    Function [ <internal:xdebug> function xdebug_get_stack_depth ] {
+    }
+    Function [ <internal:xdebug> function xdebug_get_function_stack ] {
+    }
+    Function [ <internal:xdebug> function xdebug_get_formatted_function_stack ] {
+    }
+    Function [ <internal:xdebug> function xdebug_print_function_stack ] {
+    }
+    Function [ <internal:xdebug> function xdebug_get_declared_vars ] {
+    }
+    Function [ <internal:xdebug> function xdebug_call_class ] {
+    }
+    Function [ <internal:xdebug> function xdebug_call_function ] {
+    }
+    Function [ <internal:xdebug> function xdebug_call_file ] {
+    }
+    Function [ <internal:xdebug> function xdebug_call_line ] {
+    }
+    Function [ <internal:xdebug> function xdebug_var_dump ] {
+    }
+    Function [ <internal:xdebug> function xdebug_debug_zval ] {
+    }
+    Function [ <internal:xdebug> function xdebug_debug_zval_stdout ] {
+    }
+    Function [ <internal:xdebug> function xdebug_enable ] {
+    }
+    Function [ <internal:xdebug> function xdebug_disable ] {
+    }
+    Function [ <internal:xdebug> function xdebug_is_enabled ] {
+    }
+    Function [ <internal:xdebug> function xdebug_break ] {
+    }
+    Function [ <internal:xdebug> function xdebug_start_trace ] {
+    }
+    Function [ <internal:xdebug> function xdebug_stop_trace ] {
+    }
+    Function [ <internal:xdebug> function xdebug_get_tracefile_name ] {
+    }
+    Function [ <internal:xdebug> function xdebug_get_profiler_filename ] {
+    }
+    Function [ <internal:xdebug> function xdebug_dump_aggr_profiling_data ] {
+    }
+    Function [ <internal:xdebug> function xdebug_clear_aggr_profiling_data ] {
+    }
+    Function [ <internal:xdebug> function xdebug_memory_usage ] {
+    }
+    Function [ <internal:xdebug> function xdebug_peak_memory_usage ] {
+    }
+    Function [ <internal:xdebug> function xdebug_time_index ] {
+    }
+    Function [ <internal:xdebug> function xdebug_start_error_collection ] {
+    }
+    Function [ <internal:xdebug> function xdebug_stop_error_collection ] {
+    }
+    Function [ <internal:xdebug> function xdebug_get_collected_errors ] {
+    }
+    Function [ <internal:xdebug> function xdebug_start_function_monitor ] {
+    }
+    Function [ <internal:xdebug> function xdebug_stop_function_monitor ] {
+    }
+    Function [ <internal:xdebug> function xdebug_get_monitored_functions ] {
+    }
+    Function [ <internal:xdebug> function xdebug_start_code_coverage ] {
+    }
+    Function [ <internal:xdebug> function xdebug_stop_code_coverage ] {
+    }
+    Function [ <internal:xdebug> function xdebug_get_code_coverage ] {
+    }
+    Function [ <internal:xdebug> function xdebug_code_coverage_started ] {
+    }
+    Function [ <internal:xdebug> function xdebug_get_function_count ] {
+    }
+    Function [ <internal:xdebug> function xdebug_dump_superglobals ] {
+    }
+    Function [ <internal:xdebug> function xdebug_get_headers ] {
+    }
+  }
+}
+
diff --git a/php-pecl-xdebug-dev.spec b/php-pecl-xdebug-dev.spec
index e0f8c68..e7f18ff 100644
--- a/php-pecl-xdebug-dev.spec
+++ b/php-pecl-xdebug-dev.spec
@@ -16,9 +16,9 @@
 
 %global pecl_name   xdebug
 %global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
-%global gh_commit   821c1fd2e09e65a9d33414ce7ce234e2ea6fdf83
+%global gh_commit   78fa98b7e54180c8f4003c5ca3b01bfa67c2c561
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
-#global gh_date     20151118
+%global gh_date     20160529
 %global with_tests  0%{?_with_tests:1}
 #global prever      RC4
 
@@ -31,15 +31,22 @@
 
 Name:           %{?scl_prefix}php-pecl-xdebug
 Summary:        PECL package for debugging PHP scripts
-Version:        2.4.0
+Version:        2.5.0
+%if 0%{?gh_date:1}
+Release:        0.1.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+%else
 Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-Source0:        https://github.com/%{pecl_name}/%{pecl_name}/archive/%{gh_commit}/%{pecl_name}-%{version}%{?prever}-%{gh_short}.tar.gz
+%endif
 
 # The Xdebug License, version 1.01
 # (Based on "The PHP License", version 3.0)
 License:        BSD
 Group:          Development/Languages
 URL:            http://xdebug.org/
+Source0:        https://github.com/%{pecl_name}/%{pecl_name}/archive/%{gh_commit}/%{pecl_name}-%{version}%{?prever}-%{gh_short}.tar.gz
+
+# Temp for 7.1.0alpha1, fixed upstream
+Patch0:         %{pecl_name}-php71.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  %{?scl_prefix}php-pear  > 1.9.1
@@ -79,6 +86,10 @@ Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php70u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php70w-pecl-%{pecl_name} <= %{version}
 %endif
+%if "%{php_version}" > "7.1"
+Obsoletes:     php71u-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php71w-pecl-%{pecl_name} <= %{version}
+%endif
 %endif
 
 %if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -112,16 +123,28 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 %prep
 %setup -qc
 mv %{pecl_name}-%{gh_commit} NTS
+
+%if 0%{?gh_date:1}
+%{__php} -r '
+  $pkg = simplexml_load_file("NTS/package.xml");
+  $pkg->date = substr("%{gh_date}",0,4)."-".substr("%{gh_date}",4,2)."-".substr("%{gh_date}",6,2);
+  $pkg->version->release = "%{version}dev";
+  $pkg->stability->release = "devel";
+  $pkg->asXML("package.xml");
+'
+%else
 mv NTS/package.xml .
+%endif
 
 %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
 
 cd NTS
+%patch0 -p0 -b .php71
 
 # Check extension version
 ver=$(sed -n '/XDEBUG_VERSION/{s/.* "//;s/".*$//;p}' php_xdebug.h)
-if test "$ver" != "%{version}%{?prever}"; then
-   : Error: Upstream XDEBUG_VERSION version is ${ver}, expecting %{version}%{?prever}.
+if test "$ver" != "%{version}%{?prever}%{?gh_date:-dev}"; then
+   : Error: Upstream XDEBUG_VERSION version is ${ver}, expecting %{version}%{?prever}%{?gh_date:-dev}.
    exit 1
 fi
 
@@ -291,6 +314,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jun 10 2016 Remi Collet <remi@fedoraproject.org> - 2.5.0-0.1.20160529git78fa98b
+- update to 2.5.0-dev for PHP 7.1
+
 * Fri Mar  4 2016 Remi Collet <remi@fedoraproject.org> - 2.4.0-1
 - update to 2.4.0
 
diff --git a/xdebug-php71.patch b/xdebug-php71.patch
new file mode 100644
index 0000000..8ff103e
--- /dev/null
+++ b/xdebug-php71.patch
@@ -0,0 +1,14 @@
+diff -up ./php_xdebug.h.old ./php_xdebug.h
+--- ./php_xdebug.h.old	2016-06-10 12:09:53.021694392 +0200
++++ ./php_xdebug.h	2016-06-10 12:09:56.355710983 +0200
+@@ -29,6 +29,10 @@
+ 
+ #include "php.h"
+ 
++#ifndef LOG_NOTICE
++#define LOG_NOTICE 5
++#endif
++
+ #include "xdebug_compat.h"
+ #include "xdebug_handlers.h"
+ #include "xdebug_hash.h"