Improvement of persistent option

Author: tersmitten

Model/Datasource/RedisSource.php

@@ -160,18 +160,18 @@ public function connect() {
  * @return bool True if connecting to the DataSource succeeds, else false
  */
 	protected function _connect() {
-		if ($this->config['unix_socket']) {
-			return $this->_connection->connect($this->config['unix_socket']);
-		} elseif (!$this->config['persistent']) {
-			return $this->_connection->connect(
-				$this->config['host'], $this->config['port'], $this->config['timeout']
-			);
+		$unixSocket = $this->config['unix_socket'];
+		$persistent = $this->config['persistent'];
+		$host = $this->config['host'];
+		$port = $this->config['port'];
+		$timeout = $this->config['timeout'];
+
+		if ($unixSocket) {
+			return $this->_connection->connect($unixSocket);
+		} elseif ($persistent) {
+			return $this->_connection->pconnect($host, $port, $timeout, $persistent);
 		} else {
-			$persistentId = crc32(serialize($this->config));
-
-			return $this->_connection->pconnect(
-				$this->config['host'], $this->config['port'], $this->config['timeout'], $persistentId
-			);
+			return $this->_connection->connect($host, $port, $timeout);
 		}
 	}
 

Test/Case/Model/Datasource/RedisSourceTest.php

@@ -258,8 +258,18 @@ public function testConnectUnixSocket() {
 		$Source = $this->getMockBuilder('TestRedisSource')->disableOriginalConstructor()->getMock();
 
 		$unixSocket = '/foo/bar';
+		$persistent = false;
+		$host = 'foo';
+		$port = 'bar';
+		$timeout = 0;
 
-		$Source->config = array('unix_socket' => $unixSocket);
+		$Source->config = array(
+			'unix_socket' => $unixSocket,
+			'persistent' => $persistent,
+			'host' => $host,
+			'port' => $port,
+			'timeout' => $timeout,
+		);
 		$Source->_connection = $this->getMock('Redis', array('connect'));
 
 		// Set expectations for connect calls