Skip to content

Commit 5cf122a

Browse files
vladvildanovvladvildanov
committed
Updated RESP3 modules responses
1 parent e2fea6d commit 5cf122a

21 files changed

+64
-28
lines changed

‎.github/workflows/stack.yml

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ jobs:
3232
- '8.1'
3333
- '8.2'
3434
redis:
35-
- latest
3635
- edge
3736

3837
steps:

‎tests/Predis/Command/Redis/Json/JSONARRAPPEND_Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public function testAppendItemsToGivenJsonArrayResp3(): void
102102
$actualResponse = $redis->jsonarrappend('key', '$.key2', '"value3"');
103103

104104
$this->assertSame([3], $actualResponse);
105-
$this->assertSame([['{"key1":"value1","key2":["value1","value2","value3"]}']], $redis->jsonget('key'));
105+
$this->assertSame('[{"key1":"value1","key2":["value1","value2","value3"]}]', $redis->jsonget('key'));
106106
}
107107

108108
public function jsonProvider(): array

‎tests/Predis/Command/Redis/Json/JSONARRINSERT_Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public function testInsertElementIntoJsonArrayBeforeGivenIndexResp3(): void
104104
$actualResponse = $redis->jsonarrinsert('key', '$.key2', 1, '"value2"');
105105

106106
$this->assertSame([3], $actualResponse);
107-
$this->assertSame([['{"key1":"value1","key2":["value1","value2","value3"]}']], $redis->jsonget('key'));
107+
$this->assertSame('[{"key1":"value1","key2":["value1","value2","value3"]}]', $redis->jsonget('key'));
108108
}
109109

110110
public function jsonProvider(): array

‎tests/Predis/Command/Redis/Json/JSONARRPOP_Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function testRemovesElementFromIndexOfJsonArrayResp3(): void
100100
$actualResponse = $redis->jsonarrpop('key', '$.key2', -1);
101101

102102
$this->assertSame(['"value2"'], $actualResponse);
103-
$this->assertSame([['{"key1":"value1","key2":["value1"]}']], $redis->jsonget('key'));
103+
$this->assertSame('[{"key1":"value1","key2":["value1"]}]', $redis->jsonget('key'));
104104
}
105105

106106
public function jsonProvider(): array

‎tests/Predis/Command/Redis/Json/JSONARRTRIM_Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public function testCorrectlyTrimGivenJsonArrayResp3(): void
102102
$actualResponse = $redis->jsonarrtrim('key', '$.key2', 1, 4);
103103

104104
$this->assertSame([4], $actualResponse);
105-
$this->assertSame([['{"key1":"value1","key2":[2,3,4,5]}']], $redis->jsonget('key'));
105+
$this->assertSame('[{"key1":"value1","key2":[2,3,4,5]}]', $redis->jsonget('key'));
106106
}
107107

108108
public function jsonProvider(): array

‎tests/Predis/Command/Redis/Json/JSONCLEAR_Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function testClearValuesOnArraysAndObjectsResp3(): void
9898
$actualResponse = $redis->jsonclear('key', '$.key2');
9999

100100
$this->assertSame(1, $actualResponse);
101-
$this->assertSame([['{"key1":"value1","key2":[]}']], $redis->jsonget('key'));
101+
$this->assertSame('[{"key1":"value1","key2":[]}]', $redis->jsonget('key'));
102102
}
103103

104104
public function jsonProvider(): array

‎tests/Predis/Command/Redis/Json/JSONDEL_Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function testDeletesPathsAtKeyFromGivenJsonStringResp3(): void
9898
$actualResponse = $redis->jsondel('key', '$.key2');
9999

100100
$this->assertSame(1, $actualResponse);
101-
$this->assertSame([['{"key1":"value1"}']], $redis->jsonget('key'));
101+
$this->assertSame('[{"key1":"value1"}]', $redis->jsonget('key'));
102102
}
103103

104104
public function jsonProvider(): array

‎tests/Predis/Command/Redis/Json/JSONFORGET_Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function testDeletesPathsAtKeyFromGivenJsonStringResp3(): void
9898
$actualResponse = $redis->jsonforget('key', '$.key2');
9999

100100
$this->assertSame(1, $actualResponse);
101-
$this->assertSame([['{"key1":"value1"}']], $redis->jsonget('key'));
101+
$this->assertSame('[{"key1":"value1"}]', $redis->jsonget('key'));
102102
}
103103

104104
public function jsonProvider(): array

