diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-cs-fixer-autoload.patch | 34 | ||||
| -rw-r--r-- | php-cs-fixer.spec | 9 |
3 files changed, 27 insertions, 18 deletions
diff --git a/composer.json b/composer.json index 5fe7fae..d2c3b9a 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^5.3.6 || >=7.0 <7.2", + "php": "^5.3.6 || >=7.0 <7.3", "ext-json": "*", "ext-tokenizer": "*", "composer/semver": "^1.4", diff --git a/php-cs-fixer-autoload.patch b/php-cs-fixer-autoload.patch index d8797f1..221f1ad 100644 --- a/php-cs-fixer-autoload.patch +++ b/php-cs-fixer-autoload.patch @@ -1,24 +1,30 @@ diff -up ./php-cs-fixer.rpm ./php-cs-fixer ---- ./php-cs-fixer.rpm 2017-08-03 12:19:28.000000000 +0200 -+++ ./php-cs-fixer 2017-08-03 13:03:17.794166301 +0200 -@@ -42,12 +42,7 @@ set_error_handler(function ($severity, $ +--- ./php-cs-fixer.rpm 2017-10-02 15:47:01.068895386 +0200 ++++ ./php-cs-fixer 2017-10-02 15:48:29.217404013 +0200 +@@ -41,18 +41,7 @@ set_error_handler(function ($severity, $ } }); --// installed via composer? --if (file_exists($a = __DIR__.'/../../autoload.php')) { -- require_once $a; --} else { -- require_once __DIR__.'/vendor/autoload.php'; +-try { +- // Maybe this file is used as phar-stub? Let's try! +- Phar::mapPhar('php-cs-fixer.phar'); +- require_once 'phar://php-cs-fixer.phar/vendor/autoload.php'; +-} catch (PharException $e) { +- // OK, it's not, let give Composer autoloader a try! +- if (file_exists($a = __DIR__.'/../../autoload.php')) { +- require_once $a; +- } else { +- require_once __DIR__.'/vendor/autoload.php'; +- } -} +require_once '/usr/share/php/PhpCsFixer/autoload.php'; use PhpCsFixer\Console\Application; diff -up ./src/Console/Command/HelpCommand.php.rpm ./src/Console/Command/HelpCommand.php ---- ./src/Console/Command/HelpCommand.php.rpm 2017-08-03 13:03:17.794166301 +0200 -+++ ./src/Console/Command/HelpCommand.php 2017-08-03 13:04:12.930466672 +0200 -@@ -343,6 +343,8 @@ EOF +--- ./src/Console/Command/HelpCommand.php.rpm 2017-10-02 15:46:28.000000000 +0200 ++++ ./src/Console/Command/HelpCommand.php 2017-10-02 15:47:01.069895391 +0200 +@@ -344,6 +344,8 @@ EOF { static $version = null; @@ -28,9 +34,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 2017-08-03 12:19:28.000000000 +0200 -+++ ./tests/AutoReview/ProjectCodeTest.php 2017-08-03 13:04:33.084576466 +0200 -@@ -309,8 +309,10 @@ final class ProjectCodeTest extends Test +--- ./tests/AutoReview/ProjectCodeTest.php.rpm 2017-10-02 15:46:28.000000000 +0200 ++++ ./tests/AutoReview/ProjectCodeTest.php 2017-10-02 15:47:01.069895391 +0200 +@@ -379,8 +379,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 04db9e5..27e9a77 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit b6202ccad4c00778887e7e8282d52f854802b59a +%global gh_commit aca23e791784eade7b377d578d6dfc6fcf1398d2 %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.7 +Version: 2.2.8 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: A tool to automatically fix PHP code style @@ -87,7 +87,7 @@ BuildRequires: php-fedora-autoloader-devel %endif # From composer.json, "require": { -# "php": "^5.3.6 || >=7.0 <7.2", +# "php": "^5.3.6 || >=7.0 <7.3", # "ext-json": "*", # "ext-tokenizer": "*", # "composer/semver": "^1.4", @@ -263,6 +263,9 @@ fi %changelog +* Mon Oct 2 2017 Remi Collet <remi@remirepo.net> - 2.2.8-1 +- Update to 2.2.8 + * Tue Sep 12 2017 Remi Collet <remi@remirepo.net> - 2.2.7-1 - Update to 2.2.7 - add dependency on composer/semver |