diff options
| -rw-r--r-- | composer.json | 14 | ||||
| -rw-r--r-- | php-cs-fixer-autoload.patch | 15 | ||||
| -rw-r--r-- | php-cs-fixer.spec | 18 |
3 files changed, 32 insertions, 15 deletions
diff --git a/composer.json b/composer.json index 4bb45d1..6a759bb 100644 --- a/composer.json +++ b/composer.json @@ -16,14 +16,14 @@ "require": { "php": "^5.3.6 || >=7.0 <7.2", "ext-tokenizer": "*", + "sebastian/diff": "^1.1", "symfony/console": "^2.3 || ^3.0", "symfony/event-dispatcher": "^2.1 || ^3.0", "symfony/filesystem": "^2.4 || ^3.0", "symfony/finder": "^2.2 || ^3.0", "symfony/polyfill-php54": "^1.0", "symfony/process": "^2.3 || ^3.0", - "symfony/stopwatch": "^2.5 || ^3.0", - "sebastian/diff": "^1.1" + "symfony/stopwatch": "^2.5 || ^3.0" }, "require-dev": { "gecko-packages/gecko-php-unit": "^2.0", @@ -33,16 +33,14 @@ "conflict": { "hhvm": "<3.9" }, + "config": { + "sort-packages": true + }, "autoload": { "psr-4": { "PhpCsFixer\\": "src/" } }, "autoload-dev": { "psr-4": { "PhpCsFixer\\Tests\\": "tests/" } }, - "bin": ["php-cs-fixer"], - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - } + "bin": ["php-cs-fixer"] } diff --git a/php-cs-fixer-autoload.patch b/php-cs-fixer-autoload.patch index 149c6e3..0717c97 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 2016-12-01 15:13:25.882871262 +0100 -+++ ./php-cs-fixer 2016-12-01 15:14:08.756051245 +0100 +--- ./php-cs-fixer.rpm 2017-02-09 09:20:40.000000000 +0100 ++++ ./php-cs-fixer 2017-02-09 09:22:43.400071075 +0100 @@ -32,12 +32,7 @@ set_error_handler(function ($severity, $ } }); @@ -15,3 +15,14 @@ diff -up ./php-cs-fixer.rpm ./php-cs-fixer use PhpCsFixer\Console\Application; +diff -up ./tests/ProjectCodeTest.php.rpm ./tests/ProjectCodeTest.php +--- ./tests/ProjectCodeTest.php.rpm 2017-02-09 09:44:35.627516496 +0100 ++++ ./tests/ProjectCodeTest.php 2017-02-09 09:44:39.935537666 +0100 +@@ -234,6 +234,7 @@ final class ProjectCodeTest extends \PHP + ->files() + ->name('*.php') + ->in(__DIR__.'/../src') ++ ->notName('autoload.php') + ->exclude(array( + 'Resources', + )) diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index e6f0147..c54836d 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit f3baf72eb2f58bf275b372540f5b47d25aed910f +%global gh_commit 863ad254da1e44904c8bf8fbcc9f5624834fc71a %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.0.0 +Version: 2.0.1 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: A tool to automatically fix PHP code style @@ -63,24 +63,24 @@ BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { # "php": "^5.3.6 || >=7.0 <7.2", # "ext-tokenizer": "*", +# "sebastian/diff": "^1.1", # "symfony/console": "^2.3 || ^3.0", # "symfony/event-dispatcher": "^2.1 || ^3.0", # "symfony/filesystem": "^2.4 || ^3.0", # "symfony/finder": "^2.2 || ^3.0", # "symfony/polyfill-php54": "^1.0", # "symfony/process": "^2.3 || ^3.0", -# "symfony/stopwatch": "^2.5 || ^3.0", -# "sebastian/diff": "^1.1" +# "symfony/stopwatch": "^2.5 || ^3.0" # use 5.4 to avoid polyfill Requires: php(language) >= 5.4 Requires: php-tokenizer +Requires: php-composer(sebastian/diff) >= 1.1 Requires: php-composer(symfony/console) >= 2.3 Requires: php-composer(symfony/event-dispatcher) >= 2.1 Requires: php-composer(symfony/filesystem) >= 2.4 Requires: php-composer(symfony/finder) >= 2.4 Requires: php-composer(symfony/process) >= 2.3 Requires: php-composer(symfony/stopwatch) >= 2.5 -Requires: php-composer(sebastian/diff) >= 1.1 # From phpcompatinfo report for version 2.0.0 Requires: php-cli Requires: php-reflection @@ -151,6 +151,11 @@ if which php71; then run=1 fi if [ $run -eq 0 ]; then +# see https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/master/.travis.yml +if php -r 'exit (version_compare(PHP_VERSION, "5.6", "<") ? 0 : 1);'; then + export SKIP_LINT_TEST_CASES=1 +fi + %{_bindir}/phpunit --verbose # remirepo:2 fi @@ -175,6 +180,9 @@ rm -rf %{buildroot} %changelog +* Thu Feb 9 2017 Remi Collet <remi@fedoraproject.org> - 2.0.1-1 +- update to 2.0.1 + * Thu Dec 1 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-1 - update to 2.0.0 |