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

Removed the setOption and getOption methods from ResponseReader as their implementation was clumsy.

Browse Source
This commit is contained in:
Daniele Alessandri
2010-04-10 19:10:20 +02:00
parent c8509dd068
commit c89e222fd2
1 changed files with 10 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Predis.php
+10 -40
View File
@@ -73,11 +73,17 @@ class Client {
$this->_options = self::filterClientOptions($options);
$this->setProfile($this->_options->profile);
if ($this->_options->iterable_multibulk) {
$this->_responseReader->setOption('iterable_multibulk_replies', true);
if ($this->_options->iterable_multibulk === true) {
$this->_responseReader->setHandler(
ResponseReader::PREFIX_MULTI_BULK,
new ResponseMultiBulkStreamHandler()
);
}
if (!$this->_options->throw_on_error) {
$this->_responseReader->setOption('error_throw_exception', false);
if ($this->_options->throw_on_error === false) {
$this->_responseReader->setHandler(
ResponseReader::PREFIX_ERROR,
new ResponseErrorSilentHandler()
);
}
}
@@ -552,42 +558,6 @@ class ResponseReader {
}
}
public function setOption($option, $value) {
switch ($option) {
case 'iterable_multibulk_replies':
case 'iterableMultiBulkReplies':
$this->setHandler(self::PREFIX_MULTI_BULK, $value == true
? new ResponseMultiBulkStreamHandler()
: new ResponseMultiBulkHandler()
);
break;
case 'errorThrowException':
case 'error_throw_exception':
$this->setHandler(self::PREFIX_ERROR, $value == true
? new ResponseErrorHandler()
: new ResponseErrorSilentHandler()
);
break;
default:
throw new \InvalidArgumentException("Unknown option: $option");
}
}
public function getOption($option) {
switch ($option) {
case 'iterable_multibulk_replies':
case 'iterableMultiBulkReplies':
return $this->_prefixHandlers[self::PREFIX_MULTI_BULK]
instanceof ResponseMultiBulkStreamHandler;
case 'errorThrowException':
case 'error_throw_exception':
return $this->_prefixHandlers[self::PREFIX_ERROR]
instanceof ResponseErrorHandler;
default:
throw new \InvalidArgumentException("Unknown option: $option");
}
}
public function read(Connection $connection) {
$header = $connection->readLine();
if ($header === '') {