Merge branch '6.x' into 7.x

laravel · Aug 14, 2020 · 8f22cab · 8f22cab
2 parents c17b6a1 + cb75c89
commit 8f22cab
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -139,6 +139,7 @@
         "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
         "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
         "phpunit/phpunit": "Required to use assertions and run tests (^8.4|^9.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 (^5.0).",

diff --git 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
@@ -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
@@ -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
@@ -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": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,9 +2,6 @@ @@
     namespace Illuminate\Redis\Connections;
-    /**
-     * @deprecated Predis is no longer maintained by its original author
-     */
     class PredisClusterConnection extends PredisConnection
     {
         //
@@ Expand Down @@