diff options
| -rw-r--r-- | 39bfab06c0c27dc620486f56a926308df5d4c819.patch | 76 | ||||
| -rw-r--r-- | 43bbf0080206b157b0d3f47ab1f07ede4bc80c86.patch | 93 | ||||
| -rw-r--r-- | REFLECTION | 16 | ||||
| -rw-r--r-- | php-pecl-memcached.spec | 18 |
4 files changed, 11 insertions, 192 deletions
diff --git a/39bfab06c0c27dc620486f56a926308df5d4c819.patch b/39bfab06c0c27dc620486f56a926308df5d4c819.patch deleted file mode 100644 index 9fd4f50..0000000 --- a/39bfab06c0c27dc620486f56a926308df5d4c819.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 39bfab06c0c27dc620486f56a926308df5d4c819 Mon Sep 17 00:00:00 2001 -From: Aaron Stone <aaron@serendipity.cx> -Date: Tue, 11 Jul 2017 15:57:51 -0700 -Subject: [PATCH] In PHP 7.2 the session_start() error messages have changed a - bit (#359) - -See PHP Bug 71038 for details https://bugs.php.net/bug.php?id=71038 -Added PHP 7.2.0alpha2 to Travis CI matrix ---- - .travis.yml | 3 ++- - package.xml | 1 + - tests/session_badconf_servers-php72.phpt | 30 ++++++++++++++++++++++++++++++ - tests/session_badconf_servers.phpt | 7 ++++--- - 4 files changed, 37 insertions(+), 4 deletions(-) - create mode 100644 tests/session_badconf_servers-php72.phpt - -diff --git a/tests/session_badconf_servers-php72.phpt b/tests/session_badconf_servers-php72.phpt -new file mode 100644 -index 0000000..9201236 ---- /dev/null -+++ b/tests/session_badconf_servers-php72.phpt -@@ -0,0 +1,30 @@ -+--TEST-- -+Session bad configurations, invalid save path (server list) -+--SKIPIF-- -+<?php -+include dirname(__FILE__) . "/skipif.inc"; -+if (!Memcached::HAVE_SESSION) print "skip"; -+if (PHP_VERSION_ID < 70200) print "skip"; -+?> -+--INI-- -+session.save_handler = memcached -+--FILE-- -+<?php -+include dirname (__FILE__) . '/config.inc'; -+ini_set ('session.save_path', MEMC_SERVER_HOST . ':' . MEMC_SERVER_PORT); -+ -+error_reporting(0); -+function handler($errno, $errstr) { -+ echo "$errstr\n"; -+} -+ -+set_error_handler('handler', E_ALL); -+ -+ini_set('memcached.sess_prefix', 'memc.sess.key.'); -+ini_set('session.save_path', ''); -+session_start(); -+session_write_close(); -+ -+--EXPECT-- -+session_start(): failed to parse session.save_path -+session_start(): Failed to initialize storage module: memcached (path: ) -diff --git a/tests/session_badconf_servers.phpt b/tests/session_badconf_servers.phpt -index b5c0803..57d7773 100644 ---- a/tests/session_badconf_servers.phpt -+++ b/tests/session_badconf_servers.phpt -@@ -1,9 +1,10 @@ - --TEST-- - Session bad configurations, invalid save path (server list) - --SKIPIF-- --<?php --include dirname(__FILE__) . "/skipif.inc"; -+<?php -+include dirname(__FILE__) . "/skipif.inc"; - if (!Memcached::HAVE_SESSION) print "skip"; -+if (PHP_VERSION_ID > 70100) print "skip"; - ?> - --INI-- - session.save_handler = memcached -@@ -24,5 +25,5 @@ ini_set('session.save_path', ''); - session_start(); - session_write_close(); - ----EXPECTF-- -+--EXPECT-- - session_start(): failed to parse session.save_path diff --git a/43bbf0080206b157b0d3f47ab1f07ede4bc80c86.patch b/43bbf0080206b157b0d3f47ab1f07ede4bc80c86.patch deleted file mode 100644 index 76b3845..0000000 --- a/43bbf0080206b157b0d3f47ab1f07ede4bc80c86.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 43bbf0080206b157b0d3f47ab1f07ede4bc80c86 Mon Sep 17 00:00:00 2001 -From: Aaron Stone <aaron@serendipity.cx> -Date: Fri, 7 Jul 2017 18:45:42 -0700 -Subject: [PATCH] In PHP 7.2, php_errormsg is deprecated - ---- - tests/append.phpt | 2 +- - tests/bad_construct.phpt | 2 +- - tests/experimental/fetch_badunserialize.phpt | 2 +- - tests/experimental/fetchall_badunserialize.phpt | 2 +- - tests/experimental/getdelayed_badunserialize.phpt | 2 +- - tests/experimental/getdelayed_cbthrows.phpt | 2 +- - tests/experimental/getmulti_badunserialize.phpt | 2 +- - tests/experimental/replace_bykey.phpt | 2 +- - tests/experimental/serializer/serializer_php_bad_serialize.phpt | 2 +- - tests/experimental/serializer/serializer_php_bad_unserialize.phpt | 2 +- - tests/experimental/setmulti_badserialize.phpt | 2 +- - tests/incrdecr.phpt | 8 ++++---- - tests/incrdecr_bykey.phpt | 8 ++++---- - 13 files changed, 19 insertions(+), 19 deletions(-) - -diff --git a/tests/append.phpt b/tests/append.phpt -index c463fde..b958b39 100644 ---- a/tests/append.phpt -+++ b/tests/append.phpt -@@ -11,7 +11,7 @@ error_reporting(0); - $m->delete('foo'); - $m->setOption(Memcached::OPT_COMPRESSION, true); - var_dump($m->append('foo', 'a')); --echo $php_errormsg, "\n"; -+echo error_get_last()["message"], "\n"; - - $m->setOption(Memcached::OPT_COMPRESSION, false); - $m->delete('foo'); -diff --git a/tests/bad_construct.phpt b/tests/bad_construct.phpt -index aa9b18c..0b740e0 100644 ---- a/tests/bad_construct.phpt -+++ b/tests/bad_construct.phpt -@@ -6,7 +6,7 @@ Memcached construct with bad arguments - <?php - - $m = new Memcached((object)array()); --echo $php_errormsg, "\n"; -+echo error_get_last()["message"], "\n"; - var_dump($m); - - class extended extends Memcached { -diff --git a/tests/incrdecr.phpt b/tests/incrdecr.phpt -index b4e9469..87b410c 100644 ---- a/tests/incrdecr.phpt -+++ b/tests/incrdecr.phpt -@@ -31,14 +31,14 @@ var_dump($m->get('foo')); - error_reporting(0); - - echo "Negative offset\n"; --$php_errormsg = ''; -+error_clear_last(); - $m->increment('foo', -1); --echo $php_errormsg, "\n"; -+echo error_get_last()["message"], "\n"; - var_dump($m->get('foo')); - --$php_errormsg = ''; -+error_clear_last(); - $m->decrement('foo', -1); --echo $php_errormsg, "\n"; -+echo error_get_last()["message"], "\n"; - var_dump($m->get('foo')); - - echo "Enormous offset\n"; -diff --git a/tests/incrdecr_bykey.phpt b/tests/incrdecr_bykey.phpt -index 8b931fa..ee08993 100644 ---- a/tests/incrdecr_bykey.phpt -+++ b/tests/incrdecr_bykey.phpt -@@ -28,14 +28,14 @@ var_dump($m->get('foo')); - error_reporting(0); - - echo "Negative offset\n"; --$php_errormsg = ''; -+error_clear_last(); - $m->incrementByKey('foo', 'foo', -1); --echo $php_errormsg, "\n"; -+echo error_get_last()["message"], "\n"; - var_dump($m->get('foo')); - --$php_errormsg = ''; -+error_clear_last(); - $m->decrementByKey('foo', 'foo', -1); --echo $php_errormsg, "\n"; -+echo error_get_last()["message"], "\n"; - var_dump($m->get('foo')); - - echo "Enormous offset\n"; @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #167 memcached version 3.0.3 ] { +Extension [ <persistent> extension #180 memcached version 3.0.4 ] { - Dependencies { Dependency [ session (Required) ] @@ -418,39 +418,35 @@ Extension [ <persistent> extension #167 memcached version 3.0.3 ] { Method [ <internal:memcached> public method append ] { - - Parameters [3] { + - Parameters [2] { Parameter #0 [ <required> $key ] Parameter #1 [ <required> $value ] - Parameter #2 [ <optional> $expiration ] } } Method [ <internal:memcached> public method appendByKey ] { - - Parameters [4] { + - Parameters [3] { Parameter #0 [ <required> $server_key ] Parameter #1 [ <required> $key ] Parameter #2 [ <required> $value ] - Parameter #3 [ <optional> $expiration ] } } Method [ <internal:memcached> public method prepend ] { - - Parameters [3] { + - Parameters [2] { Parameter #0 [ <required> $key ] Parameter #1 [ <required> $value ] - Parameter #2 [ <optional> $expiration ] } } Method [ <internal:memcached> public method prependByKey ] { - - Parameters [4] { + - Parameters [3] { Parameter #0 [ <required> $server_key ] Parameter #1 [ <required> $key ] Parameter #2 [ <required> $value ] - Parameter #3 [ <optional> $expiration ] } } @@ -623,7 +619,7 @@ Extension [ <persistent> extension #167 memcached version 3.0.3 ] { Method [ <internal:memcached> public method getStats ] { - Parameters [1] { - Parameter #0 [ <required> $args ] + Parameter #0 [ <optional> $type ] } } diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec index 92328f8..7d314f1 100644 --- a/php-pecl-memcached.spec +++ b/php-pecl-memcached.spec @@ -26,17 +26,14 @@ Summary: Extension to work with the Memcached caching daemon Name: %{?sub_prefix}php-pecl-memcached -Version: 3.0.3 -Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 3.0.4 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -Patch0: 43bbf0080206b157b0d3f47ab1f07ede4bc80c86.patch -Patch1: 39bfab06c0c27dc620486f56a926308df5d4c819.patch - BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-json @@ -85,18 +82,12 @@ Obsoletes: php53-pecl-%{pecl_name} <= %{version} Obsoletes: php53u-pecl-%{pecl_name} <= %{version} Obsoletes: php54-pecl-%{pecl_name} <= %{version} Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "5.5" Obsoletes: php55u-pecl-%{pecl_name} <= %{version} Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "5.6" Obsoletes: php56u-pecl-%{pecl_name} <= %{version} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.0" 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} @@ -137,8 +128,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -b .upstream -%patch1 -p1 -b .upstream %if %{with_fastlz} rm -r fastlz @@ -342,6 +331,9 @@ exit $ret %changelog +* Tue Nov 21 2017 Remi Collet <remi@remirepo.net> - 3.0.4-1 +- Update to 3.0.4 + * Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 3.0.3-5 - rebuild for PHP 7.2.0beta1 new API |