From cb75c895871cc7e70d5049a78aad7c7b0d71f59b Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Fri, 14 Aug 2020 15:38:37 +0200
Subject: [PATCH] [6.x] Undeprecate Predis (#33872)

* Undeprecate Predis

* Proper predis versions

* Update composer.json
---
 composer.json                                                | 1 +
 src/Illuminate/Redis/Connections/PredisClusterConnection.php | 3 ---
 src/Illuminate/Redis/Connections/PredisConnection.php        | 1 -
 src/Illuminate/Redis/Connectors/PredisConnector.php          | 3 ---
 src/Illuminate/Redis/composer.json                           | 2 +-
 5 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 5f09147f5675..095f73bb0ac7 100644
--- a/composer.json
+++ b/composer.json
@@ -131,6 +131,7 @@
         "moontoast/math": "Required to use ordered UUIDs (^1.1).",
         "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
         "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
+        "predis/predis": "Required to use the predis connector (^1.1.2).",
         "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
         "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).",
         "symfony/cache": "Required to PSR-6 cache bridge (^4.3.4).",
diff --git a/src/Illuminate/Redis/Connections/PredisClusterConnection.php b/src/Illuminate/Redis/Connections/PredisClusterConnection.php
index 9097aa3a759d..399be1ea73aa 100644
--- a/src/Illuminate/Redis/Connections/PredisClusterConnection.php
+++ b/src/Illuminate/Redis/Connections/PredisClusterConnection.php
@@ -2,9 +2,6 @@
 
 namespace Illuminate\Redis\Connections;
 
-/**
- * @deprecated Predis is no longer maintained by its original author
- */
 class PredisClusterConnection extends PredisConnection
 {
     //
diff --git a/src/Illuminate/Redis/Connections/PredisConnection.php b/src/Illuminate/Redis/Connections/PredisConnection.php
index 67a9cc1163a3..665f328b0e9e 100644
--- a/src/Illuminate/Redis/Connections/PredisConnection.php
+++ b/src/Illuminate/Redis/Connections/PredisConnection.php
@@ -9,7 +9,6 @@
 
 /**
  * @mixin \Predis\Client
- * @deprecated Predis is no longer maintained by its original author
  */
 class PredisConnection extends Connection implements ConnectionContract
 {
diff --git a/src/Illuminate/Redis/Connectors/PredisConnector.php b/src/Illuminate/Redis/Connectors/PredisConnector.php
index 91e6f9ac69b8..e91e8956a398 100644
--- a/src/Illuminate/Redis/Connectors/PredisConnector.php
+++ b/src/Illuminate/Redis/Connectors/PredisConnector.php
@@ -8,9 +8,6 @@
 use Illuminate\Support\Arr;
 use Predis\Client;
 
-/**
- * @deprecated Predis is no longer maintained by its original author
- */
 class PredisConnector implements Connector
 {
     /**
diff --git a/src/Illuminate/Redis/composer.json b/src/Illuminate/Redis/composer.json
index 84dfa186bc9b..2fdce35b4f49 100755
--- a/src/Illuminate/Redis/composer.json
+++ b/src/Illuminate/Redis/composer.json
@@ -25,7 +25,7 @@
     },
     "suggest": {
         "ext-redis": "Required to use the phpredis connector (^4.0|^5.0).",
-        "predis/predis": "Required to use the predis connector (^1.0)."
+        "predis/predis": "Required to use the predis connector (^1.1.2)."
     },
     "extra": {
         "branch-alias": {