summaryrefslogtreecommitdiffstats
path: root/468.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-01-18 16:59:44 +0100
committerRemi Collet <remi@remirepo.net>2021-01-18 16:59:44 +0100
commitf2b045e6df0a7734146cc15b1215c1de0f44d0e4 (patch)
tree5200f5cefbb0314c0d87aa165e9ad68b5e570fe8 /468.patch
parentf9a74f77ea1bdce93dfe19fae9edd141bfe23b9b (diff)
more patches for PHP 8 from
https://github.com/php-memcached-dev/php-memcached/pull/465 https://github.com/php-memcached-dev/php-memcached/pull/467 https://github.com/php-memcached-dev/php-memcached/pull/468 https://github.com/php-memcached-dev/php-memcached/pull/469 https://github.com/php-memcached-dev/php-memcached/pull/472 https://github.com/php-memcached-dev/php-memcached/pull/473
Diffstat (limited to '468.patch')
-rw-r--r--468.patch70
1 files changed, 70 insertions, 0 deletions
diff --git a/468.patch b/468.patch
new file mode 100644
index 0000000..1b52707
--- /dev/null
+++ b/468.patch
@@ -0,0 +1,70 @@
+From d5b084479c74c33e054612fc6e7f969b6bab359e Mon Sep 17 00:00:00 2001
+From: Graham Campbell <GrahamCampbell@users.noreply.github.com>
+Date: Thu, 17 Dec 2020 17:20:08 +0000
+Subject: [PATCH 1/3] Fixed ParseError in stub file
+
+---
+ php_memcached.stub.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/php_memcached.stub.php b/php_memcached.stub.php
+index e44ff4a..e813ae7 100644
+--- a/php_memcached.stub.php
++++ b/php_memcached.stub.php
+@@ -17,7 +17,7 @@ public function get(string $key, callable $cache_cb=NULL, int $get_flags=0): mix
+ public function getByKey(string $server_key, string $key, callable $cache_cb=NULL, int $get_flags=0): mixed {}
+ public function getMulti(array $keys, int $get_flags=0): false|array {}
+ public function getMultiByKey(string $server_key, array $keys, int $get_flags=0): false|array {}
+- public function getDelayed(array $keys, bool $with_cas=0, callable $value_cb=NULL): bool {}
++ public function getDelayed(array $keys, bool $with_cas=FALSE, callable $value_cb=NULL): bool {}
+ public function getDelayedByKey(string $server_key, array $keys, bool $with_cas=0, callable $value_cb=NULL): bool {}
+ public function fetch(): false|array {}
+ public function fetchAll(): false|array {}
+
+From 015d7c6705a2b0b26d539939cf792b4ef99c431a Mon Sep 17 00:00:00 2001
+From: Graham Campbell <GrahamCampbell@users.noreply.github.com>
+Date: Thu, 17 Dec 2020 17:22:33 +0000
+Subject: [PATCH 2/3] Update php_memcached.stub.php
+
+---
+ php_memcached.stub.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/php_memcached.stub.php b/php_memcached.stub.php
+index e813ae7..836dff7 100644
+--- a/php_memcached.stub.php
++++ b/php_memcached.stub.php
+@@ -18,7 +18,7 @@ public function getByKey(string $server_key, string $key, callable $cache_cb=NUL
+ public function getMulti(array $keys, int $get_flags=0): false|array {}
+ public function getMultiByKey(string $server_key, array $keys, int $get_flags=0): false|array {}
+ public function getDelayed(array $keys, bool $with_cas=FALSE, callable $value_cb=NULL): bool {}
+- public function getDelayedByKey(string $server_key, array $keys, bool $with_cas=0, callable $value_cb=NULL): bool {}
++ public function getDelayedByKey(string $server_key, array $keys, bool $with_cas=FALSE, callable $value_cb=NULL): bool {}
+ public function fetch(): false|array {}
+ public function fetchAll(): false|array {}
+
+
+From fafaf7fc6533cc5d48d784d0d2661338ab81b4c0 Mon Sep 17 00:00:00 2001
+From: Graham Campbell <graham@alt-three.com>
+Date: Thu, 17 Dec 2020 17:24:51 +0000
+Subject: [PATCH 3/3] Match PHP 7 version of the file
+
+---
+ php_memcached.stub.php | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/php_memcached.stub.php b/php_memcached.stub.php
+index 836dff7..6b84c5b 100644
+--- a/php_memcached.stub.php
++++ b/php_memcached.stub.php
+@@ -17,8 +17,8 @@ public function get(string $key, callable $cache_cb=NULL, int $get_flags=0): mix
+ public function getByKey(string $server_key, string $key, callable $cache_cb=NULL, int $get_flags=0): mixed {}
+ public function getMulti(array $keys, int $get_flags=0): false|array {}
+ public function getMultiByKey(string $server_key, array $keys, int $get_flags=0): false|array {}
+- public function getDelayed(array $keys, bool $with_cas=FALSE, callable $value_cb=NULL): bool {}
+- public function getDelayedByKey(string $server_key, array $keys, bool $with_cas=FALSE, callable $value_cb=NULL): bool {}
++ public function getDelayed(array $keys, bool $with_cas=NULL, callable $value_cb=NULL): bool {}
++ public function getDelayedByKey(string $server_key, array $keys, bool $with_cas=NULL, callable $value_cb=NULL): bool {}
+ public function fetch(): false|array {}
+ public function fetchAll(): false|array {}
+