geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-09-19 14:56:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove previously deprecated Predis\Helpers class.

Browse Source
This commit is contained in:
Daniele Alessandri
2013-11-08 12:13:37 +01:00
parent 089b972def
commit 9a72b98c4a
2 changed files with 0 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Predis/Helpers.php
-73
View File
@@ -1,73 +0,0 @@
<?php
/*
* This file is part of the Predis package.
*
* (c) Daniele Alessandri <suppakilla@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Predis;
/**
* Defines a few helper methods.
*
* @author Daniele Alessandri <suppakilla@gmail.com>
* @deprecated Deprecated since v0.8.3.
*/
class Helpers
{
/**
* Offers a generic and reusable method to handle exceptions generated by
* a connection object.
*
* @deprecated Deprecated since v0.8.3 - moved in Predis\CommunicationException::handle()
* @param CommunicationException $exception Exception.
*/
public static function onCommunicationException(CommunicationException $exception)
{
if ($exception->shouldResetConnection()) {
$connection = $exception->getConnection();
if ($connection->isConnected()) {
$connection->disconnect();
}
}
throw $exception;
}
/**
* Normalizes the arguments array passed to a Redis command.
*
* @deprecated Deprecated since v0.8.3 - moved in Predis\Command\AbstractCommand::normalizeArguments()
* @param array $arguments Arguments for a command.
* @return array
*/
public static function filterArrayArguments(Array $arguments)
{
if (count($arguments) === 1 && is_array($arguments[0])) {
return $arguments[0];
}
return $arguments;
}
/**
* Normalizes the arguments array passed to a variadic Redis command.
*
* @deprecated Deprecated since v0.8.3 - moved in Predis\Command\AbstractCommand::normalizeVariadic()
* @param array $arguments Arguments for a command.
* @return array
*/
public static function filterVariadicValues(Array $arguments)
{
if (count($arguments) === 2 && is_array($arguments[1])) {
return array_merge(array($arguments[0]), $arguments[1]);
}
return $arguments;
}
}
tests/Predis/HelpersTest.php
-70
View File
@@ -1,70 +0,0 @@
<?php
/*
* This file is part of the Predis package.
*
* (c) Daniele Alessandri <suppakilla@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Predis;
use \PHPUnit_Framework_TestCase as StandardTestCase;
/**
*
*/
class HelpersTest extends StandardTestCase
{
/**
* @group disconnected
*/
public function testOnCommunicationException()
{
$this->setExpectedException('Predis\CommunicationException');
$connection = $this->getMock('Predis\Connection\SingleConnectionInterface');
$connection->expects($this->once())->method('isConnected')->will($this->returnValue(true));
$connection->expects($this->once())->method('disconnect');
$exception = $this->getMockForAbstractClass('Predis\CommunicationException', array($connection));
Helpers::onCommunicationException($exception);
}
/**
* @group disconnected
*/
public function testFilterArrayArguments()
{
$arguments = array('arg1', 'arg2', 'arg3', 'arg4');
$this->assertSame($arguments, Helpers::filterArrayArguments($arguments));
$this->assertSame($arguments, Helpers::filterArrayArguments(array($arguments)));
$arguments = array(array(), array());
$this->assertSame($arguments, Helpers::filterArrayArguments($arguments));
$arguments = array(new \stdClass());
$this->assertSame($arguments, Helpers::filterArrayArguments($arguments));
}
/**
* @group disconnected
*/
public function testFilterVariadicValues()
{
$arguments = array('key', 'value1', 'value2', 'value3');
$this->assertSame($arguments, Helpers::filterVariadicValues($arguments));
$this->assertSame($arguments, Helpers::filterVariadicValues(array('key', array('value1', 'value2', 'value3'))));
$arguments = array(array(), array());
$this->assertSame($arguments, Helpers::filterArrayArguments($arguments));
$arguments = array(new \stdClass());
$this->assertSame($arguments, Helpers::filterArrayArguments($arguments));
}
}