From f54d7fef44e83e42fb30cd01f2e076dfdddebb0a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Feb 2017 10:05:48 +0100 Subject: [PATCH] v2.0.1 --- .gitignore | 1 + php-cs-fixer-autoload.patch | 15 +++++++++++++-- php-cs-fixer.spec | 17 ++++++++++------- sources | 2 +- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index e329789..bda7711 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /php-cs-fixer-1.12.4-c5a9d66.tgz /php-cs-fixer-1.13.0-ac04a51.tgz /php-cs-fixer-2.0.0-f3baf72.tgz +/php-cs-fixer-2.0.1-863ad25.tgz 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 d98cbf5..a03e1df 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 Remi Collet +# Copyright (c) 2016-2017 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # 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 @@ -34,7 +34,6 @@ BuildArch: noarch %if %{with_tests} # For tests BuildRequires: php(language) >= 5.4 -BuildRequires: php-cli BuildRequires: php-tokenizer BuildRequires: php-composer(symfony/console) >= 2.3 BuildRequires: php-composer(symfony/event-dispatcher) >= 2.1 @@ -63,24 +62,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 @@ -137,6 +136,7 @@ require_once '%{buildroot}%{php_home}/PhpCsFixer/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('PhpCsFixer\\Tests\\', dirname(__DIR__) . '/tests'); EOF + # 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 @@ -158,6 +158,9 @@ fi %changelog +* Thu Feb 9 2017 Remi Collet - 2.0.1-1 +- update to 2.0.1 + * Thu Dec 1 2016 Remi Collet - 2.0.0-1 - update to 2.0.0 diff --git a/sources b/sources index a4f38dd..3cc79e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a0c14d98d442d202fb2fed0b3cb678cc php-cs-fixer-2.0.0-f3baf72.tgz +SHA512 (php-cs-fixer-2.0.1-863ad25.tgz) = 7dafdc5553ed62a2de315541fe977300cb824b1028dcb10e06e1a26707bb793489d97bc4983e402236840915f0781e6aee70f8fa2607cbf2f358da18dac6f9a0