Ver Fonte

Rename the 'throw_on_error' client option to 'throw_errors'.

Daniele Alessandri há 14 anos atrás
pai
commit
237f3e3d7e
2 ficheiros alterados com 4 adições e 6 exclusões
  1. 2 4
      lib/Predis.php
  2. 2 2
      test/PredisClientFeatures.php

+ 2 - 4
lib/Predis.php

@@ -71,7 +71,7 @@ class Client {
         $connection = self::newConnection($parameters);
         $protocol = $connection->getProtocol();
         $protocol->setOption('iterable_multibulk', $options->iterable_multibulk);
-        $protocol->setOption('throw_on_error', $options->throw_on_error);
+        $protocol->setOption('throw_errors', $options->throw_errors);
         $this->pushInitCommands($connection);
 
         $callback = $this->_options->on_connection_initialized;
@@ -1000,7 +1000,7 @@ class ClientOptions {
             'profile' => new Options\ClientProfile(),
             'key_distribution' => new Options\ClientKeyDistribution(),
             'iterable_multibulk' => new Options\ClientIterableMultiBulk(),
-            'throw_on_error' => new Options\ClientThrowOnError(),
+            'throw_errors' => new Options\ClientThrowOnError(),
             'on_connection_initialized' => new Options\CustomOption(array(
                 'validate' => function($value) {
                     if (isset($value) && is_callable($value)) {
@@ -1663,7 +1663,6 @@ class TextProtocol implements IRedisProtocol {
                 $this->_mbiterable = (bool) $value;
                 break;
             case 'throw_errors':
-            case 'throw_on_error':
                 $this->_throwErrors = (bool) $value;
                 break;
         }
@@ -1694,7 +1693,6 @@ class ComposableTextProtocol implements IRedisProtocolExtended {
                 $this->_reader->setHandler(TextProtocol::PREFIX_MULTI_BULK, $handler);
                 break;
             case 'throw_errors':
-            case 'throw_on_error':
                 $handler = $value ? new ResponseErrorHandler() : new ResponseErrorSilentHandler();
                 $this->_reader->setHandler(TextProtocol::PREFIX_ERROR, $handler);
                 break;

+ 2 - 2
test/PredisClientFeatures.php

@@ -457,7 +457,7 @@ class PredisClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
     function testCommandPipeline_ServerExceptionInCallableBlock() {
         $client = RC::getConnection();
         $client->flushdb();
-        $client->getConnection()->getProtocol()->setOption('throw_on_error', false);
+        $client->getConnection()->getProtocol()->setOption('throw_errors', false);
 
         $replies = $client->pipeline(function($pipe) {
             $pipe->set('foo', 'bar');
@@ -579,7 +579,7 @@ class PredisClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
     function testMultiExecContext_ServerExceptionInCallableBlock() {
         $client = RC::getConnection();
         $client->flushdb();
-        $client->getConnection()->getProtocol()->setOption('throw_on_error', false);
+        $client->getConnection()->getProtocol()->setOption('throw_errors', false);
 
         $replies = $client->multiExec(function($multi) {
             $multi->set('foo', 'bar');