From 51c9a33d153b0ea7a03bf5ecee3fdf80cb629771 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 4 Aug 2020 10:24:41 +0000 Subject: [PATCH 1/4] Update meilisearch/meilisearch-php requirement from ^0.12 to ^0.13 Updates the requirements on meilisearch/meilisearch-php to permit the latest version. Signed-off-by: dependabot-preview[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 981d445e..86d849ca 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "require": { "php": "^7.2", "ext-json": "*", - "meilisearch/meilisearch-php": "^0.12", + "meilisearch/meilisearch-php": "^0.13", "symfony/filesystem": "^4.0 || ^5.0", "symfony/property-access": "^4.0 || ^5.0", "symfony/serializer": "^4.0 || ^5.0" From 2e1363256ff6ed777ee899acb1e81aa6d32c3b70 Mon Sep 17 00:00:00 2001 From: Clementine Urquizar Date: Tue, 4 Aug 2020 14:45:44 +0200 Subject: [PATCH 2/4] Update README with compatibilities --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c5339a99..41de5301 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ This package is compatible with the following MeiliSearch versions: +- `v0.13.X` - `v0.12.X` - `v0.11.X` From 016866ae2b9bc4636d62af27954438461874bfce Mon Sep 17 00:00:00 2001 From: david Date: Tue, 4 Aug 2020 11:22:43 -0400 Subject: [PATCH 3/4] Fixing tests after upgrade 0.13 --- tests/TestCase/SettingsTest.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/TestCase/SettingsTest.php b/tests/TestCase/SettingsTest.php index 0855723e..572cd20d 100644 --- a/tests/TestCase/SettingsTest.php +++ b/tests/TestCase/SettingsTest.php @@ -63,24 +63,24 @@ public function testGetDefaultSettings() $this->assertEquals(self::DEFAULT_RANKING_RULES, $settingA['rankingRules']); $this->assertNull($settingA['distinctAttribute']); $this->assertIsArray($settingA['searchableAttributes']); - $this->assertEmpty($settingA['searchableAttributes']); + $this->assertEquals(['*'], $settingA['searchableAttributes']); $this->assertIsArray($settingA['displayedAttributes']); - $this->assertEmpty($settingA['displayedAttributes']); + $this->assertEquals(['*'], $settingA['displayedAttributes']); $this->assertIsArray($settingA['stopWords']); $this->assertEmpty($settingA['stopWords']); $this->assertIsArray($settingA['synonyms']); $this->assertEmpty($settingA['synonyms']); - $this->assertTrue($settingA['acceptNewFields']); + $this->assertNull($settingA['acceptNewFields']); $this->assertEquals(self::DEFAULT_RANKING_RULES, $settingB['rankingRules']); $this->assertNull($settingB['distinctAttribute']); - $this->assertEquals([$primaryKey], $settingB['searchableAttributes']); - $this->assertEquals([$primaryKey], $settingB['displayedAttributes']); + $this->assertEquals(['*'], $settingB['searchableAttributes']); + $this->assertEquals(['*'], $settingB['displayedAttributes']); $this->assertIsArray($settingB['stopWords']); $this->assertEmpty($settingB['stopWords']); $this->assertIsArray($settingB['synonyms']); $this->assertEmpty($settingB['synonyms']); - $this->assertTrue($settingB['acceptNewFields']); + $this->assertNull($settingB['acceptNewFields']); } public function testUpdateSettings() From 5811af0b7cd95509a68dc7356b35ffc62b9200bb Mon Sep 17 00:00:00 2001 From: david Date: Tue, 4 Aug 2020 11:24:47 -0400 Subject: [PATCH 4/4] Fixing tests, undefined index `acceptNewFields` --- tests/TestCase/SettingsTest.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/TestCase/SettingsTest.php b/tests/TestCase/SettingsTest.php index 572cd20d..151748a8 100644 --- a/tests/TestCase/SettingsTest.php +++ b/tests/TestCase/SettingsTest.php @@ -70,7 +70,6 @@ public function testGetDefaultSettings() $this->assertEmpty($settingA['stopWords']); $this->assertIsArray($settingA['synonyms']); $this->assertEmpty($settingA['synonyms']); - $this->assertNull($settingA['acceptNewFields']); $this->assertEquals(self::DEFAULT_RANKING_RULES, $settingB['rankingRules']); $this->assertNull($settingB['distinctAttribute']); @@ -80,7 +79,6 @@ public function testGetDefaultSettings() $this->assertEmpty($settingB['stopWords']); $this->assertIsArray($settingB['synonyms']); $this->assertEmpty($settingB['synonyms']); - $this->assertNull($settingB['acceptNewFields']); } public function testUpdateSettings()