Skip to content

Commit d414c4f

Browse files
cheprasovcheprasov
committed
v1.2.2
1 parent 3c7188c commit d414c4f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+383
-137
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
## CHANGELOG
22

3+
### v1.2.2 (2016-03-30)
4+
- Fixed annotations and phpDocs.
5+
- Fixed some tests.
6+
7+
### v1.2.1 (2016-03-04)
8+
- Fixed some cluster commands (Redis >= 3.0): __CLUSTER COUNT-FAILURE-REPORTS__ and __CLUSTER SAVECONFIG__.
9+
310
### v1.2.0 (2016-01-30)
411
- Updated command __MIGRATE__ (Redis >= 3.2): many fixes to the variable number of arguments (new) mode using the KEYS option.
512

‎tests/Build/VersionTest.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ public function test_version() {
2323

2424
$readme = file('./README.md');
2525
$this->assertSame(true, strpos($readme[3], 'RedisClient v'.$composer['version']) > 0);
26+
27+
$readme = file('./CHANGELOG.md');
28+
$this->assertSame(true, strpos($readme[2], '### v'.$composer['version']) === 0);
2629
}
2730

2831
}

‎tests/Integration/Version2x6/PipelineTest.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
use RedisClient\Pipeline\Pipeline;
1616
use RedisClient\Pipeline\PipelineInterface;
1717

