From 64119bb4a04fc0980dced1a3e330c85ee2ab652e Mon Sep 17 00:00:00 2001 From: Daniele Alessandri Date: Thu, 1 Dec 2011 08:43:34 +0100 Subject: [PATCH] Do not use different methods to initialize socket for the PhpiredisConnection. --- lib/Predis/Network/PhpiredisConnection.php | 43 ++++------------------ 1 file changed, 8 insertions(+), 35 deletions(-) diff --git a/lib/Predis/Network/PhpiredisConnection.php b/lib/Predis/Network/PhpiredisConnection.php index 6aa4d2cf..75982271 100644 --- a/lib/Predis/Network/PhpiredisConnection.php +++ b/lib/Predis/Network/PhpiredisConnection.php @@ -172,47 +172,20 @@ class PhpiredisConnection extends ConnectionBase { $parameters = $this->parameters; - $initializer = array($this, "{$parameters->scheme}SocketInitializer"); - $socket = call_user_func($initializer, $parameters); + $isUnix = $this->parameters->scheme === 'unix'; + $domain = $isUnix ? AF_UNIX : AF_INET; + $protocol = $isUnix ? 0 : SOL_TCP; + + $socket = @call_user_func('socket_create', $domain, SOCK_STREAM, $protocol); + if (!is_resource($socket)) { + $this->emitSocketError(); + } $this->setSocketOptions($socket, $parameters); return $socket; } - /** - * Initializes a TCP socket resource. - * - * @param IConnectionParameters $parameters Parameters used to initialize the connection. - * @return resource - */ - private function tcpSocketInitializer(IConnectionParameters $parameters) - { - $socket = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP); - if (!is_resource($socket)) { - $this->emitSocketError(); - } - - return $socket; - } - - /** - * Initializes a UNIX socket resource. - * - * @param IConnectionParameters $parameters Parameters used to initialize the connection. - * @return resource - */ - private function unixSocketInitializer(IConnectionParameters $parameters) - { - $socket = @socket_create(AF_UNIX, SOCK_STREAM, 0); - - if (!is_resource($socket)) { - $this->emitSocketError(); - } - - return $socket; - } - /** * Sets options on the socket resource from the connection parameters. *