‎tests/Predis/Command/Redis/Json/JSONGET_Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public function testReturnsCorrectJsonResponseResp3(): void
9494

9595
$redis->jsonset('key', '$', '{"key1":"value1","key2":"value2"}');
9696
$this->assertSame(
97-
[['{"key1":"value1","key2":"value2"}']],
97+
'[{"key1":"value1","key2":"value2"}]',
9898
$redis->jsonget('key')
9999
);
100100
}

‎tests/Predis/Command/Redis/Json/JSONOBJKEYS_Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function testReturnsKeysForGivenJsonObjectResp3(): void
9292

9393
$redis->jsonset('key', '$', '{"key1":"value1","key2":"value2"}');
9494

95-
$this->assertSame(['key1', 'key2'], $redis->jsonobjkeys('key'));
95+
$this->assertSame([['key1', 'key2']], $redis->jsonobjkeys('key'));
9696
}
9797

9898
public function jsonProvider(): array

‎tests/Predis/Command/Redis/Json/JSONOBJLEN_Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function testReturnsLengthOfGivenJsonObjectResp3(): void
9292

9393
$redis->jsonset('key', '$', '{"key1":"value1","key2":"value2"}');
9494

95-
$this->assertSame(2, $redis->jsonobjlen('key'));
95+
$this->assertSame([2], $redis->jsonobjlen('key'));
9696
}
9797

9898
public function jsonProvider(): array

‎tests/Predis/Command/Redis/Json/JSONSET_Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public function testSetCorrectJsonValueAndReturnsCorrespondingResponseResp3(): v
9797

9898
$this->assertEquals('OK', $redis->jsonset('key', '$', '{"key1":"value1","key2":"value2"}'));
9999
$this->assertEquals('OK', $redis->jsonset('key', '$', '{"key3":"value3"}'));
100-
$this->assertSame([['{"key3":"value3"}']], $redis->jsonget('key'));
100+
$this->assertSame('[{"key3":"value3"}]', $redis->jsonget('key'));
101101
}
102102

