From 0a8f62a86d0221ec92cec98dfebf1b3dc97c2e7b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Jun 2018 08:27:16 +0200 Subject: update to 2.2.20 add dependency on composer/xdebug-handler --- composer.json | 7 ++++--- php-cs-fixer-autoload.patch | 18 +++++++++--------- php-cs-fixer.spec | 18 ++++++++++++++---- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index c2b151e..c0b61e2 100644 --- a/composer.json +++ b/composer.json @@ -18,6 +18,7 @@ "ext-json": "*", "ext-tokenizer": "*", "composer/semver": "^1.4", + "composer/xdebug-handler": "^1.0", "doctrine/annotations": "^1.2", "sebastian/diff": "^1.4", "symfony/console": "^2.4 || ^3.0 || ^4.0", @@ -38,7 +39,7 @@ "require-dev": { "johnkary/phpunit-speedtrap": "^1.0.1 || ^2.0 || ^3.0", "justinrainbow/json-schema": "^5.0", - "keradus/cli-executor": "^1.0", + "keradus/cli-executor": "^1.1", "mikey179/vfsStream": "^1.6", "php-coveralls/php-coveralls": "^1.0.2", "phpunit/phpunit": "^4.8.35 || ^5.4.3", @@ -46,10 +47,11 @@ }, "suggest": { "ext-mbstring": "For handling non-UTF8 characters in cache signature.", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.", "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." }, "config": { - "optimize-autoloader": true, "sort-packages": true }, "autoload": { @@ -60,7 +62,6 @@ "tests/Test/AbstractFixerTestCase.php", "tests/Test/AbstractIntegrationCaseFactory.php", "tests/Test/AbstractIntegrationTestCase.php", - "tests/Test/Constraint/SameStringsConstraint.php", "tests/Test/IntegrationCase.php", "tests/Test/IntegrationCaseFactory.php", "tests/Test/IntegrationCaseFactoryInterface.php", diff --git a/php-cs-fixer-autoload.patch b/php-cs-fixer-autoload.patch index 1a058fa..3f49bd0 100644 --- a/php-cs-fixer-autoload.patch +++ b/php-cs-fixer-autoload.patch @@ -1,6 +1,6 @@ diff -up ./php-cs-fixer.rpm ./php-cs-fixer ---- ./php-cs-fixer.rpm 2018-03-21 06:42:07.838432372 +0100 -+++ ./php-cs-fixer 2018-03-21 06:43:59.948972275 +0100 +--- ./php-cs-fixer.rpm 2018-06-04 06:51:21.280620624 +0200 ++++ ./php-cs-fixer 2018-06-04 06:52:49.363239929 +0200 @@ -41,25 +41,7 @@ set_error_handler(function ($severity, $ } }); @@ -26,12 +26,12 @@ diff -up ./php-cs-fixer.rpm ./php-cs-fixer -unset($require); +require_once '/usr/share/php/PhpCsFixer/autoload.php'; + use Composer\XdebugHandler\XdebugHandler; use PhpCsFixer\Console\Application; - diff -up ./src/Console/Command/HelpCommand.php.rpm ./src/Console/Command/HelpCommand.php ---- ./src/Console/Command/HelpCommand.php.rpm 2018-03-21 06:41:56.000000000 +0100 -+++ ./src/Console/Command/HelpCommand.php 2018-03-21 06:42:07.838432372 +0100 -@@ -348,6 +348,8 @@ EOF +--- ./src/Console/Command/HelpCommand.php.rpm 2018-06-04 06:44:11.000000000 +0200 ++++ ./src/Console/Command/HelpCommand.php 2018-06-04 06:51:21.280620624 +0200 +@@ -358,6 +358,8 @@ EOF { static $version = null; @@ -41,9 +41,9 @@ diff -up ./src/Console/Command/HelpCommand.php.rpm ./src/Console/Command/HelpCom return $version; } diff -up ./tests/AutoReview/ProjectCodeTest.php.rpm ./tests/AutoReview/ProjectCodeTest.php ---- ./tests/AutoReview/ProjectCodeTest.php.rpm 2018-03-21 06:41:56.000000000 +0100 -+++ ./tests/AutoReview/ProjectCodeTest.php 2018-03-21 06:42:07.838432372 +0100 -@@ -425,8 +425,10 @@ final class ProjectCodeTest extends Test +--- ./tests/AutoReview/ProjectCodeTest.php.rpm 2018-06-04 06:44:11.000000000 +0200 ++++ ./tests/AutoReview/ProjectCodeTest.php 2018-06-04 06:51:21.280620624 +0200 +@@ -422,8 +422,10 @@ final class ProjectCodeTest extends Test ->files() ->name('*.php') ->in(__DIR__.'/../../src') diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 29a0205..1e186f3 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 2de0ac9c1d0d48a9b969814f43698223c6e03d6d +%global gh_commit f1631f0747ad2a9dd3de8d7873b71f6573f8d0c2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20150717 %global gh_owner FriendsOfPHP @@ -15,7 +15,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-cs-fixer -Version: 2.2.19 +Version: 2.2.20 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: A tool to automatically fix PHP code style @@ -35,6 +35,8 @@ BuildRequires: php(language) >= 5.4 BuildRequires: php-tokenizer BuildRequires: php-composer(composer/semver) < 2 BuildRequires: php-composer(composer/semver) >= 1.4 +BuildRequires: php-composer(composer/xdebug-handler) < 2 +BuildRequires: php-composer(composer/xdebug-handler) >= 1.0 BuildRequires: php-composer(doctrine/annotations) < 2 BuildRequires: php-composer(doctrine/annotations) >= 1.2 BuildRequires: php-symfony-console @@ -65,7 +67,7 @@ BuildRequires: php-xml # NOTICE: listener disabled # "johnkary/phpunit-speedtrap": "^1.0.1 || ^2.0 || ^3.0", # "justinrainbow/json-schema": "^5.0", -# "keradus/cli-executor": "^1.0", +# "keradus/cli-executor": "^1.1", # "mikey179/vfsStream": "^1.6", # "satooshi/php-coveralls": "^1.0.2", # "phpunit/phpunit": "^4.8.35 || ^5.4.3", @@ -87,6 +89,7 @@ BuildRequires: php-fedora-autoloader-devel # "ext-json": "*", # "ext-tokenizer": "*", # "composer/semver": "^1.4", +# "composer/xdebug-handler": "^1.0", # "doctrine/annotations": "^1.2", # "sebastian/diff": "^1.4", # "symfony/console": "^2.4 || ^3.0", @@ -106,6 +109,8 @@ Requires: php-json Requires: php-tokenizer Requires: php-composer(composer/semver) < 2 Requires: php-composer(composer/semver) >= 1.4 +Requires: php-composer(composer/xdebug-handler) < 2 +Requires: php-composer(composer/xdebug-handler) >= 1.0 Requires: php-composer(doctrine/annotations) < 2 Requires: php-composer(doctrine/annotations) >= 1.2 Requires: php-composer(sebastian/diff) < 2 @@ -160,7 +165,6 @@ TESTS=" tests/Test/AbstractFixerTestCase.php tests/Test/AbstractIntegrationCaseFactory.php tests/Test/AbstractIntegrationTestCase.php - tests/Test/Constraint/SameStringsConstraint.php tests/Test/IntegrationCase.php tests/Test/IntegrationCaseFactory.php tests/Test/IntegrationCaseFactoryInterface.php @@ -184,6 +188,7 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('PhpCsFixer\\', __DIR__); \Fedora\Autoloader\Dependencies::required([ '%{php_home}/Composer/Semver/autoload.php', + '%{php_home}/Composer/XdebugHandler/autoload.php', '%{php_home}/Doctrine/Common/Annotations/autoload.php', '%{php_home}/Symfony/Component/autoload.php', '%{php_home}/SebastianBergmann/Diff/autoload.php', @@ -225,6 +230,7 @@ sed -e "/README.rst/s:__DIR__.*':'$PWD/README.rst':" \ # use keradus/cli-executor rm tests/Smoke/CiIntegrationTest.php rm tests/Smoke/StdinTest.php +rm tests/Smoke/InstallViaComposerTest.php # Disable listener sed -e 's/listeners/nolistener/' phpunit.xml.dist >phpunit.xml @@ -258,6 +264,10 @@ fi %changelog +* Mon Jun 4 2018 Remi Collet - 2.2.20-1 +- update to 2.2.20 +- add dependency on composer/xdebug-handler + * Wed Mar 21 2018 Remi Collet - 2.2.19-1 - update to 2.2.19 -- cgit