From 62cf943fecc5182c6329b332df43cf28012cef55 Mon Sep 17 00:00:00 2001
From: Pavlo Yatsukhnenko <yatsukhnenko@gmail.com>
Date: Sun, 22 Oct 2023 19:16:41 +0300
Subject: [PATCH] 6.0.2

---
 CHANGELOG.md |  2 ++
 package.xml  | 51 +++++++++++++++++++++++++++++++++++++++------------
 php_redis.h  |  2 +-
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa1793b..ddeba96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and PhpRedis adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [Unreleased]
 
+## [6.0.2] - 2023-10-22 ([GitHub](https://github.com/phpredis/phpredis/releases/6.0.2), [PECL](https://pecl.php.net/package/redis/6.0.2))
+
 ### Sponsors :sparkling_heart:
 
 - [Audiomack](https://audiomack.com)
diff --git a/package.xml b/package.xml
index 66a738a..332dab5 100644
--- a/package.xml
+++ b/package.xml
@@ -27,9 +27,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <email>n.favrefelix@gmail.com</email>
   <active>no</active>
  </lead>
- <date>2023-09-23</date>
+ <date>2023-10-22</date>
  <version>
-  <release>6.0.1</release>
+  <release>6.0.2</release>
   <api>6.0.0</api>
  </version>
  <stability>
@@ -53,19 +53,15 @@ http://pear.php.net/dtd/package-2.0.xsd">
 
     ---
 
-    phpredis 6.0.1
-
-    This release contains fix for unknown expiration modifier issue
-    as well as memory leak and segfault in exec function
-    and small documentation improvements.
+    phpredis 6.0.2
 
+    This release contains fixes for OBJECT, PSUBSCRIBE and SCAN commands.
     You can find a detailed list of changes in CHANGELOG.md and package.xml
     or by inspecting the git commit logs.
 
-    * Fix  memory leak and segfault in Redis::exec [362e1141] (Pavlo Yatsukhnenko), (Markus Podar)
-    * Fix unknown expiration modifier [264c0c7e, 95bd184b] (Pavlo Yatsukhnenko)
-    * Update documentation [3674d663, 849bedb6, 1ad95b63] (Till Kruss), (Joost OrangeJuiced)
-
+    * Fix deprecation error when passing null to match_type parameter.[b835aaa3] (Pavlo Yatsukhnenko) 
+    * Fix flaky test and OBJECT in a pipeline. [a7f51f70] (Michael Grunder)
+    * Find our callback by pattern with PSUBSCRIBE [2f276dcd] (Michael Grunder)
  </notes>
  <contents>
   <dir name="/">
@@ -159,7 +155,38 @@ http://pear.php.net/dtd/package-2.0.xsd">
  <changelog>
  <release>
    <stability><release>stable</release><api>stable</api></stability>
-   <version><release>6.0.1</release><api>6.0.1</api></version>
+   <version><release>6.0.2</release><api>6.0.0</api></version>
+   <date>2023-10-22</date>
+   <notes>
+    --- Sponsors ---
+
+    Audiomack - https://audiomack.com
+    Open LMS - https://openlms.net
+    BlueHost - https://bluehost.com
+    Object Cache Pro for WordPress - https://objectcache.pro
+    Avtandil Kikabidze - https://github.com/akalongman
+    Zaher Ghaibeh - https://github.com/zaherg
+    BatchLabs - https://batch.com
+    Stackhero - https://github.com/stackhero-io
+    Florian Levis - https://github.com/Gounlaf
+    Luis Zarate - https://github.com/jlzaratec
+
+    ---
+
+    phpredis 6.0.2
+
+    This release contains fixes for OBJECT, PSUBSCRIBE and SCAN commands.
+    You can find a detailed list of changes in CHANGELOG.md and package.xml
+    or by inspecting the git commit logs.
+
+    * Fix deprecation error when passing null to match_type parameter.[b835aaa3] (Pavlo Yatsukhnenko) 
+    * Fix flaky test and OBJECT in a pipeline. [a7f51f70] (Michael Grunder)
+    * Find our callback by pattern with PSUBSCRIBE [2f276dcd] (Michael Grunder)
+   </notes>
+ </release>
+ <release>
+   <stability><release>stable</release><api>stable</api></stability>
+   <version><release>6.0.1</release><api>6.0.0</api></version>
    <date>2023-09-23</date>
    <notes>
     --- Sponsors ---
diff --git a/php_redis.h b/php_redis.h
index 3f03883..d9f4dda 100644
--- a/php_redis.h
+++ b/php_redis.h
@@ -23,7 +23,7 @@
 #define PHP_REDIS_H
 
 /* phpredis version */
-#define PHP_REDIS_VERSION "6.0.1"
+#define PHP_REDIS_VERSION "6.0.2"
 
 /* For convenience we store the salt as a printable hex string which requires 2
  * characters per byte + 1 for the NULL terminator */