updated to Symfony/Console ~2.5

Kdyby · Jul 26, 2014 · ae75b38 · ae75b38
1 parent e0e6d82
commit ae75b38
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
 	"require": {
 		"nette/nette": "2.1.*@dev",
 
-		"symfony/console": "~2.4"
+		"symfony/console": "~2.5"
 	},
 	"require-dev": {
 		"nette/tester": "@dev",

diff --git a/src/Kdyby/Console/DI/ConsoleExtension.php b/src/Kdyby/Console/DI/ConsoleExtension.php
@@ -64,13 +64,21 @@ public function loadConfiguration()
 			return;
 		}
 
+		$helperClasses = [
+			'Symfony\Component\Console\Helper\DialogHelper',
+			'Symfony\Component\Console\Helper\FormatterHelper',
+			'Symfony\Component\Console\Helper\QuestionHelper',
+			'Kdyby\Console\Helpers\PresenterHelper',
+		];
+
+		if (class_exists('Symfony\Component\Console\Helper\ProgressHelper')) {
+			$helperClasses[] = 'Symfony\Component\Console\Helper\ProgressHelper';
+		}
+
+		$helperClasses = array_map(function ($class) { return new Nette\DI\Statement($class); }, $helperClasses);
+
 		$builder->addDefinition($this->prefix('helperSet'))
-			->setClass('Symfony\Component\Console\Helper\HelperSet', array(array(
-				new Nette\DI\Statement('Symfony\Component\Console\Helper\DialogHelper'),
-				new Nette\DI\Statement('Symfony\Component\Console\Helper\FormatterHelper'),
-				new Nette\DI\Statement('Symfony\Component\Console\Helper\ProgressHelper'),
-				new Nette\DI\Statement('Kdyby\Console\Helpers\PresenterHelper'),
-			)))
+			->setClass('Symfony\Component\Console\Helper\HelperSet', array($helperClasses))
 			->setInject(FALSE);
 
 		$builder->addDefinition($this->prefix('application'))