diff options
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | msgpack-php81.patch | 134 | ||||
| -rw-r--r-- | php-pecl-msgpack.spec | 13 |
4 files changed, 8 insertions, 143 deletions
@@ -3,7 +3,7 @@ msgpack MessagePack Support => enabled Session Support => enabled -extension Version => 2.1.2 +extension Version => 2.2.0RC1 header Version => 3.2.0 Directive => Local Value => Master Value @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #87 msgpack version 2.1.2 ] { +Extension [ <persistent> extension #87 msgpack version 2.2.0RC1 ] { - INI { Entry [ msgpack.error_display <ALL> ] diff --git a/msgpack-php81.patch b/msgpack-php81.patch deleted file mode 100644 index c036e03..0000000 --- a/msgpack-php81.patch +++ /dev/null @@ -1,134 +0,0 @@ -From fff660a6f85b69e5dfe090f767cad13531d4ce3e Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Thu, 10 Jun 2021 10:15:13 +0200 -Subject: [PATCH] Fix The Serializable interface is deprecated... - ---- - tests/021.phpt | 8 ++++++++ - tests/031.phpt | 8 ++++++++ - tests/042.phpt | 8 ++++++++ - 3 files changed, 24 insertions(+) - -diff --git a/tests/021.phpt b/tests/021.phpt -index 137d100..c5cb364 100644 ---- a/tests/021.phpt -+++ b/tests/021.phpt -@@ -38,6 +38,14 @@ class Obj implements Serializable { - $tmp = unpack('N*', $serialized); - $this->__construct($tmp[1], $tmp[2]); - } -+ -+ public function __serialize() { -+ return $this->serialize(); -+ } -+ -+ public function __unserialize($serialized) { -+ return $this->unserialize(); -+ } - } - - $o = new Obj(1, 2); -diff --git a/tests/031.phpt b/tests/031.phpt -index ce3a7c4..f178851 100644 ---- a/tests/031.phpt -+++ b/tests/031.phpt -@@ -46,6 +46,14 @@ class Obj implements Serializable { - throw new Exception("exception in unserialize $c"); - } - } -+ -+ public function __serialize() { -+ return $this->serialize(); -+ } -+ -+ public function __unserialize($serialized) { -+ return $this->unserialize(); -+ } - } - - $a = new Obj(1, 0); -diff --git a/tests/042.phpt b/tests/042.phpt -index 83e8bc7..4717a18 100644 ---- a/tests/042.phpt -+++ b/tests/042.phpt -@@ -23,6 +23,14 @@ class Foo implements Serializable { - public function unserialize($str) { - echo "Should not be run.\n"; - } -+ -+ public function __serialize() { -+ return $this->serialize(); -+ } -+ -+ public function __unserialize($serialized) { -+ return $this->unserialize(); -+ } - } - - $array = array($closure, new Foo()); - -From be01bccf1ddeeb1ef09722bf869c75c463e22bcb Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Fri, 11 Jun 2021 17:36:31 +0200 -Subject: [PATCH] proper implementation for __(un)serializ magic methods - ---- - tests/021.phpt | 4 ++-- - tests/031.phpt | 4 ++-- - tests/042.phpt | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/tests/021.phpt b/tests/021.phpt -index c5cb364..e498382 100644 ---- a/tests/021.phpt -+++ b/tests/021.phpt -@@ -40,11 +40,11 @@ class Obj implements Serializable { - } - - public function __serialize() { -- return $this->serialize(); -+ return [$this->serialize()]; - } - - public function __unserialize($serialized) { -- return $this->unserialize(); -+ return $this->unserialize($serialized[0]); - } - } - -diff --git a/tests/031.phpt b/tests/031.phpt -index f178851..f149305 100644 ---- a/tests/031.phpt -+++ b/tests/031.phpt -@@ -48,11 +48,11 @@ class Obj implements Serializable { - } - - public function __serialize() { -- return $this->serialize(); -+ return [$this->serialize()]; - } - - public function __unserialize($serialized) { -- return $this->unserialize(); -+ return $this->unserialize($serialized[0]); - } - } - -diff --git a/tests/042.phpt b/tests/042.phpt -index 4717a18..3c71e9d 100644 ---- a/tests/042.phpt -+++ b/tests/042.phpt -@@ -25,11 +25,11 @@ class Foo implements Serializable { - } - - public function __serialize() { -- return $this->serialize(); -+ return [$this->serialize()]; - } - - public function __unserialize($serialized) { -- return $this->unserialize(); -+ return $this->unserialize($serialized[0]); - } - } - diff --git a/php-pecl-msgpack.spec b/php-pecl-msgpack.spec index 75e4a1f..d771f3d 100644 --- a/php-pecl-msgpack.spec +++ b/php-pecl-msgpack.spec @@ -23,9 +23,9 @@ %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global ini_name 40-%{pecl_name}.ini -%global upstream_version 2.1.2 -#global upstream_prever beta1 -#global upstream_lower beta1 +%global upstream_version 2.2.0 +%global upstream_prever RC1 +%global upstream_lower RC1 %if 0 %global with_msgpack 1 @@ -46,8 +46,6 @@ Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_V Source: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz %endif -Patch0: %{pecl_name}-php81.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.0 @@ -130,8 +128,6 @@ mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS -%patch0 -p1 - %if %{with_msgpack} # use system library rm -rf msgpack @@ -281,6 +277,9 @@ fi %changelog +* Tue Aug 31 2021 Remi Collet <remi@remirepo.net> - 2.2.0~RC1-1 +- update to 2.2.0RC1 + * Thu Jun 10 2021 Remi Collet <remi@remirepo.net> - 2.1.2-3 - add patch for test suite with PHP 8.1 from https://github.com/msgpack/msgpack-php/pull/156 |