From 6d3aa6b803a2a83148ee3457409272708d32ee57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Tue, 8 Dec 2020 10:04:31 +0100 Subject: [PATCH] Enhancement: Update friendsofphp/php-cs-fixer --- composer.json | 2 +- composer.lock | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index f98a5e17..e9bcff8d 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "require": { "php": "^7.2", "ext-filter": "*", - "friendsofphp/php-cs-fixer": "~2.16.7" + "friendsofphp/php-cs-fixer": "~2.17.0" }, "require-dev": { "ergebnis/composer-normalize": "^2.10.0", diff --git a/composer.lock b/composer.lock index 26abfb69..7d5c586b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f3002a96cc3954b10187662805673253", + "content-hash": "de4972b0fe20907452dc4f4e8bb2b8c7", "packages": [ { "name": "composer/semver", @@ -307,16 +307,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.16.7", + "version": "v2.17.0", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "4e35806a6d7d8510d6842ae932e8832363d22c87" + "reference": "5274ce3d3200a2b374baa42143cb9dfcdcc2fa52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/4e35806a6d7d8510d6842ae932e8832363d22c87", - "reference": "4e35806a6d7d8510d6842ae932e8832363d22c87", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/5274ce3d3200a2b374baa42143cb9dfcdcc2fa52", + "reference": "5274ce3d3200a2b374baa42143cb9dfcdcc2fa52", "shasum": "" }, "require": { @@ -325,7 +325,7 @@ "doctrine/annotations": "^1.2", "ext-json": "*", "ext-tokenizer": "*", - "php": "^7.1", + "php": "^5.6 || ^7.0 || ^8.0", "php-cs-fixer/diff": "^1.3", "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0", "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0", @@ -347,6 +347,7 @@ "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1", + "phpunitgoodpractices/polyfill": "^1.5", "phpunitgoodpractices/traits": "^1.9.1", "symfony/phpunit-bridge": "^5.1", "symfony/yaml": "^3.0 || ^4.0 || ^5.0" @@ -362,6 +363,11 @@ "php-cs-fixer" ], "type": "application", + "extra": { + "branch-alias": { + "dev-master": "2.17-dev" + } + }, "autoload": { "psr-4": { "PhpCsFixer\\": "src/" @@ -396,7 +402,7 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.16.7" + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.17.0" }, "funding": [ { @@ -404,7 +410,7 @@ "type": "github" } ], - "time": "2020-10-27T22:44:27+00:00" + "time": "2020-12-07T20:43:00+00:00" }, { "name": "php-cs-fixer/diff",