geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-08-31 04:35:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename URI parsing method of Predis\Connection\ConnectionParameters.

Browse Source
This commit is contained in:
Daniele Alessandri
2013-11-11 18:30:42 +01:00
parent acd29ec076
commit 321d2624ab
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Predis/Connection/ConnectionParameters.php
+4 -4
View File
@@ -35,7 +35,7 @@ class ConnectionParameters implements ConnectionParametersInterface
public function __construct($parameters = null)
{
if (is_string($parameters)) {
$parameters = self::parseURI($parameters);
$parameters = self::parse($parameters);
}
$this->parameters = $this->filter($parameters ?: array()) + $this->getDefaults();
@@ -101,12 +101,12 @@ class ConnectionParameters implements ConnectionParametersInterface
}
/**
* Parses an URI string and returns an array of connection parameters.
* Parses an URI string returning an array of connection parameters.
*
* @param string $uri Connection string.
* @param string $uri URI string.
* @return array
*/
public static function parseURI($uri)
public static function parse($uri)
{
if (stripos($uri, 'unix') === 0) {
// Hack to support URIs for UNIX sockets with minimal effort.
tests/Predis/Connection/ConnectionParametersTest.php
+3 -3
View File
@@ -136,7 +136,7 @@ class ParametersTest extends StandardTestCase
'persistent' => '1',
);
$this->assertSame($expected, ConnectionParameters::parseURI($uri));
$this->assertSame($expected, ConnectionParameters::parse($uri));
}
/**
@@ -154,7 +154,7 @@ class ParametersTest extends StandardTestCase
'persistent' => '1',
);
$this->assertSame($expected, ConnectionParameters::parseURI($uri));
$this->assertSame($expected, ConnectionParameters::parse($uri));
}
/**
@@ -164,7 +164,7 @@ class ParametersTest extends StandardTestCase
*/
public function testParsingURIThrowOnInvalidURI()
{
ConnectionParameters::parseURI('tcp://invalid:uri');
ConnectionParameters::parse('tcp://invalid:uri');
}
// ******************************************************************** //