From c8ce323ddcf4395b764b7bd6466769a2394f789f Mon Sep 17 00:00:00 2001 From: Dmitry Balabka Date: Wed, 2 Jan 2019 14:29:40 +0200 Subject: [PATCH] We require at least 0.2.1 version of type-resolver, because of following bug https://github.com/phpDocumentor/TypeResolver/commit/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb --- composer.json | 3 ++- tests/Unit/Index/TemplateResetterTest.php | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 9532d9a0b..2ffb8b01f 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,8 @@ "symfony/serializer": "^3.2|^4", "symfony/yaml": "^3.2|^4", "friendsofphp/php-cs-fixer": "^2.2", - "symfony/web-profiler-bundle": "^3.0|^4.0" + "symfony/web-profiler-bundle": "^3.0|^4.0", + "phpdocumentor/type-resolver": "^0.2.1" }, "suggest": { "enqueue/elastica-bundle": "The bundle adds extra features to FOSElasticaBundle bundle. Aimed to improve performance." diff --git a/tests/Unit/Index/TemplateResetterTest.php b/tests/Unit/Index/TemplateResetterTest.php index d48c55536..3a02b968a 100644 --- a/tests/Unit/Index/TemplateResetterTest.php +++ b/tests/Unit/Index/TemplateResetterTest.php @@ -4,8 +4,8 @@ use Elastica\Client; use Elastica\Request; -use FOS\ElasticaBundle\Configuration\ConfigManager; use FOS\ElasticaBundle\Configuration\IndexTemplateConfig; +use FOS\ElasticaBundle\Configuration\ManagerInterface; use FOS\ElasticaBundle\Elastica\IndexTemplate; use FOS\ElasticaBundle\Index\IndexTemplateManager; use FOS\ElasticaBundle\Index\MappingBuilder; @@ -20,7 +20,7 @@ class TemplateResetterTest extends TestCase { /** - * @var ConfigManager + * @var ManagerInterface */ private $configManager; @@ -46,7 +46,7 @@ class TemplateResetterTest extends TestCase protected function setUp() { - $this->configManager = $this->prophesize(ConfigManager::class); + $this->configManager = $this->prophesize(ManagerInterface::class); $this->mappingBuilder = $this->prophesize(MappingBuilder::class); $this->client = $this->prophesize(Client::class); $this->templateManager = $this->prophesize(IndexTemplateManager::class);