Skip to content

Commit e463d6b

Browse files
committed
fix type sensitivity for scout meilisearch engine class
1 parent cf07695 commit e463d6b

File tree

4 files changed

+20
-24
lines changed

4 files changed

+20
-24
lines changed

src/Commands/MeilisearchCommand.php

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,19 @@
44

55
use Illuminate\Console\Command;
66
use Laravel\Scout\EngineManager;
7-
use Laravel\Scout\Engines\MeiliSearchEngine;
7+
use Laravel\Scout\Engines\MeilisearchEngine;
88
use MeiliSearch\Exceptions\TimeOutException;
99

1010
class MeilisearchCommand extends Command
1111
{
1212
/**
13-
* @var \Laravel\Scout\Engines\Engine|\Laravel\Scout\Engines\MeiliSearchEngine|\MeiliSearch\Client
13+
* @var \Laravel\Scout\Engines\Engine|\Laravel\Scout\Engines\MeilisearchEngine|\MeiliSearch\Client
1414
*/
1515
protected $searchEngine;
1616

1717
/**
1818
* Create a new command instance.
1919
*
20-
* @param \Laravel\Scout\EngineManager $engineManager
2120
* @return void
2221
*/
2322
public function __construct(EngineManager $engineManager)
@@ -29,12 +28,12 @@ public function __construct(EngineManager $engineManager)
2928

3029
/**
3130
* Check if current Scout engine is Meilisearch.
32-
*
31+
*
3332
* @return int
3433
*/
3534
protected function checkUsingMeilisearch()
3635
{
37-
if (! $this->searchEngine instanceof MeiliSearchEngine) {
36+
if (! $this->searchEngine instanceof MeilisearchEngine) {
3837
$this->error('Meilisearch is not the default Laravel Scout driver. This command only works with Meilisearch.');
3938

4039
return 1;
@@ -45,8 +44,8 @@ protected function checkUsingMeilisearch()
4544

4645
/**
4746
* Wait for Meilisearch task to finish without throwing timeout error.
48-
*
49-
* @param mixed $task
47+
*
48+
* @param mixed $task
5049
* @return array
5150
*/
5251
protected function gracefullyWaitForTask($task)
@@ -59,7 +58,7 @@ protected function gracefullyWaitForTask($task)
5958

6059
try {
6160
$resolvedTask = $this->searchEngine->waitForTask($task['taskUid'] ?? $task['uid'] ?? $task);
62-
// @codeCoverageIgnoreStart
61+
// @codeCoverageIgnoreStart
6362
} catch (TimeOutException $e) {
6463
$this->warn('Waiting for Meilisearch task timed out.');
6564
// @codeCoverageIgnoreEnd
@@ -70,8 +69,8 @@ protected function gracefullyWaitForTask($task)
7069

7170
/**
7271
* Check if resulted task resolution has been succeeded.
73-
*
74-
* @param mixed $task
72+
*
73+
* @param mixed $task
7574
* @return bool
7675
*/
7776
protected function hasTaskSucceed($task)
@@ -85,11 +84,10 @@ protected function hasTaskSucceed($task)
8584

8685
/**
8786
* Prompt the user for comma-delimited input with auto completion.
88-
*
87+
*
8988
* @codeCoverageIgnore
90-
* @param string $question
91-
* @param array $choices
92-
* @param string|null $default
89+
*
90+
* @param string|null $default
9391
* @return mixed
9492
*/
9593
protected function askWithCompletionList(string $question, array $choices, $default = null)

src/Commands/ScoutKeysCommand.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
use Illuminate\Console\Command;
66
use Illuminate\Support\Carbon;
77
use Illuminate\Support\Str;
8-
use Laravel\Scout\EngineManager;
9-
use Laravel\Scout\Engines\MeiliSearchEngine;
108

119
class ScoutKeysCommand extends MeilisearchCommand
1210
{

src/Commands/ScoutUpdateCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function handle()
4848
/** @var \Meilisearch\Client $modelSearchEngine */
4949
$modelSearchEngine = $model->searchableUsing();
5050

51-
if (get_class($modelSearchEngine) !== 'Laravel\Scout\Engines\MeiliSearchEngine') {
51+
if (get_class($modelSearchEngine) !== 'Laravel\Scout\Engines\MeilisearchEngine') {
5252
$this->error('Meilisearch is the only supported engine for the sorts and/or filters.');
5353

5454
return 2;

tests/TestCase.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
namespace OpenSoutheners\LaravelScoutAdvancedMeilisearch\Tests;
44

5+
use Laravel\Scout\EngineManager;
56
use Laravel\Scout\ScoutServiceProvider;
7+
use MeiliSearch\Contracts\TasksQuery;
68
use OpenSoutheners\LaravelScoutAdvancedMeilisearch\ServiceProvider;
79
use Orchestra\Testbench\TestCase as Orchestra;
8-
use MeiliSearch\Contracts\TasksQuery;
9-
use Laravel\Scout\EngineManager;
1010

1111
abstract class TestCase extends Orchestra
1212
{
1313
/**
14-
* @var \Laravel\Scout\Engines\MeiliSearchEngine|\MeiliSearch\Client|null
14+
* @var \Laravel\Scout\Engines\MeilisearchEngine|\MeiliSearch\Client|null
1515
*/
1616
protected $searchEngine;
1717

@@ -65,7 +65,7 @@ protected function defineDatabaseMigrations()
6565
*/
6666
protected function waitForAllSearchTasks($model)
6767
{
68-
/** @var \Laravel\Scout\Engines\MeiliSearchEngine|\Meilisearch\Client $searchClient */
68+
/** @var \Laravel\Scout\Engines\MeilisearchEngine|\Meilisearch\Client $searchClient */
6969
$searchClient = $model->searchableUsing();
7070

7171
$searchClient->waitForTasks(
@@ -81,7 +81,7 @@ protected function waitForAllSearchTasks($model)
8181
*/
8282
protected function createIndex($model)
8383
{
84-
/** @var \Laravel\Scout\Engines\MeiliSearchEngine|\Meilisearch\Client $searchClient */
84+
/** @var \Laravel\Scout\Engines\MeilisearchEngine|\Meilisearch\Client $searchClient */
8585
$searchClient = $model->searchableUsing();
8686

8787
$response = $searchClient->createIndex($model->searchableAs());
@@ -93,8 +93,8 @@ protected function createIndex($model)
9393

9494
/**
9595
* Get Meilisearch search engine from Laravel Scout.
96-
*
97-
* @return \Laravel\Scout\Engines\MeiliSearchEngine|\MeiliSearch\Client
96+
*
97+
* @return \Laravel\Scout\Engines\MeilisearchEngine|\MeiliSearch\Client
9898
*/
9999
protected function searchEngine()
100100
{

0 commit comments

Comments
 (0)