From a5250189a100da454128864fba9a5d315764fd8b Mon Sep 17 00:00:00 2001
From: Nicole Cordes <typo3@cordes.co>
Date: Thu, 14 Dec 2017 15:57:59 +0100
Subject: [PATCH] [TASK] Update friendsofphp/php-cs-fixer to 2.9.0
This also updates needed dependencies.
composer command used:
composer update friendsofphp/php-cs-fixer --with-dependencies
Resolves: #83331
Releases: master, 8.7
Change-Id: I32be2033acacb881c467b23462afa1f852b290fe
Reviewed-on: https://review.typo3.org/55076
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
---
composer.lock | 199 +++++++++++++++++++++++++++-----------------------
1 file changed, 107 insertions(+), 92 deletions(-)
diff --git a/composer.lock b/composer.lock
index 338d14142311..9b6931492abd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1981,16 +1981,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v2.7.1",
+ "version": "v2.9.0",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
- "reference": "ab2e189d94698178988f9732bc75bb4ce8d16f77"
+ "reference": "454ddbe65da6a9297446f442bad244e8a99a9a38"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/ab2e189d94698178988f9732bc75bb4ce8d16f77",
- "reference": "ab2e189d94698178988f9732bc75bb4ce8d16f77",
+ "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/454ddbe65da6a9297446f442bad244e8a99a9a38",
+ "reference": "454ddbe65da6a9297446f442bad244e8a99a9a38",
"shasum": ""
},
"require": {
@@ -1998,29 +1998,30 @@
"doctrine/annotations": "^1.2",
"ext-json": "*",
"ext-tokenizer": "*",
- "gecko-packages/gecko-php-unit": "^2.0",
+ "gecko-packages/gecko-php-unit": "^2.0 || ^3.0",
"php": "^5.6 || >=7.0 <7.3",
- "php-cs-fixer/diff": "^1.0",
- "symfony/console": "^3.2",
- "symfony/event-dispatcher": "^3.0",
- "symfony/filesystem": "^3.0",
- "symfony/finder": "^3.0",
- "symfony/options-resolver": "^3.0",
+ "php-cs-fixer/diff": "^1.2",
+ "symfony/console": "^3.2 || ^4.0",
+ "symfony/event-dispatcher": "^3.0 || ^4.0",
+ "symfony/filesystem": "^3.0 || ^4.0",
+ "symfony/finder": "^3.0 || ^4.0",
+ "symfony/options-resolver": "^3.0 || ^4.0",
"symfony/polyfill-php70": "^1.0",
"symfony/polyfill-php72": "^1.4",
- "symfony/process": "^3.0",
- "symfony/stopwatch": "^3.0"
+ "symfony/process": "^3.0 || ^4.0",
+ "symfony/stopwatch": "^3.0 || ^4.0"
},
"conflict": {
"hhvm": "*"
},
"require-dev": {
- "johnkary/phpunit-speedtrap": "^1.1",
+ "johnkary/phpunit-speedtrap": "^1.1 || ^2.0@dev",
"justinrainbow/json-schema": "^5.0",
+ "mikey179/vfsstream": "^1.6",
+ "php-coveralls/php-coveralls": "^2.0",
"php-cs-fixer/accessible-object": "^1.0",
- "phpunit/phpunit": "^4.8.35 || ^5.4.3",
- "satooshi/php-coveralls": "^1.0",
- "symfony/phpunit-bridge": "^3.2.2"
+ "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+ "symfony/phpunit-bridge": "^3.2.2 || ^4.0"
},
"suggest": {
"ext-mbstring": "For handling non-UTF8 characters in cache signature.",
@@ -2057,46 +2058,56 @@
}
],
"description": "A tool to automatically fix PHP code style",
- "time": "2017-10-02T12:16:05+00:00"
+ "time": "2017-12-08T16:36:20+00:00"
},
{
"name": "gecko-packages/gecko-php-unit",
- "version": "v2.1",
+ "version": "v3.0",
"source": {
"type": "git",
"url": "https://github.com/GeckoPackages/GeckoPHPUnit.git",
- "reference": "5b9e9622c7efd3b22655270b80c03f9e52878a6e"
+ "reference": "6a866551dffc2154c1b091bae3a7877d39c25ca3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/GeckoPackages/GeckoPHPUnit/zipball/5b9e9622c7efd3b22655270b80c03f9e52878a6e",
- "reference": "5b9e9622c7efd3b22655270b80c03f9e52878a6e",
+ "url": "https://api.github.com/repos/GeckoPackages/GeckoPHPUnit/zipball/6a866551dffc2154c1b091bae3a7877d39c25ca3",
+ "reference": "6a866551dffc2154c1b091bae3a7877d39c25ca3",
"shasum": ""
},
"require": {
- "php": "^5.3.6 || ^7.0"
+ "php": "^7.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.8.35 || ^5.4.3"
+ "phpunit/phpunit": "^6.0"
+ },
+ "suggest": {
+ "ext-dom": "When testing with xml.",
+ "ext-libxml": "When testing with xml.",
+ "phpunit/phpunit": "This is an extension for it so make sure you have it some way."
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.0-dev"
+ }
+ },
"autoload": {
"psr-4": {
- "GeckoPackages\\PHPUnit\\": "src\\PHPUnit"
+ "GeckoPackages\\PHPUnit\\": "src/PHPUnit"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
- "description": "Additional PHPUnit tests.",
+ "description": "Additional PHPUnit asserts and constraints.",
"homepage": "https://github.com/GeckoPackages",
"keywords": [
"extension",
"filesystem",
"phpunit"
],
- "time": "2017-06-20T11:22:48+00:00"
+ "time": "2017-08-23T07:46:41+00:00"
},
{
"name": "mikey179/vfsStream",
@@ -2188,16 +2199,16 @@
},
{
"name": "paragonie/random_compat",
- "version": "v2.0.10",
+ "version": "v2.0.11",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d"
+ "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d",
- "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8",
+ "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8",
"shasum": ""
},
"require": {
@@ -2232,7 +2243,7 @@
"pseudorandom",
"random"
],
- "time": "2017-03-13T16:27:32+00:00"
+ "time": "2017-09-27T21:40:39+00:00"
},
{
"name": "phar-io/manifest",
@@ -2338,23 +2349,24 @@
},
{
"name": "php-cs-fixer/diff",
- "version": "v1.1.0",
+ "version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/diff.git",
- "reference": "d068edadcb8f7bc2ea3d3769cdbaf609026ec4f4"
+ "reference": "f0ef6133d674137e902fdf8a6f2e8e97e14a087b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/d068edadcb8f7bc2ea3d3769cdbaf609026ec4f4",
- "reference": "d068edadcb8f7bc2ea3d3769cdbaf609026ec4f4",
+ "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/f0ef6133d674137e902fdf8a6f2e8e97e14a087b",
+ "reference": "f0ef6133d674137e902fdf8a6f2e8e97e14a087b",
"shasum": ""
},
"require": {
"php": "^5.6 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.8.35 || ^5.4.3"
+ "phpunit/phpunit": "^4.8.35 || ^5.4.3",
+ "symfony/process": "^3.3"
},
"type": "library",
"autoload": {
@@ -2363,9 +2375,6 @@
]
},
"notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
"authors": [
{
"name": "Kore Nordmann",
@@ -2374,6 +2383,9 @@
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
+ },
+ {
+ "name": "SpacePossum"
}
],
"description": "sebastian/diff v2 backport support for PHP5.6",
@@ -2381,7 +2393,7 @@
"keywords": [
"diff"
],
- "time": "2017-09-23T16:02:08+00:00"
+ "time": "2017-10-19T09:58:18+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@@ -3757,27 +3769,30 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v3.2.2",
+ "version": "v3.4.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "9137eb3a3328e413212826d63eeeb0217836e2b6"
+ "reference": "ca20b8f9ef149f40ff656d52965f240d85f7a8e4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9137eb3a3328e413212826d63eeeb0217836e2b6",
- "reference": "9137eb3a3328e413212826d63eeeb0217836e2b6",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ca20b8f9ef149f40ff656d52965f240d85f7a8e4",
+ "reference": "ca20b8f9ef149f40ff656d52965f240d85f7a8e4",
"shasum": ""
},
"require": {
- "php": ">=5.5.9"
+ "php": "^5.5.9|>=7.0.8"
+ },
+ "conflict": {
+ "symfony/dependency-injection": "<3.3"
},
"require-dev": {
"psr/log": "~1.0",
- "symfony/config": "~2.8|~3.0",
- "symfony/dependency-injection": "~2.8|~3.0",
- "symfony/expression-language": "~2.8|~3.0",
- "symfony/stopwatch": "~2.8|~3.0"
+ "symfony/config": "~2.8|~3.0|~4.0",
+ "symfony/dependency-injection": "~3.3|~4.0",
+ "symfony/expression-language": "~2.8|~3.0|~4.0",
+ "symfony/stopwatch": "~2.8|~3.0|~4.0"
},
"suggest": {
"symfony/dependency-injection": "",
@@ -3786,7 +3801,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.2-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -3813,29 +3828,29 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2017-01-02T20:32:22+00:00"
+ "time": "2017-11-09T14:14:31+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v3.2.2",
+ "version": "v4.0.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "a0c6ef2dc78d33b58d91d3a49f49797a184d06f4"
+ "reference": "c9d4a26759ff75a077e4e334315cb632739b661a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/a0c6ef2dc78d33b58d91d3a49f49797a184d06f4",
- "reference": "a0c6ef2dc78d33b58d91d3a49f49797a184d06f4",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/c9d4a26759ff75a077e4e334315cb632739b661a",
+ "reference": "c9d4a26759ff75a077e4e334315cb632739b661a",
"shasum": ""
},
"require": {
- "php": ">=5.5.9"
+ "php": "^7.1.3"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.2-dev"
+ "dev-master": "4.0-dev"
}
},
"autoload": {
@@ -3862,29 +3877,29 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2017-01-08T20:47:33+00:00"
+ "time": "2017-11-21T14:14:53+00:00"
},
{
"name": "symfony/options-resolver",
- "version": "v3.3.6",
+ "version": "v4.0.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
- "reference": "ff48982d295bcac1fd861f934f041ebc73ae40f0"
+ "reference": "ef617a2867c7d889d4ecee3c29595698d87474a4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/options-resolver/zipball/ff48982d295bcac1fd861f934f041ebc73ae40f0",
- "reference": "ff48982d295bcac1fd861f934f041ebc73ae40f0",
+ "url": "https://api.github.com/repos/symfony/options-resolver/zipball/ef617a2867c7d889d4ecee3c29595698d87474a4",
+ "reference": "ef617a2867c7d889d4ecee3c29595698d87474a4",
"shasum": ""
},
"require": {
- "php": ">=5.5.9"
+ "php": "^7.1.3"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.3-dev"
+ "dev-master": "4.0-dev"
}
},
"autoload": {
@@ -3916,7 +3931,7 @@
"configuration",
"options"
],
- "time": "2017-04-12T14:14:56+00:00"
+ "time": "2017-11-07T14:45:01+00:00"
},
{
"name": "symfony/polyfill-php54",
@@ -3978,16 +3993,16 @@
},
{
"name": "symfony/polyfill-php70",
- "version": "v1.5.0",
+ "version": "v1.6.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php70.git",
- "reference": "b6482e68974486984f59449ecea1fbbb22ff840f"
+ "reference": "0442b9c0596610bd24ae7b5f0a6cdbbc16d9fcff"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/b6482e68974486984f59449ecea1fbbb22ff840f",
- "reference": "b6482e68974486984f59449ecea1fbbb22ff840f",
+ "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0442b9c0596610bd24ae7b5f0a6cdbbc16d9fcff",
+ "reference": "0442b9c0596610bd24ae7b5f0a6cdbbc16d9fcff",
"shasum": ""
},
"require": {
@@ -3997,7 +4012,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.5-dev"
+ "dev-master": "1.6-dev"
}
},
"autoload": {
@@ -4033,20 +4048,20 @@
"portable",
"shim"
],
- "time": "2017-06-14T15:44:48+00:00"
+ "time": "2017-10-11T12:05:26+00:00"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.5.0",
+ "version": "v1.6.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "8abc9097f5001d310f0edba727469c988acc6ea7"
+ "reference": "6de4f4884b97abbbed9f0a84a95ff2ff77254254"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8abc9097f5001d310f0edba727469c988acc6ea7",
- "reference": "8abc9097f5001d310f0edba727469c988acc6ea7",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/6de4f4884b97abbbed9f0a84a95ff2ff77254254",
+ "reference": "6de4f4884b97abbbed9f0a84a95ff2ff77254254",
"shasum": ""
},
"require": {
@@ -4055,7 +4070,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.5-dev"
+ "dev-master": "1.6-dev"
}
},
"autoload": {
@@ -4088,29 +4103,29 @@
"portable",
"shim"
],
- "time": "2017-07-11T13:25:55+00:00"
+ "time": "2017-10-11T12:05:26+00:00"
},
{
"name": "symfony/process",
- "version": "v3.2.2",
+ "version": "v3.4.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "350e810019fc52dd06ae844b6a6d382f8a0e8893"
+ "reference": "db25e810fd5e124085e3777257d0cf4ae533d0ea"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/350e810019fc52dd06ae844b6a6d382f8a0e8893",
- "reference": "350e810019fc52dd06ae844b6a6d382f8a0e8893",
+ "url": "https://api.github.com/repos/symfony/process/zipball/db25e810fd5e124085e3777257d0cf4ae533d0ea",
+ "reference": "db25e810fd5e124085e3777257d0cf4ae533d0ea",
"shasum": ""
},
"require": {
- "php": ">=5.5.9"
+ "php": "^5.5.9|>=7.0.8"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.2-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -4137,29 +4152,29 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2017-01-02T20:32:22+00:00"
+ "time": "2017-11-22T12:18:49+00:00"
},
{
"name": "symfony/stopwatch",
- "version": "v3.2.2",
+ "version": "v4.0.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
- "reference": "9aa0b51889c01bca474853ef76e9394b02264464"
+ "reference": "ac0e49150555c703fef6b696d8eaba1db7a3ca03"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/stopwatch/zipball/9aa0b51889c01bca474853ef76e9394b02264464",
- "reference": "9aa0b51889c01bca474853ef76e9394b02264464",
+ "url": "https://api.github.com/repos/symfony/stopwatch/zipball/ac0e49150555c703fef6b696d8eaba1db7a3ca03",
+ "reference": "ac0e49150555c703fef6b696d8eaba1db7a3ca03",
"shasum": ""
},
"require": {
- "php": ">=5.5.9"
+ "php": "^7.1.3"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.2-dev"
+ "dev-master": "4.0-dev"
}
},
"autoload": {
@@ -4186,7 +4201,7 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
- "time": "2017-01-02T20:32:22+00:00"
+ "time": "2017-11-09T12:45:29+00:00"
},
{
"name": "theseer/tokenizer",
--
GitLab