Skip to content

Commit 31e65f7

Browse files
bors[bot]meili-botbrunoocasali
authored
Merge #183
183: Changes related to the next Meilisearch release (v0.28.0) r=brunoocasali a=meili-bot This PR gathers the changes related to the next Meilisearch release (v0.28.0) so that this package is ready when the official release is out. ⚠️ This PR should NOT be merged until: - the next release of Meilisearch (v0.28.0) is out. - the [`meilisearch-php`](https://github.com/meilisearch/meilisearch-php) dependency has been released to be compatible with Meilisearch v0.28.0. Once the release is out, the upgrade of the `meilisearch-php` dependency might be committed to this branch. _This PR is auto-generated for the [pre-release week](https://github.com/meilisearch/integration-guides/blob/master/guides/pre-release-week.md) purpose._ _Related to this issue: https://github.com/meilisearch/integration-guides/issues/205_ Co-authored-by: meili-bot <[email protected]> Co-authored-by: Bruno Casali <[email protected]>
2 parents e074aa9 + 9458a0c commit 31e65f7

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

.php-cs-fixer.dist.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
'import_constants' => false,
1818
],
1919
]
20-
)
20+
)
2121
->setRiskyAllowed(true)
2222
->setFinder($finder)
2323
;

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Also, see our [Documentation](https://docs.meilisearch.com/learn/tutorials/getti
4848

4949
## 🤖 Compatibility with Meilisearch
5050

51-
This package only guarantees the compatibility with the [version v0.27.0 of Meilisearch](https://github.com/meilisearch/meilisearch/releases/tag/v0.27.0).
51+
This package only guarantees the compatibility with the [version v0.28.0 of Meilisearch](https://github.com/meilisearch/meilisearch/releases/tag/v0.28.0).
5252

5353
## 💡 Learn More
5454

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"ext-json": "*",
2323
"doctrine/doctrine-bundle": "^2.4",
2424
"illuminate/collections": "^8.47",
25-
"meilisearch/meilisearch-php": "^0.23.0",
25+
"meilisearch/meilisearch-php": "^0.24.0",
2626
"symfony/filesystem": "^4.4 || ^5.0 || ^6.0",
2727
"symfony/property-access": "^4.4 || ^5.0 || ^6.0",
2828
"symfony/serializer": "^4.4 || ^5.0 || ^6.0"

src/Command/MeiliSearchCreateCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
7373
$output->writeln('<info>Creating index '.$index['name'].' for '.$entityClassName.'</info>');
7474

7575
$task = $this->searchClient->createIndex($index['name']);
76-
$this->searchClient->waitForTask($task['uid']);
76+
$this->searchClient->waitForTask($task['taskUid']);
7777
$indexInstance = $this->searchClient->index($index['name']);
7878

7979
if (isset($index['settings']) && is_array($index['settings'])) {
@@ -85,7 +85,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
8585
}
8686

8787
$task = $indexInstance->{$method}($value);
88-
$task = $indexInstance->getTask($task['uid']);
88+
$task = $indexInstance->getTask($task['taskUid']);
8989

9090
if ('failed' === $task['status']) {
9191
throw new TaskException($task['error']);

src/Command/MeiliSearchImportCommand.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
137137
$task = $indexInstance->{$method}($value);
138138

139139
// Get task information using uid
140-
$indexInstance->waitForTask($task['uid'], $responseTimeout);
141-
$task = $indexInstance->getTask($task['uid']);
140+
$indexInstance->waitForTask($task['taskUid'], $responseTimeout);
141+
$task = $indexInstance->getTask($task['taskUid']);
142142

143143
if ('failed' === $task['status']) {
144144
throw new TaskException($task['error']);
@@ -175,8 +175,8 @@ private function formatIndexingResponse(array $batch, int $responseTimeout): arr
175175
$indexInstance = $this->searchClient->index($indexName);
176176

177177
// Get task information using uid
178-
$indexInstance->waitForTask($apiResponse['uid'], $responseTimeout);
179-
$task = $indexInstance->getTask($apiResponse['uid']);
178+
$indexInstance->waitForTask($apiResponse['taskUid'], $responseTimeout);
179+
$task = $indexInstance->getTask($apiResponse['taskUid']);
180180

181181
if ('failed' === $task['status']) {
182182
throw new TaskException($task['error']);

tests/Integration/CommandsTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,6 @@ public function testCreateExecuteIndexCreation(): void
327327
$createCommandTester = new CommandTester($createCommand);
328328
$createCommandTester->execute([]);
329329

330-
$this->assertEquals($this->client->getTasks()['results'][0]['type'], 'indexCreation');
330+
$this->assertEquals($this->client->getTasks()->getResults()[0]['type'], 'indexCreation');
331331
}
332332
}

tests/Integration/EventListener/DoctrineEventSubscriberTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public function testPreRemoveWithObjectId(): void
162162
*/
163163
private function waitForAllTasks(): void
164164
{
165-
$firstTask = $this->client->getTasks()['results'][0];
165+
$firstTask = $this->client->getTasks()->getResults()[0];
166166
$this->client->waitForTask($firstTask['uid']);
167167
}
168168
}

0 commit comments

Comments
 (0)