103103
/**

‎tests/Predis/Command/Redis/Json/JSONSTRAPPEND_Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function testAppendStringToExistingJsonStringResp3(): void
100100
$actualResponse = $redis->jsonstrappend('key', '$.key2', '"foo"');
101101

102102
$this->assertSame([9], $actualResponse);
103-
$this->assertSame([['{"key1":"value1","key2":"value2foo"}']], $redis->jsonget('key'));
103+
$this->assertSame('[{"key1":"value1","key2":"value2foo"}]', $redis->jsonget('key'));
104104
}
105105

106106
public function jsonProvider(): array

‎tests/Predis/Command/Redis/Json/JSONTOGGLE_Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function testToggleChangesBooleanValueToOppositeResp3(): void
9898
$actualResponse = $redis->jsontoggle('key', '$.key1');
9999

100100
$this->assertSame([0], $actualResponse);
101-
$this->assertSame([['{"key1":false}']], $redis->jsonget('key'));
101+
$this->assertSame('[{"key1":false}]', $redis->jsonget('key'));
102102
}
103103

104104
public function jsonProvider(): array

‎tests/Predis/Command/Redis/Search/FTAGGREGATE_Test.php

+13-6
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,19 @@ public function testReturnsAggregatedSearchResultWithGivenModifiersResp3(): void
122122
{
123123
$redis = $this->getResp3Client();
124124
$expectedResponse = [
125-
2,
126-
[
127-
'country', 'Ukraine', 'birth', '1995', 'country_birth_Vlad_count', '2',
128-
],
129-
[
130-
'country', 'Israel', 'birth', '1994', 'country_birth_Vlad_count', '1',
125+
'attributes' => [],
126+
'error' => [],
127+
'total_results' => 2,
128+
'format' => 'STRING',
129+
'results' => [
130+
[
131+
'extra_attributes' => ['country' => 'Ukraine', 'birth' => '1995', 'country_birth_Vlad_count' => '2'],
132+
'values' => [],
133+
],
134+
[
135+
'extra_attributes' => ['country' => 'Israel', 'birth' => '1994', 'country_birth_Vlad_count' => '1'],
136+
'values' => [],
137+
],
131138
],
132139
];
133140

‎tests/Predis/Command/Redis/Search/FTCONFIG_Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public function testGetReturnsGivenRediSearchConfigurationParameterResp3(): void
133133
{
134134
$redis = $this->getResp3Client();
135135

136-
$this->assertEquals([['MAXEXPANSIONS', '200']], $redis->ftconfig->get('MAXEXPANSIONS'));
136+
$this->assertEquals(['MAXEXPANSIONS' => '200'], $redis->ftconfig->get('MAXEXPANSIONS'));
137137
$this->assertEmpty($redis->ftconfig->get('foobar'));
138138
}
139139

‎tests/Predis/Command/Redis/Search/FTCURSOR_Test.php

+21-3
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,28 @@ public function testReadAggregatedResultsFromExistingCursorResp3(): void
145145

146146
$expectedResponse = [
147147
[
148-
'country', 'Ukraine', 'birth', '1995', 'country_birth_Vlad_count', '2',
148+
'attributes' => [],
149+
'error' => [],
150+
'total_results' => 2,
151+
'format' => 'STRING',
152+
'results' => [
153+
[
154+
'extra_attributes' => ['country' => 'Ukraine', 'birth' => '1995', 'country_birth_Vlad_count' => '2'],
155+
'values' => [],
156+
],
157+
],
149158
],
150159
[
151-
'country', 'Israel', 'birth', '1994', 'country_birth_Vlad_count', '1',
160+
'attributes' => [],
161+
'error' => [],
162+
'total_results' => 0,
163+
'format' => 'STRING',
164+
'results' => [
165+
[
166+
'extra_attributes' => ['country' => 'Israel', 'birth' => '1994', 'country_birth_Vlad_count' => '1'],
167+
'values' => [],
168+
],
169+
],
152170
],
153171
];
154172

@@ -184,7 +202,7 @@ public function testReadAggregatedResultsFromExistingCursorResp3(): void
184202
$actualResponse = [];
185203

186204
while ($cursor) {
187-
$actualResponse[] = $response[1];
205+
$actualResponse[] = $response;
188206
[$response, $cursor] = $redis->ftcursor->read('idx', $cursor);
189207
}
190208

‎tests/Predis/Command/Redis/Search/FTINFO_Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public function testInfoReturnsInformationAboutGivenIndexResp3(): void
105105
$this->assertEquals('OK', $createResponse);
106106

107107
$actualResponse = $redis->ftinfo('index');
108-
$this->assertEquals('index', $actualResponse[1]);
108+
$this->assertEquals('index', $actualResponse['index_name']);
109109
}
110110

111111
/**

‎tests/Predis/Command/Redis/Search/FTSEARCH_Test.php

+9-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,15 @@ public function testSearchValuesByHashIndex(): void
131131
public function testSearchValuesByHashIndexResp3(): void
132132
{
133133
$redis = $this->getResp3Client();
134-
$expectedResponse = [1, 'doc:1', ['should_return', 'value1']];
134+
$expectedResponse = [
135+
'attributes' => [],
136+
'error' => [],
137+
'total_results' => 1,
138+
'format' => 'STRING',
139+
'results' => [
140+
['id' => 'doc:1', 'extra_attributes' => ['should_return' => 'value1'], 'values' => []],
141+
],
142+
];
135143

136144
$hashResponse = $redis->hmset('doc:1', 'field1', 'value1', 'field2', 'value2');
137145
$this->assertEquals('OK', $hashResponse);

‎tests/Predis/Command/Redis/Search/FTSPELLCHECK_Test.php

+5-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,11 @@ public function testSpellcheckReturnsPossibleSuggestionsToGivenMisspelledTerm():
9494
public function testSpellcheckReturnsPossibleSuggestionsToGivenMisspelledTermResp3(): void
9595
{
9696
$redis = $this->getResp3Client();
97-
$expectedResponse = [['TERM', 'held', [[0.0, 'hello'], [0.0, 'help']]]];
97+
$expectedResponse = [
98+
'results' => [
99+
'held' => [['hello' => 0.0], ['help' => 0.0]],
100+
],
101+
];
98102

99103
$this->assertEquals('OK', $redis->ftcreate(
100104
'index',

‎tests/Predis/Command/Redis/Search/FTSYNDUMP_Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function testDumpReturnsContentOfSynonymGroupFromGivenIndex(): void
9191
public function testDumpReturnsContentOfSynonymGroupFromGivenIndexResp3(): void
9292
{
9393
$redis = $this->getResp3Client();
94-
$expectedResponse = ['term1', ['synonym1'], 'term2', ['synonym1']];
94+
$expectedResponse = ['term1' => ['synonym1'], 'term2' => ['synonym1']];
9595

9696
$this->assertEquals(
9797
'OK',

0 commit comments

Comments
 (0)