Merge pull request #160 from Xon/php8.1

php8.1 compat fix for socket connection strings & phpredis

.gitignore

@@ -2,3 +2,4 @@
 vendor
 phpunit.phar
 phpunit_*.log
+/.phpunit.result.cache

Client.php

@@ -201,7 +201,7 @@ class Credis_Client {
 
  /**
  * Port on which the Redis server is running
- * @var integer
+ * @var integer|null
  */
  protected $port;
 
@@ -358,7 +358,7 @@ public function getHost()
  }
  /**
  * Return the port of the Redis instance
- * @return int
+ * @return int|null
  */
  public function getPort()
  {
@@ -474,8 +474,8 @@ public function connect()
  try
  {
  $result = $this->persistent
- ? $this->redis->pconnect($this->host, $this->port, $socketTimeout, $this->persistent)
- : $this->redis->connect($this->host, $this->port, $socketTimeout);
+ ? $this->redis->pconnect($this->host, (int)$this->port, $socketTimeout, $this->persistent)
+ : $this->redis->connect($this->host, (int)$this->port, $socketTimeout);
  }
  catch(Exception $e)
  {

composer.json

@@ -11,7 +11,10 @@
  }
  ],
  "require": {
- "php": ">=5.4.0"
+ "php": ">=5.6.0"
+ },
+ "suggest": {
+ "ext-redis": "Improved performance for communicating with redis"
  },
  "autoload": {
  "classmap": [

tests/CredisStandaloneTest.php

@@ -6,19 +6,6 @@ class CredisStandaloneTest extends CredisTest
 {
  protected $useStandalone = TRUE;
 
- /**
- * @group UnixSocket
- */
- public function testInvalidPersistentConnectionOnUnixSocket()
- {
- $this->credis->close();
- $this->credis = new Credis_Client('unix://'.realpath(__DIR__).'/redis.sock',0,null,'persistent');
- $this->credis->forceStandalone();
- //$this->setExpectedException('CredisException','Persistent connections to UNIX sockets are not supported in standalone mode.');
- $this->credis->connect();
- $this->assertTrue($this->credis->isConnected());
- }
-
  public function testPersistentConnectionsOnStandAloneTcpConnection()
  {
  $this->credis->close();

tests/CredisTest.php

@@ -679,11 +679,12 @@ public function testConnectionStringsTls()
  */
  public function testConnectionStringsSocket()
  {
- $this->credis = new Credis_Client(realpath(__DIR__).'/redis.sock',0,null,'persistent');
+ $this->credis = new Credis_Client(realpath(__DIR__).'/redis.sock');
  if ($this->useStandalone) {
  $this->credis->forceStandalone();
  }
  $this->credis->connect();
+ $this->assertTrue($this->credis->isConnected());
  $this->credis->set('key','value');
  $this->assertEquals('value',$this->credis->get('key'));
  }
@@ -708,6 +709,9 @@ public function testInvalidTlsConnectionString()
  }
  }
 
+ /**
+ * @group UnixSocket
+ */
  public function testInvalidUnixSocketConnectionString()
  {
  $this->credis->close();