18+
19+
/**
20+
* @see \RedisClient\Pipeline\Version\Pipeline2x6
21+
*/
1822
class PipelineTest extends \PHPUnit_Framework_TestCase {
1923

2024
const TEST_REDIS_SERVER_1 = TEST_REDIS_SERVER_2x6_1;

‎tests/Integration/Version2x6/PubSubCommandsTest.php‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111
namespace Test\Integration\Version2x6;
1212

1313
use RedisClient\Client\Version\RedisClient2x6;
14-
use RedisClient\Exception\ErrorResponseException;
1514

1615
/**
17-
* @see PubSubCommandsTrait
16+
* @see \RedisClient\Command\Traits\Version2x6\PubSubCommandsTrait
1817
*/
1918
class PubSubCommandsTest extends \PHPUnit_Framework_TestCase {
2019

@@ -59,8 +58,8 @@ protected function setUp() {
5958
}
6059

6160
/**
62-
* @see PubSubCommandsTrait::subscribe
63-
* @see PubSubCommandsTrait::unsubscribe
61+
* @see \RedisClient\Command\Traits\Version2x6\PubSubCommandsTrait::subscribe
62+
* @see \RedisClient\Command\Traits\Version2x6\PubSubCommandsTrait::unsubscribe
6463
*/
6564
public function test_subscribe_and_unsubscribe() {
6665
$Redis = static::$Redis;
@@ -99,8 +98,8 @@ function($type, $channel, $message) use ($Redis2, $time, &$messages, &$posts) {
9998
}
10099

101100
/**
102-
* @see PubSubCommandsTrait::psubscribe
103-
* @see PubSubCommandsTrait::punsubscribe
101+
* @see \RedisClient\Command\Traits\Version2x6\PubSubCommandsTrait::psubscribe
102+
* @see \RedisClient\Command\Traits\Version2x6\PubSubCommandsTrait::punsubscribe
104103
*/
105104
public function test_psubscribe_and_punsubscribe() {
106105
$Redis = static::$Redis;

‎tests/Integration/Version2x6/ScriptingCommandsTest.php‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use RedisClient\Exception\ErrorResponseException;
1515

1616
/**
17-
* @see ScriptingCommandsTrait
17+
* @see \RedisClient\Command\Traits\Version2x6\ScriptingCommandsTrait
1818
*/
1919
class ScriptingCommandsTest extends \PHPUnit_Framework_TestCase {
2020

@@ -51,6 +51,9 @@ protected function setUp() {
5151
static::$Redis->scriptFlush();
5252
}
5353

54+
/**
55+
* @see \RedisClient\Command\Traits\Version2x6\ScriptingCommandsTrait::evalScript
56+
*/
5457
public function test_evalScript() {
5558
$Redis = static::$Redis;
5659

@@ -68,6 +71,9 @@ public function test_evalScript() {
6871
}
6972
}
7073

74+
/**
75+
* @see \RedisClient\Command\Traits\Version2x6\ScriptingCommandsTrait::eval
76+
*/
7177
public function test_eval() {
7278
$Redis = static::$Redis;
7379

@@ -85,6 +91,9 @@ public function test_eval() {
8591
}
8692
}
8793

94+
/**
95+
* @see \RedisClient\Command\Traits\Version2x6\ScriptingCommandsTrait::evalsha
96+
*/
8897
public function test_evalsha() {
8998
$Redis = static::$Redis;
9099

@@ -105,6 +114,9 @@ public function test_evalsha() {
105114
$this->assertSame([], $Redis->evalsha(sha1($script)));
106115
}
107116

117+
/**
118+
* @see \RedisClient\Command\Traits\Version2x6\ScriptingCommandsTrait::scriptexists
119+
*/
108120
public function test_scriptexists() {
109121
$Redis = static::$Redis;
110122

@@ -125,6 +137,9 @@ public function test_scriptexists() {
125137
$this->assertSame([0], $Redis->scriptExists($script3));
126138
}
127139

140+
/**
141+
* @see \RedisClient\Command\Traits\Version2x6\ScriptingCommandsTrait::scriptflush
142+
*/
128143
public function test_scriptflush() {
129144
$Redis = static::$Redis;
130145

@@ -141,6 +156,9 @@ public function test_scriptflush() {
141156
$this->assertSame([0, 0, 0], $Redis->scriptExists([sha1($script1), sha1($script2), sha1($script3)]));
142157
}
143158

159+
/**
160+
* @see \RedisClient\Command\Traits\Version2x6\ScriptingCommandsTrait::scriptkill
161+
*/
144162
public function test_scriptkill() {
145163
$Redis = static::$Redis;
146164

@@ -155,6 +173,9 @@ public function test_scriptkill() {
155173
}
156174
}
157175

176+
/**
177+
* @see \RedisClient\Command\Traits\Version2x6\ScriptingCommandsTrait::scriptload
178+
*/
158179
public function test_scriptload() {
159180
$Redis = static::$Redis;
160181

‎tests/Integration/Version2x6/ServerCommandsTest.php‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use RedisClient\Exception\ErrorResponseException;
1515

1616
/**
17-
* @see ServerCommandsTrait
17+
* @see \RedisClient\Command\Traits\Version2x6\ServerCommandsTrait
1818
*/
1919
class ServerCommandsTest extends \PHPUnit_Framework_TestCase {
2020

@@ -60,7 +60,7 @@ protected function setUp() {
6060
}
6161

6262
/**
63-
* @see ServerCommandsTrait::bgrewriteaof
63+
* @see \RedisClient\Command\Traits\Version2x6\ServerCommandsTrait::bgrewriteaof
6464
*/
6565
public function _test_bgrewriteaof() {
6666
$Redis = static::$Redis;
@@ -75,7 +75,7 @@ public function _test_bgrewriteaof() {
7575
}
7676

7777
/**
78-
* @see ServerCommandsTrait::bgsave
78+
* @see \RedisClient\Command\Traits\Version2x6\ServerCommandsTrait::bgsave
7979
*/
8080
public function _test_bgsave() {
8181
$Redis = static::$Redis;
@@ -90,7 +90,7 @@ public function _test_bgsave() {
9090
}
9191

9292
/**
93-
* @see ServerCommandsTrait::clientGetname
93+
* @see \RedisClient\Command\Traits\Version2x6\ServerCommandsTrait::clientGetname
9494
*/
9595
public function test_clientGetname() {
9696
$Redis = static::$Redis;
@@ -101,7 +101,7 @@ public function test_clientGetname() {
101101
}
102102

103103
/**
104-
* @see ServerCommandsTrait::clientList
104+
* @see \RedisClient\Command\Traits\Version2x6\ServerCommandsTrait::clientList
105105
*/
106106
public function test_clientList() {
107107
$Redis = static::$Redis;
@@ -112,7 +112,7 @@ public function test_clientList() {
112112
}
113113

114114
/**
115-
* @see ServerCommandsTrait::configGet
115+
* @see \RedisClient\Command\Traits\Version2x6\ServerCommandsTrait::configGet
116116
*/
117117
public function test_configGet() {
118118
$Redis = static::$Redis;
@@ -123,7 +123,7 @@ public function test_configGet() {
123123
}
124124

125125
/**
126-
* @see ServerCommandsTrait::configResetstat
126+
* @see \RedisClient\Command\Traits\Version2x6\ServerCommandsTrait::configResetstat
127127
*/
128128
public function test_configResetstat() {
129129
$Redis = static::$Redis;
@@ -132,7 +132,7 @@ public function test_configResetstat() {
132132
}
133133

134134
/**
135-
* @see ServerCommandsTrait::dbsize
135+
* @see \RedisClient\Command\Traits\Version2x6\ServerCommandsTrait::dbsize
136136
*/
137137
public function test_dbsize() {
138138
$Redis = static::$Redis;
@@ -145,7 +145,7 @@ public function test_dbsize() {
145145
}
146146

147147
/**
148-
* @see ServerCommandsTrait::debugObject
148+
* @see \RedisClient\Command\Traits\Version2x6\ServerCommandsTrait::debugObject
149149
*/
150150
public function test_debugObject() {
151151
$Redis = static::$Redis;
@@ -155,7 +155,7 @@ public function test_debugObject() {
155155
}
156156

157157
/**
158-
* @see ServerCommandsTrait::flushall
158+
* @see \RedisClient\Command\Traits\Version2x6\ServerCommandsTrait::flushall
159159
*/
160160
public function test_flushall() {
161161
$Redis = static::$Redis;
@@ -164,7 +164,7 @@ public function test_flushall() {
164164
}
165165

166166
/**
167-
* @see ServerCommandsTrait::flushdb
167+
* @see \RedisClient\Command\Traits\Version2x6\ServerCommandsTrait::flushdb
168168
*/
169169
public function test_flushdb() {
170170
$Redis = static::$Redis;
@@ -173,7 +173,7 @@ public function test_flushdb() {
173173
}
174174

175175
/**
176-
* @see ServerCommandsTrait::info
176+
* @see \RedisClient\Command\Traits\Version2x6\ServerCommandsTrait::info
177177
*/
178178
public function test_info() {
179179
$Redis = static::$Redis;
@@ -209,7 +209,7 @@ public function test_info() {
209209
}
210210

211211
/**
212-
* @see ServerCommandsTrait::info
212+
* @see \RedisClient\Command\Traits\Version2x6\ServerCommandsTrait::info
213213
*/
214214
public function test_lastsave() {
215215
$Redis = static::$Redis;
@@ -219,16 +219,15 @@ public function test_lastsave() {
219219
}
220220

221221
/**
222-
* @see ServerCommandsTrait::monitor
222+
* @see \RedisClient\Command\Traits\Version2x6\ServerCommandsTrait::monitor
223223
*/
224224
public function _test_monitor() {
225225
$Redis = static::$Redis;
226-
227226
$this->assertSame(true, $Redis->monitor());
228227
}
229228

230229
/**
231-
* @see ServerCommandsTrait::save
230+
* @see \RedisClient\Command\Traits\Version2x6\ServerCommandsTrait::save
232231
*/
233232
public function test_save() {
234233
$Redis = static::$Redis;
@@ -237,7 +236,7 @@ public function test_save() {
237236
}
238237

239238
/**
240-
* @see ServerCommandsTrait::slowlog
239+
* @see \RedisClient\Command\Traits\Version2x6\ServerCommandsTrait::slowlog
241240
*/
242241
public function _test_showlog() {
243242
$Redis = static::$Redis;
@@ -246,7 +245,7 @@ public function _test_showlog() {
246245
}
247246

248247
/**
249-
* @see ServerCommandsTrait::time
248+
* @see \RedisClient\Command\Traits\Version2x6\ServerCommandsTrait::time
250249
*/
251250
public function test_time() {
252251
$Redis = static::$Redis;

0 commit comments

Comments
 (0)