Drop nette 2.4 and ES 2.4

Author: Jakub-Fajkus

composer.json

@@ -28,10 +28,9 @@
 		"ext-json": "*",
 		"ext-curl": "*",
 		"spameri/elastic-query": "^v1.0.0-alpha.10",
-		"elasticsearch/elasticsearch": "^2.4.0 || ^7.12.0",
-		"nette/di": "^2.4.17 || ^3.0",
-		"nette/utils": "^2.5.7 || ^3.0",
-		"kdyby/console": "^4.0.0",
+		"elasticsearch/elasticsearch": "^7.12.0",
+		"nette/di": "^3.0",
+		"nette/utils": "^3.0",
 		"symfony/console": "^4",
 		"tracy/tracy": "^2.6.7",
 		"monolog/monolog": "^2.0.2",
@@ -43,8 +42,9 @@
 		"nette/tester": "^2.4",
 		"phpstan/phpstan": "0.12.84",
 		"php-coveralls/php-coveralls": "^2.1",
-		"nette/bootstrap": "~2.4.6 || ^3.0",
-		"nette/http": "^2.4.12 || ^3.0",
+		"nette/bootstrap": "^3.0",
+		"nette/http": "^3.0",
+		"kdyby/console": "^4.0.0",
 		"mockery/mockery": "^1.2"
 	},
 	"autoload": {

src/DI/SpameriElasticSearchExtension.php

@@ -31,29 +31,17 @@ public function loadConfiguration(): void
 
 		$services = $this->toggleDebugBar($config, $services);
 
-		if ( ! \class_exists(\Symfony\Component\Console\Command\Command::class)) {
-			$services = $this->removeCommandDefinitions($services);
-		}
-
 		$services = $this->setConfigOptions($services, $config);
 
-		if (\method_exists($this->compiler, 'loadDefinitionsFromConfig')) {
-			$aliasedServices = [];
-			foreach ($services['services'] as $key => $service) {
-				$aliasedServices['spameriElasticSearch.' . $key] = $service;
-			}
+		$aliasedServices = [];
+		foreach ($services['services'] as $key => $service) {
+			$aliasedServices['spameriElasticSearch.' . $key] = $service;
+		}
 
-			$this->compiler->loadDefinitionsFromConfig(
-				$aliasedServices
-			);
+		$this->compiler->loadDefinitionsFromConfig(
+			$aliasedServices
+		);
 
-		} else {
-			$this->compiler::loadDefinitions(
-				$this->getContainerBuilder(),
-				$services['services'],
-				$this->name
-			);
-		}
 	}
 
 
@@ -104,27 +92,4 @@ public function toggleDebugBar(
 		return $services;
 	}
 
-
-	/**
-	 * @param array<mixed> $services
-	 * @return array<mixed>
-	 */
-	public function removeCommandDefinitions(
-		array $services
-	): array
-	{
-		$iterableServices = $services['services'];
-		foreach ($iterableServices as $serviceKey => $serviceArray) {
-			if (isset($serviceArray['tags'])) {
-				foreach ($serviceArray['tags'] as $tag) {
-					if ($tag === 'kdyby.console.command') {
-						unset($services[$serviceKey]);
-					}
-				}
-			}
-		}
-
-		return $services;
-	}
-
 }