fixup! Compatibility with Elastic 2 up to 7

Author: Spamercz

composer.json

@@ -29,21 +29,22 @@
 		"ext-curl": "*",
 		"spameri/elastic-query": "v1.0.0-alpha.8",
 		"elasticsearch/elasticsearch": "^2.4.0 || ^7.12.0",
-		"nette/di": "^2.4.10 || ^3.0",
-		"nette/utils": "^2.4.10 || ^3.0",
+		"nette/di": "^2.4.17 || ^3.0",
+		"nette/utils": "^2.5.7 || ^3.0",
 		"kdyby/console": "^2.7.1 || ^2.8.0",
-		"symfony/console": "^3",
-		"tracy/tracy": "^2.4",
-		"monolog/monolog": "^2.0"
+		"symfony/console": "^4.4.21",
+		"tracy/tracy": "^2.6.7",
+		"monolog/monolog": "^2.0.2",
+		"guzzlehttp/ringphp": "^1.1.1"
 	},
 	"require-dev": {
 		"spameri/coding-standard": "dev-master",
 	  	"spameri/dependency-mocker": "^1.3",
-		"nette/tester": "^2.2",
+		"nette/tester": "^2.4",
 		"phpstan/phpstan": "0.12.84",
 		"php-coveralls/php-coveralls": "^2.1",
-		"nette/bootstrap": "2.4 || ^3.0",
-		"nette/http": "^2.4.7 || ^3.0",
+		"nette/bootstrap": "~2.4.6 || ^3.0",
+		"nette/http": "^2.4.12 || ^3.0",
 		"mockery/mockery": "^1.2"
 	},
 	"autoload": {

tests/SpameriTests/Elastic/DI/Extension.phpt

@@ -4,41 +4,23 @@ namespace SpameriTests\Elastic\DI;
 
 require_once __DIR__ . '/../../../bootstrap.php';
 
-class Extension extends \Tester\TestCase
+class Extension extends \SpameriTests\Elastic\AbstractTestCase
 {
 
-	/**
-	 * @var \Nette\Configurator
-	 */
-	private $config;
-
-
-	public function setUp(): void
-	{
-		$config = new \Nette\Configurator();
-		$config->setTempDirectory(\TEMP_DIR);
-		$config->addConfig(__DIR__ . '/../Data/Config/Common.neon');
-
-		$this->config = $config;
-	}
-
-
 	public function testInitialize(): void
 	{
-		$container = $this->config->createContainer();
-
-		$search = $container->getByType(\Spameri\Elastic\Model\Search::class);
+		$search = $this->container->getByType(\Spameri\Elastic\Model\Search::class);
 		\Tester\Assert::true($search instanceof \Spameri\Elastic\Model\Search);
 
-		$resultMapper = $container->getByType(\Spameri\ElasticQuery\Response\ResultMapper::class);
+		$resultMapper = $this->container->getByType(\Spameri\ElasticQuery\Response\ResultMapper::class);
 		\Tester\Assert::true($resultMapper instanceof \Spameri\ElasticQuery\Response\ResultMapper);
 
 		/** @var \Spameri\Elastic\ClientProvider $clientProvider */
-		$clientProvider = $container->getByType(\Spameri\Elastic\ClientProvider::class);
+		$clientProvider = $this->container->getByType(\Spameri\Elastic\ClientProvider::class);
 		$connection = $clientProvider->client()->transport->connectionPool->nextConnection();
 
 		/** @var \Spameri\Elastic\Model\VersionProvider $versionProvider */
-		$versionProvider = $container->getByType(\Spameri\Elastic\Model\VersionProvider::class);
+		$versionProvider = $this->container->getByType(\Spameri\Elastic\Model\VersionProvider::class);
 		\Tester\Assert::type('int', $versionProvider->provide());
 
 		if ($versionProvider->provide() >= \Spameri\ElasticQuery\Response\Result\Version::ELASTIC_VERSION_ID_7) {