From 807f4dd96a20dea491d3c62aeb8a9556bf9155b7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 31 Aug 2021 08:09:06 +0200 Subject: update to 2.2.0RC1 --- msgpack-php81.patch | 134 ---------------------------------------------------- 1 file changed, 134 deletions(-) delete mode 100644 msgpack-php81.patch (limited to 'msgpack-php81.patch') 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 -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 -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]); - } - } - -- cgit