From 433f9a5b29935b9e95d68b69d2eed5d5d7c58e9b Mon Sep 17 00:00:00 2001
From: Patrik Karisch <p.karisch@pixelart.at>
Date: Sat, 1 Aug 2015 16:40:33 +0200
Subject: [PATCH] [TASK] Update Symfony components to current LTS version
Allow the current Symfony LTS version for components. 2.5 is out of
date and 2.6 will be soon.
Update composer.lock for all symfony components to be consistent.
Update our code a bit to not trigger deprecation errors,
Change-Id: Ie4f495a95d8c4f9647e95ff611689f1bd5ed1208
Resolves: #68688
Releases: master
Reviewed-on: http://review.typo3.org/42203
Reviewed-by: Helmut Hummel <helmut.hummel@typo3.org>
Tested-by: Helmut Hummel <helmut.hummel@typo3.org>
Reviewed-by: Patrik Karisch <p.karisch@pixelart.at>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
composer.json | 4 +-
composer.lock | 38 ++++++++++---------
.../extbase/Classes/Mvc/Cli/ConsoleOutput.php | 6 +--
3 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/composer.json b/composer.json
index 735b43bc0d62..e2447905cdf8 100644
--- a/composer.json
+++ b/composer.json
@@ -37,8 +37,8 @@
"pear/http_request2": "~2.2.1",
"phpwhois/idna-convert": "~0.8.2",
"swiftmailer/swiftmailer": "~5.4.1",
- "symfony/console": "~2.5.11",
- "symfony/finder": "^2.6.9",
+ "symfony/console": "~2.7.0",
+ "symfony/finder": "~2.7.0",
"doctrine/instantiator": "~1.0.4",
"helhum/class-alias-loader": "^2.0.0",
"typo3/cms-composer-installers": "^1.2.2",
diff --git a/composer.lock b/composer.lock
index 73525cbd4ca7..1c079fc23727 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "67334195c29a2d5cfb17e446317824f6",
+ "hash": "0f463179dd109b3ff4000ea49c17cec9",
"packages": [
{
"name": "doctrine/instantiator",
@@ -483,38 +483,40 @@
},
{
"name": "symfony/console",
- "version": "v2.5.12",
- "target-dir": "Symfony/Component/Console",
+ "version": "v2.7.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console.git",
- "reference": "a43e750b4c74f3bdfca77c79c343033d35a6cd6e"
+ "reference": "d6cf02fe73634c96677e428f840704bfbcaec29e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Console/zipball/a43e750b4c74f3bdfca77c79c343033d35a6cd6e",
- "reference": "a43e750b4c74f3bdfca77c79c343033d35a6cd6e",
+ "url": "https://api.github.com/repos/symfony/Console/zipball/d6cf02fe73634c96677e428f840704bfbcaec29e",
+ "reference": "d6cf02fe73634c96677e428f840704bfbcaec29e",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
},
"require-dev": {
"psr/log": "~1.0",
- "symfony/event-dispatcher": "~2.1"
+ "symfony/event-dispatcher": "~2.1",
+ "symfony/phpunit-bridge": "~2.7",
+ "symfony/process": "~2.1"
},
"suggest": {
"psr/log": "For using the console logger",
- "symfony/event-dispatcher": ""
+ "symfony/event-dispatcher": "",
+ "symfony/process": ""
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\Console\\": ""
}
},
@@ -523,22 +525,22 @@
"MIT"
],
"authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Console Component",
- "homepage": "http://symfony.com",
- "time": "2015-02-08 07:07:45"
+ "homepage": "https://symfony.com",
+ "time": "2015-07-28 15:18:12"
},
{
"name": "symfony/finder",
- "version": "v2.7.2",
+ "version": "v2.7.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/Finder.git",
diff --git a/typo3/sysext/extbase/Classes/Mvc/Cli/ConsoleOutput.php b/typo3/sysext/extbase/Classes/Mvc/Cli/ConsoleOutput.php
index d02f123588d7..050334a064d3 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Cli/ConsoleOutput.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Cli/ConsoleOutput.php
@@ -273,7 +273,7 @@ class ConsoleOutput {
*/
protected function getDialogHelper() {
if ($this->dialogHelper === NULL) {
- $this->dialogHelper = new DialogHelper();
+ $this->dialogHelper = new DialogHelper(FALSE);
$helperSet = new HelperSet(array(new FormatterHelper()));
$this->dialogHelper->setHelperSet($helperSet);
}
@@ -287,7 +287,7 @@ class ConsoleOutput {
*/
protected function getProgressHelper() {
if ($this->progressHelper === NULL) {
- $this->progressHelper = new ProgressHelper();
+ $this->progressHelper = new ProgressHelper(FALSE);
}
return $this->progressHelper;
}
@@ -299,7 +299,7 @@ class ConsoleOutput {
*/
protected function getTableHelper() {
if ($this->tableHelper === NULL) {
- $this->tableHelper = new TableHelper();
+ $this->tableHelper = new TableHelper(FALSE);
}
return $this->tableHelper;
}
--
GitLab