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

Rename server profile classes to comply with how underscores are interpreted in the PSR-0 standard.

Browse Source
This commit is contained in:
Daniele Alessandri
2011-02-27 13:37:03 +01:00
parent 9fcdc73499
commit fda4f32f06
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Predis/Commands/Keys_v1_2.php → lib/Predis/Commands/KeysV12x.php
+1 -1
View File
@@ -2,7 +2,7 @@
namespace Predis\Commands;
class Keys_v1_2 extends Keys {
class KeysV12x extends Keys {
public function parseResponse($data) {
return explode(' ', $data);
}
lib/Predis/Profiles/ServerProfile.php
+5 -5
View File
@@ -24,11 +24,11 @@ abstract class ServerProfile implements IServerProfile {
private static function getDefaultProfiles() {
return array(
'1.2' => '\Predis\Profiles\Server_v1_2',
'2.0' => '\Predis\Profiles\Server_v2_0',
'2.2' => '\Predis\Profiles\Server_v2_2',
'default' => '\Predis\Profiles\Server_v2_2',
'dev' => '\Predis\Profiles\Server_vNext',
'1.2' => '\Predis\Profiles\ServerVersion12',
'2.0' => '\Predis\Profiles\ServerVersion20',
'2.2' => '\Predis\Profiles\ServerVersion22',
'default' => '\Predis\Profiles\ServerVersion22',
'dev' => '\Predis\Profiles\ServerVersionNext',
);
}
lib/Predis/Profiles/Server_v1_2.php → lib/Predis/Profiles/ServerVersion12.php
+2 -2
View File
@@ -2,7 +2,7 @@
namespace Predis\Profiles;
class Server_v1_2 extends ServerProfile {
class ServerVersion12 extends ServerProfile {
public function getVersion() { return '1.2'; }
public function getSupportedCommands() {
return array(
@@ -31,7 +31,7 @@ class Server_v1_2 extends ServerProfile {
'type' => '\Predis\Commands\Type',
/* commands operating on the key space */
'keys' => '\Predis\Commands\Keys_v1_2',
'keys' => '\Predis\Commands\KeysV12x',
'randomkey' => '\Predis\Commands\RandomKey',
'rename' => '\Predis\Commands\Rename',
'renamenx' => '\Predis\Commands\RenamePreserve',
lib/Predis/Profiles/Server_v2_0.php → lib/Predis/Profiles/ServerVersion20.php
+1 -1
View File
@@ -2,7 +2,7 @@
namespace Predis\Profiles;
class Server_v2_0 extends Server_v1_2 {
class ServerVersion20 extends ServerVersion12 {
public function getVersion() { return '2.0'; }
public function getSupportedCommands() {
return array_merge(parent::getSupportedCommands(), array(
lib/Predis/Profiles/Server_v2_2.php → lib/Predis/Profiles/ServerVersion22.php
+1 -1
View File
@@ -2,7 +2,7 @@
namespace Predis\Profiles;
class Server_v2_2 extends Server_v2_0 {
class ServerVersion22 extends ServerVersion20 {
public function getVersion() { return '2.2'; }
public function getSupportedCommands() {
return array_merge(parent::getSupportedCommands(), array(
lib/Predis/Profiles/Server_vNext.php → lib/Predis/Profiles/ServerVersionNext.php
+1 -1
View File
@@ -2,6 +2,6 @@
namespace Predis\Profiles;
class Server_vNext extends Server_v2_2 {
class ServerVersionNext extends ServerVersion22 {
public function getVersion() { return 'DEV'; }
}
test/PredisFeaturesTest.php
+4 -4
View File
@@ -102,10 +102,10 @@ class PredisClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
/* Predis\Profiles\ServerProfile and derivates */
function testServerProfile_GetSpecificVersions() {
$this->assertType('\Predis\Profiles\Server_v1_2', \Predis\Profiles\ServerProfile::get('1.2'));
$this->assertType('\Predis\Profiles\Server_v2_0', \Predis\Profiles\ServerProfile::get('2.0'));
$this->assertType('\Predis\Profiles\Server_v2_2', \Predis\Profiles\ServerProfile::get('2.2'));
$this->assertType('\Predis\Profiles\Server_vNext', \Predis\Profiles\ServerProfile::get('dev'));
$this->assertType('\Predis\Profiles\ServerVersion12', \Predis\Profiles\ServerProfile::get('1.2'));
$this->assertType('\Predis\Profiles\ServerVersion20', \Predis\Profiles\ServerProfile::get('2.0'));
$this->assertType('\Predis\Profiles\ServerVersion22', \Predis\Profiles\ServerProfile::get('2.2'));
$this->assertType('\Predis\Profiles\ServerVersionNext', \Predis\Profiles\ServerProfile::get('dev'));
$this->assertType('\Predis\Profiles\ServerProfile', \Predis\Profiles\ServerProfile::get('default'));
$this->assertEquals(\Predis\Profiles\ServerProfile::get('default'), \Predis\Profiles\ServerProfile::getDefault());
}