From 73254153bbc41ee7ba14e1cd8678c93d70d7badf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Jun 2016 12:18:11 +0200 Subject: php-pecl-xdebug: 2.5.0-dev (for PHP 7.1) --- REFLECTION-DEV | 276 +++++++++++++++++++++++++++++++++++++++++++++++ php-pecl-xdebug-dev.spec | 38 +++++-- xdebug-php71.patch | 14 +++ 3 files changed, 322 insertions(+), 6 deletions(-) create mode 100644 REFLECTION-DEV create mode 100644 xdebug-php71.patch 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 [ extension #51 xdebug version 2.5.0-dev ] { + + - INI { + Entry [ xdebug.auto_trace ] + Current = '0' + } + Entry [ xdebug.trace_enable_trigger ] + Current = '0' + } + Entry [ xdebug.trace_enable_trigger_value ] + Current = '' + } + Entry [ xdebug.trace_output_dir ] + Current = '/tmp' + } + Entry [ xdebug.trace_output_name ] + Current = 'trace.%c' + } + Entry [ xdebug.trace_format ] + Current = '0' + } + Entry [ xdebug.trace_options ] + Current = '0' + } + Entry [ xdebug.coverage_enable ] + Current = '1' + } + Entry [ xdebug.collect_includes ] + Current = '1' + } + Entry [ xdebug.collect_params ] + Current = '0' + } + Entry [ xdebug.collect_return ] + Current = '0' + } + Entry [ xdebug.collect_vars ] + Current = '0' + } + Entry [ xdebug.collect_assignments ] + Current = '0' + } + Entry [ xdebug.default_enable ] + Current = '1' + } + Entry [ xdebug.extended_info ] + Current = '1' + } + Entry [ xdebug.file_link_format ] + Current = '' + } + Entry [ xdebug.force_display_errors ] + Current = '0' + } + Entry [ xdebug.force_error_reporting ] + Current = '0' + } + Entry [ xdebug.halt_level ] + Current = '0' + } + Entry [ xdebug.max_nesting_level ] + Current = '256' + } + Entry [ xdebug.max_stack_frames ] + Current = '-1' + } + Entry [ xdebug.overload_var_dump ] + Current = '2' + } + Entry [ xdebug.show_error_trace ] + Current = '0' + } + Entry [ xdebug.show_exception_trace ] + Current = '0' + } + Entry [ xdebug.show_local_vars ] + Current = '0' + } + Entry [ xdebug.show_mem_delta ] + Current = '0' + } + Entry [ xdebug.dump.COOKIE ] + Current = '' + } + Entry [ xdebug.dump.ENV ] + Current = '' + } + Entry [ xdebug.dump.FILES ] + Current = '' + } + Entry [ xdebug.dump.GET ] + Current = '' + } + Entry [ xdebug.dump.POST ] + Current = '' + } + Entry [ xdebug.dump.REQUEST ] + Current = '' + } + Entry [ xdebug.dump.SERVER ] + Current = '' + } + Entry [ xdebug.dump.SESSION ] + Current = '' + } + Entry [ xdebug.dump_globals ] + Current = '1' + } + Entry [ xdebug.dump_once ] + Current = '1' + } + Entry [ xdebug.dump_undefined ] + Current = '0' + } + Entry [ xdebug.profiler_enable ] + Current = '0' + } + Entry [ xdebug.profiler_output_dir ] + Current = '/tmp' + } + Entry [ xdebug.profiler_output_name ] + Current = 'cachegrind.out.%p' + } + Entry [ xdebug.profiler_enable_trigger ] + Current = '0' + } + Entry [ xdebug.profiler_enable_trigger_value ] + Current = '' + } + Entry [ xdebug.profiler_append ] + Current = '0' + } + Entry [ xdebug.profiler_aggregate ] + Current = '0' + } + Entry [ xdebug.remote_enable ] + Current = '0' + } + Entry [ xdebug.remote_handler ] + Current = 'dbgp' + } + Entry [ xdebug.remote_host ] + Current = 'localhost' + } + Entry [ xdebug.remote_mode ] + Current = 'req' + } + Entry [ xdebug.remote_port ] + Current = '9000' + } + Entry [ xdebug.remote_autostart ] + Current = '0' + } + Entry [ xdebug.remote_connect_back ] + Current = '0' + } + Entry [ xdebug.remote_log ] + Current = '' + } + Entry [ xdebug.idekey ] + Current = '' + } + Entry [ xdebug.remote_cookie_expire_time ] + Current = '3600' + } + Entry [ xdebug.remote_addr_header ] + Current = '' + } + Entry [ xdebug.var_display_max_children ] + Current = '128' + } + Entry [ xdebug.var_display_max_data ] + Current = '512' + } + Entry [ xdebug.var_display_max_depth ] + Current = '3' + } + Entry [ xdebug.cli_color ] + Current = '0' + } + Entry [ xdebug.scream ] + 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 [ function xdebug_get_stack_depth ] { + } + Function [ function xdebug_get_function_stack ] { + } + Function [ function xdebug_get_formatted_function_stack ] { + } + Function [ function xdebug_print_function_stack ] { + } + Function [ function xdebug_get_declared_vars ] { + } + Function [ function xdebug_call_class ] { + } + Function [ function xdebug_call_function ] { + } + Function [ function xdebug_call_file ] { + } + Function [ function xdebug_call_line ] { + } + Function [ function xdebug_var_dump ] { + } + Function [ function xdebug_debug_zval ] { + } + Function [ function xdebug_debug_zval_stdout ] { + } + Function [ function xdebug_enable ] { + } + Function [ function xdebug_disable ] { + } + Function [ function xdebug_is_enabled ] { + } + Function [ function xdebug_break ] { + } + Function [ function xdebug_start_trace ] { + } + Function [ function xdebug_stop_trace ] { + } + Function [ function xdebug_get_tracefile_name ] { + } + Function [ function xdebug_get_profiler_filename ] { + } + Function [ function xdebug_dump_aggr_profiling_data ] { + } + Function [ function xdebug_clear_aggr_profiling_data ] { + } + Function [ function xdebug_memory_usage ] { + } + Function [ function xdebug_peak_memory_usage ] { + } + Function [ function xdebug_time_index ] { + } + Function [ function xdebug_start_error_collection ] { + } + Function [ function xdebug_stop_error_collection ] { + } + Function [ function xdebug_get_collected_errors ] { + } + Function [ function xdebug_start_function_monitor ] { + } + Function [ function xdebug_stop_function_monitor ] { + } + Function [ function xdebug_get_monitored_functions ] { + } + Function [ function xdebug_start_code_coverage ] { + } + Function [ function xdebug_stop_code_coverage ] { + } + Function [ function xdebug_get_code_coverage ] { + } + Function [ function xdebug_code_coverage_started ] { + } + Function [ function xdebug_get_function_count ] { + } + Function [ function xdebug_dump_superglobals ] { + } + Function [ 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 - 2.5.0-0.1.20160529git78fa98b +- update to 2.5.0-dev for PHP 7.1 + * Fri Mar 4 2016 Remi Collet - 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" -- cgit