From ae75b38f8259f29a224c54bee3c6e9303fa94173 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <info@tomasvotruba.cz>
Date: Fri, 18 Jul 2014 10:52:16 +0200
Subject: [PATCH] updated to Symfony/Console ~2.5

---
 composer.json                             |  2 +-
 src/Kdyby/Console/DI/ConsoleExtension.php | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index bd08618..f45344a 100644
--- 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
index c641634..dcd2064 100644
--- 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'))