From 9fd76f26c148b7c5bf0c25318fd178fe140eafd0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 23 Feb 2018 07:42:46 +0100 Subject: update bundled php-cs-fixer/diff to 1.3.0 --- composer-diff.json | 3 ++- php-cs-fixer.spec | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/composer-diff.json b/composer-diff.json index ceffd95..e08be75 100644 --- a/composer-diff.json +++ b/composer-diff.json @@ -21,7 +21,7 @@ "php": "^5.6 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.4.3", + "phpunit/phpunit": "^5.7.23 || ^6.4.3", "symfony/process": "^3.3" }, "autoload": { @@ -33,6 +33,7 @@ "psr-4": { "PhpCsFixer\\Diff\\v1_4\\Tests\\": "tests/v1_4", "PhpCsFixer\\Diff\\v2_0\\Tests\\": "tests/v2_0", + "PhpCsFixer\\Diff\\v3_0\\": "tests/v3_0", "PhpCsFixer\\Diff\\GeckoPackages\\DiffOutputBuilder\\Tests\\": "tests/GeckoPackages/DiffOutputBuilder/Tests", "PhpCsFixer\\Diff\\GeckoPackages\\DiffOutputBuilder\\Utils\\": "tests/GeckoPackages/DiffOutputBuilder/Utils" } diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 32b2a87..dbb3e40 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -16,8 +16,8 @@ # Bundled this fork which is not designed for use outside of php-cs-fixer %global gh_diff_owner PHP-CS-Fixer -%global gh_diff_version 1.2.1 -%global gh_diff_commit b95b8c02c58670b15612cfc60873f3f7f5290484 +%global gh_diff_version 1.3.0 +%global gh_diff_commit 78bb099e9c16361126c86ce82ec4405ebab8e756 %global gh_diff_short %(c=%{gh_diff_commit}; echo ${c:0:7}) Name: php-cs-fixer @@ -306,6 +306,7 @@ exit $ret * Fri Feb 23 2018 Remi Collet - 2.10.3-1 - Update to 2.10.3 - drop dependency on gecko-packages/gecko-php-unit +- update bundled php-cs-fixer/diff to 1.3.0 * Tue Feb 6 2018 Remi Collet - 2.10.2-1 - Update to 2.10.2 -- cgit