Skip to content

Commit 8f22cab

Browse files
Merge branch '6.x' into 7.x
2 parents c17b6a1 + cb75c89 commit 8f22cab

File tree

5 files changed

+2
-8
lines changed

5 files changed

+2
-8
lines changed

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
"nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
140140
"pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
141141
"phpunit/phpunit": "Required to use assertions and run tests (^8.4|^9.0).",
142+
"predis/predis": "Required to use the predis connector (^1.1.2).",
142143
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
143144
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).",
144145
"symfony/cache": "Required to PSR-6 cache bridge (^5.0).",

src/Illuminate/Redis/Connections/PredisClusterConnection.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
namespace Illuminate\Redis\Connections;
44

5-
/**
6-
* @deprecated Predis is no longer maintained by its original author
7-
*/
85
class PredisClusterConnection extends PredisConnection
96
{
107
//

src/Illuminate/Redis/Connections/PredisConnection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
/**
1111
* @mixin \Predis\Client
12-
* @deprecated Predis is no longer maintained by its original author
1312
*/
1413
class PredisConnection extends Connection implements ConnectionContract
1514
{

src/Illuminate/Redis/Connectors/PredisConnector.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
use Illuminate\Support\Arr;
99
use Predis\Client;
1010

11-
/**
12-
* @deprecated Predis is no longer maintained by its original author
13-
*/
1411
class PredisConnector implements Connector
1512
{
1613
/**

src/Illuminate/Redis/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"suggest": {
2727
"ext-redis": "Required to use the phpredis connector (^4.0|^5.0).",
28-
"predis/predis": "Required to use the predis connector (^1.0)."
28+
"predis/predis": "Required to use the predis connector (^1.1.2)."
2929
},
3030
"extra": {
3131
"branch-alias": {

0 commit comments

Comments
 (0)