geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-10-13 07:18:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

More code styling changes.

Browse Source
This commit is contained in:
Daniele Alessandri
2012-07-27 12:23:25 +02:00
parent 6c732c737b
commit 55a3fd65a2
75 changed files with 260 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Predis/Connection/StreamConnection.php
+12 -14
View File
@@ -78,8 +78,8 @@ class StreamConnection extends AbstractConnection
private function tcpStreamInitializer(ConnectionParametersInterface $parameters)
{
$uri = "tcp://{$parameters->host}:{$parameters->port}/";
$flags = STREAM_CLIENT_CONNECT;
if (isset($parameters->async_connect) && $parameters->async_connect === true) {
$flags |= STREAM_CLIENT_ASYNC_CONNECT;
}
@@ -87,9 +87,7 @@ class StreamConnection extends AbstractConnection
$flags |= STREAM_CLIENT_PERSISTENT;
}
$resource = @stream_socket_client(
$uri, $errno, $errstr, $parameters->timeout, $flags
);
$resource = @stream_socket_client($uri, $errno, $errstr, $parameters->timeout, $flags);
if (!$resource) {
$this->onConnectionError(trim($errstr), $errno);
@@ -115,15 +113,13 @@ class StreamConnection extends AbstractConnection
private function unixStreamInitializer(ConnectionParametersInterface $parameters)
{
$uri = "unix://{$parameters->path}";
$flags = STREAM_CLIENT_CONNECT;
if ($parameters->persistent === true) {
$flags |= STREAM_CLIENT_PERSISTENT;
}
$resource = @stream_socket_client(
$uri, $errno, $errstr, $parameters->timeout, $flags
);
$resource = @stream_socket_client($uri, $errno, $errstr, $parameters->timeout, $flags);
if (!$resource) {
$this->onConnectionError(trim($errstr), $errno);
@@ -151,7 +147,6 @@ class StreamConnection extends AbstractConnection
{
if ($this->isConnected()) {
fclose($this->getResource());
parent::disconnect();
}
}
@@ -181,12 +176,14 @@ class StreamConnection extends AbstractConnection
while (($length = strlen($buffer)) > 0) {
$written = fwrite($socket, $buffer);
if ($length === $written) {
return;
}
if ($written === false || $written === 0) {
$this->onConnectionError('Error while writing bytes to the server');
}
$buffer = substr($buffer, $written);
}
}
@@ -196,8 +193,8 @@ class StreamConnection extends AbstractConnection
*/
public function read() {
$socket = $this->getResource();
$chunk = fgets($socket);
if ($chunk === false || $chunk === '') {
$this->onConnectionError('Error while reading line from the server');
}
@@ -229,11 +226,11 @@ class StreamConnection extends AbstractConnection
do {
$chunk = fread($socket, min($bytesLeft, 4096));
if ($chunk === false || $chunk === '') {
$this->onConnectionError(
'Error while reading bytes from the server'
);
$this->onConnectionError('Error while reading bytes from the server');
}
$bulkData .= $chunk;
$bytesLeft = $size - strlen($bulkData);
} while ($bytesLeft > 0);
@@ -242,15 +239,16 @@ class StreamConnection extends AbstractConnection
case '*': // multi bulk
$count = (int) $payload;
if ($count === -1) {
return null;
}
if ($this->mbiterable === true) {
return new MultiBulkResponseSimple($this, $count);
}
$multibulk = array();
for ($i = 0; $i < $count; $i++) {
$multibulk[$i] = $this->read();
}