diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-cs-fixer.spec | 17 |
2 files changed, 15 insertions, 4 deletions
diff --git a/composer.json b/composer.json index 178282c..5559af2 100644 --- a/composer.json +++ b/composer.json @@ -36,6 +36,7 @@ "require-dev": { "johnkary/phpunit-speedtrap": "^1.0.1", "justinrainbow/json-schema": "^5.0", + "keradus/cli-executor": "^1.0", "mikey179/vfsStream": "^1.6", "php-coveralls/php-coveralls": "^1.0.2", "phpunit/phpunit": "^4.8.35 || ^5.4.3", @@ -55,6 +56,7 @@ "autoload": { "psr-4": { "PhpCsFixer\\": "src/" }, "classmap": [ + "tests/TestCase.php", "tests/Test/AbstractFixerTestCase.php", "tests/Test/AbstractIntegrationTestCase.php", "tests/Test/IntegrationCase.php", diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 4ab2d42..0afccd3 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for php-cs-fixer # -# Copyright (c) 2016-2017 Remi Collet +# Copyright (c) 2016-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit 669e2327a17b94e47454c3d2e00c6f96203646f0 +%global gh_commit dcf644315abc557e006ce068d299f85d17ec2157 %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.13 +Version: 2.2.14 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: A tool to automatically fix PHP code style @@ -68,12 +68,15 @@ BuildRequires: php-xml # NOTICE: listener disabled # "johnkary/phpunit-speedtrap": "^1.0.1", # "justinrainbow/json-schema": "^5.0", +# "keradus/cli-executor": "^1.0", # "mikey179/vfsStream": "^1.6", # "satooshi/php-coveralls": "^1.0.2", # "phpunit/phpunit": "^4.8.35 || ^5.4.3", # "symfony/phpunit-bridge": "^3.2 || ^4.0" BuildRequires: php-composer(justinrainbow/json-schema) < 6 BuildRequires: php-composer(justinrainbow/json-schema) >= 5 +#BuildRequires: php-composer(keradus/cli-executor) < 2 +#BuildRequires: php-composer(keradus/cli-executor) >= 1 BuildRequires: php-composer(mikey179/vfsStream) < 2 BuildRequires: php-composer(mikey179/vfsStream) >= 1.6 BuildRequires: php-composer(phpunit/phpunit) >= 4.8.35 @@ -160,6 +163,7 @@ projects. This tool does not only detect them, but also fixes them for you. # from composer.json, "autoload" / "classmap" TESTS=" + tests/TestCase.php tests/Test/AbstractFixerTestCase.php tests/Test/AbstractIntegrationTestCase.php tests/Test/IntegrationCase.php @@ -221,7 +225,9 @@ EOF # Ignore integration test sed -e "/README.rst/s:__DIR__.*':'$PWD/README.rst':" \ -i tests/Console/Command/ReadmeCommandTest.php -rm tests/CiIntegrationTest.php +# use keradus/cli-executor +rm tests/Smoke/CiIntegrationTest.php +rm tests/Smoke/StdinTest.php # Disable listener sed -e 's/listeners/nolistener/' phpunit.xml.dist >phpunit.xml @@ -250,6 +256,9 @@ fi %changelog +* Thu Jan 11 2018 Remi Collet <remi@remirepo.net> - 2.2.14-1 +- Update to 2.2.14 + * Wed Dec 13 2017 Remi Collet <remi@remirepo.net> - 2.2.13-1 - Update to 2.2.13 |