From c49544b79d2a6ca23342210626c4519d80c318a6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 21 Sep 2018 09:42:39 +0200 Subject: update to 2.7.0beta1 add link to documentation in description and configuration file open https://github.com/xdebug/xdebug/pull/431 zif_handler in 7.2 --- ...test-if-localhost-doesn-t-resolve-as-IPv6.patch | 24 ------- 0001-zif_handler-exists-in-7.2.patch | 25 +++++++ PHPINFO | 76 ++++++++++++++++++++++ REFLECTION | 2 +- php-pecl-xdebug.spec | 24 +++++-- 5 files changed, 121 insertions(+), 30 deletions(-) delete mode 100644 0001-skip-test-if-localhost-doesn-t-resolve-as-IPv6.patch create mode 100644 0001-zif_handler-exists-in-7.2.patch create mode 100644 PHPINFO diff --git a/0001-skip-test-if-localhost-doesn-t-resolve-as-IPv6.patch b/0001-skip-test-if-localhost-doesn-t-resolve-as-IPv6.patch deleted file mode 100644 index 66f11b8..0000000 --- a/0001-skip-test-if-localhost-doesn-t-resolve-as-IPv6.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 610c661364a443978729abbfd8fd62f3a36d22c7 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Tue, 3 Apr 2018 12:45:17 +0200 -Subject: [PATCH] skip test if localhost doesn't resolve as IPv6 - ---- - tests/bug00998-ipv6_localhost.phpt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/bug00998-ipv6_localhost.phpt b/tests/bug00998-ipv6_localhost.phpt -index fe471f7a..b6b2b51f 100644 ---- a/tests/bug00998-ipv6_localhost.phpt -+++ b/tests/bug00998-ipv6_localhost.phpt -@@ -6,6 +6,7 @@ if (getenv("SKIP_IPV6_TESTS")) { exit("skip Excluding IPv6 tests"); } - if (getenv("SKIP_DBGP_TESTS")) { exit("skip Excluding DBGp tests"); } - require 'dbgp/dbgpclient.php'; - if (!DebugClientIPv6::isSupported($errno, $errstr)) echo "skip IPv6 support is not configured. Error: $errstr, errno: $errno\n"; -+if (strstr(exec("getent ahostsv6 localhost"), '::1')===false) echo "skip localhost doesn't resolve as IPv6"; - ?> - --FILE-- - +Date: Fri, 21 Sep 2018 09:33:19 +0200 +Subject: [PATCH] zif_handler exists in 7.2 + +--- + xdebug_compat.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xdebug_compat.h b/xdebug_compat.h +index ac8741bb..938b7074 100644 +--- a/xdebug_compat.h ++++ b/xdebug_compat.h +@@ -75,7 +75,7 @@ zend_bool xdebug_zend_hash_apply_protection_end(HashTable* ht); + # define XDEBUG_ZEND_CONSTANT_MODULE_NUMBER(v) ((v)->module_number) + # endif + +-# if PHP_VERSION_ID < 70300 ++# if PHP_VERSION_ID < 70200 + typedef void (*zif_handler)(INTERNAL_FUNCTION_PARAMETERS); + # endif + +-- +2.14.4 + diff --git a/PHPINFO b/PHPINFO new file mode 100644 index 0000000..2719735 --- /dev/null +++ b/PHPINFO @@ -0,0 +1,76 @@ + +xdebug + +xdebug support => enabled +Version => 2.7.0beta1 +IDE Key => remi + +Supported protocols +DBGp - Common DeBuGger Protocol + +Directive => Local Value => Master Value +xdebug.auto_trace => Off => Off +xdebug.trace_enable_trigger => Off => Off +xdebug.trace_enable_trigger_value => no value => no value +xdebug.trace_output_dir => /tmp => /tmp +xdebug.trace_output_name => trace.%c => trace.%c +xdebug.trace_format => 0 => 0 +xdebug.trace_options => 0 => 0 +xdebug.coverage_enable => On => On +xdebug.collect_includes => On => On +xdebug.collect_params => 0 => 0 +xdebug.collect_return => Off => Off +xdebug.collect_vars => Off => Off +xdebug.collect_assignments => Off => Off +xdebug.default_enable => On => On +xdebug.extended_info => On => On +xdebug.file_link_format => no value => no value +xdebug.filename_format => no value => no value +xdebug.force_display_errors => Off => Off +xdebug.force_error_reporting => 0 => 0 +xdebug.halt_level => 0 => 0 +xdebug.max_nesting_level => 256 => 256 +xdebug.max_stack_frames => -1 => -1 +xdebug.overload_var_dump => 2 => 2 +xdebug.show_error_trace => Off => Off +xdebug.show_exception_trace => Off => Off +xdebug.show_local_vars => Off => Off +xdebug.show_mem_delta => Off => Off +xdebug.dump.COOKIE => no value => no value +xdebug.dump.ENV => no value => no value +xdebug.dump.FILES => no value => no value +xdebug.dump.GET => no value => no value +xdebug.dump.POST => no value => no value +xdebug.dump.REQUEST => no value => no value +xdebug.dump.SERVER => no value => no value +xdebug.dump.SESSION => no value => no value +xdebug.dump_globals => On => On +xdebug.dump_once => On => On +xdebug.dump_undefined => Off => Off +xdebug.profiler_enable => Off => Off +xdebug.profiler_output_dir => /tmp => /tmp +xdebug.profiler_output_name => cachegrind.out.%p => cachegrind.out.%p +xdebug.profiler_enable_trigger => Off => Off +xdebug.profiler_enable_trigger_value => no value => no value +xdebug.profiler_append => Off => Off +xdebug.profiler_aggregate => Off => Off +xdebug.remote_enable => Off => Off +xdebug.remote_handler => dbgp => dbgp +xdebug.remote_host => localhost => localhost +xdebug.remote_mode => req => req +xdebug.remote_port => 9000 => 9000 +xdebug.remote_autostart => Off => Off +xdebug.remote_connect_back => Off => Off +xdebug.remote_log => no value => no value +xdebug.idekey => no value => no value +xdebug.remote_cookie_expire_time => 3600 => 3600 +xdebug.remote_addr_header => no value => no value +xdebug.remote_timeout => 200 => 200 +xdebug.var_display_max_children => 128 => 128 +xdebug.var_display_max_data => 512 => 512 +xdebug.var_display_max_depth => 3 => 3 +xdebug.cli_color => 0 => 0 +xdebug.scream => Off => Off +xdebug.gc_stats_enable => Off => Off +xdebug.gc_stats_output_dir => /tmp => /tmp +xdebug.gc_stats_output_name => gcstats.%p => gcstats.%p diff --git a/REFLECTION b/REFLECTION index b116991..bfa0e6d 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #198 xdebug version 2.7.0alpha1 ] { +Extension [ extension #200 xdebug version 2.7.0beta1 ] { - INI { Entry [ xdebug.auto_trace ] diff --git a/php-pecl-xdebug.spec b/php-pecl-xdebug.spec index 584633b..b7aef95 100644 --- a/php-pecl-xdebug.spec +++ b/php-pecl-xdebug.spec @@ -19,12 +19,12 @@ %global pecl_name xdebug %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%global gh_commit 4981b8329b1fc1b84fb680d9f70737b860cbdcc1 +%global gh_commit a264af33ac6cea474bd155d3c2d346f6d9dc88ac %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20171202 %global with_tests 0%{!?_without_tests:1} %global upstream_version 2.7.0 -%global upstream_prever alpha1 +%global upstream_prever beta1 # XDebug should be loaded after opcache %global ini_name 15-%{pecl_name}.ini @@ -35,16 +35,16 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} %if 0%{?gh_date:1} Release: 0.8.%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %endif # The Xdebug License, version 1.01 # (Based on "The PHP License", version 3.0) License: BSD -URL: http://xdebug.org/ +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: 0001-skip-test-if-localhost-doesn-t-resolve-as-IPv6.patch +Patch0: 0001-zif_handler-exists-in-7.2.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 7 @@ -85,6 +85,10 @@ Obsoletes: php71w-pecl-%{pecl_name} <= %{version} Obsoletes: php72u-pecl-%{pecl_name} <= %{version} Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "7.3" +Obsoletes: php73u-pecl-%{pecl_name} <= %{version} +Obsoletes: php73w-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -112,6 +116,8 @@ Xdebug also provides: * code coverage analysis * capabilities to debug your scripts interactively with a debug client +Documentation: https://xdebug.org/docs/ + Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. @@ -154,6 +160,9 @@ cat << 'EOF' | tee %{ini_name} ; Enable xdebug extension module zend_extension=%{pecl_name}.so +; Configuration +; See https://xdebug.org/docs/all_settings + EOF sed -e '1d' NTS/%{pecl_name}.ini >>%{ini_name} @@ -291,6 +300,11 @@ fi %changelog +* Fri Sep 21 2018 Remi Collet - 2.7.0~beta1-1 +- update to 2.7.0beta1 +- add link to documentation in description and configuration file +- open https://github.com/xdebug/xdebug/pull/431 zif_handler in 7.2 + * Tue Apr 3 2018 Remi Collet - 2.7.0~alpha1-2 - test build for https://github.com/xdebug/xdebug/pull/419 -- cgit