diff options
| -rw-r--r-- | php-cs-fixer-autoload.patch | 39 | ||||
| -rw-r--r-- | php-cs-fixer.spec | 7 |
2 files changed, 30 insertions, 16 deletions
diff --git a/php-cs-fixer-autoload.patch b/php-cs-fixer-autoload.patch index e5269d0..632dd31 100644 --- a/php-cs-fixer-autoload.patch +++ b/php-cs-fixer-autoload.patch @@ -1,7 +1,7 @@ diff -up ./php-cs-fixer.rpm ./php-cs-fixer ---- ./php-cs-fixer.rpm 2019-05-06 09:31:03.871240441 +0200 -+++ ./php-cs-fixer 2019-05-06 09:32:17.127721736 +0200 -@@ -43,27 +43,7 @@ set_error_handler(function ($severity, $ +--- ./php-cs-fixer.rpm 2019-11-04 09:02:13.808580217 +0100 ++++ ./php-cs-fixer 2019-11-04 09:03:24.388258652 +0100 +@@ -43,38 +43,7 @@ set_error_handler(function ($severity, $ } }); @@ -15,15 +15,26 @@ diff -up ./php-cs-fixer.rpm ./php-cs-fixer - } catch (PharException $e) { - } -} +- -if ($require) { - // 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'; +- $possibleFiles = [__DIR__.'/../../autoload.php', __DIR__.'/../autoload.php', __DIR__.'/vendor/autoload.php']; +- $file = null; +- foreach ($possibleFiles as $possibleFile) { +- if (file_exists($possibleFile)) { +- $file = $possibleFile; +- +- break; +- } - } - -- unset($a); +- if (null === $file) { +- throw new RuntimeException('Unable to locate autoload.php file.'); +- } +- +- require_once $file; +- +- unset($possibleFiles, $possibleFile, $file); -} -unset($require); +require_once '/usr/share/php/PhpCsFixer/autoload.php'; @@ -31,9 +42,9 @@ diff -up ./php-cs-fixer.rpm ./php-cs-fixer 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 2019-05-06 09:29:43.000000000 +0200 -+++ ./src/Console/Command/HelpCommand.php 2019-05-06 09:31:03.871240441 +0200 -@@ -379,6 +379,8 @@ EOF +--- ./src/Console/Command/HelpCommand.php.rpm 2019-11-04 09:01:59.000000000 +0100 ++++ ./src/Console/Command/HelpCommand.php 2019-11-04 09:02:13.808580217 +0100 +@@ -377,6 +377,8 @@ EOF { static $version = null; @@ -43,9 +54,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 2019-05-06 09:29:43.000000000 +0200 -+++ ./tests/AutoReview/ProjectCodeTest.php 2019-05-06 09:31:03.872240448 +0200 -@@ -412,8 +412,11 @@ final class ProjectCodeTest extends Test +--- ./tests/AutoReview/ProjectCodeTest.php.rpm 2019-11-04 09:01:59.000000000 +0100 ++++ ./tests/AutoReview/ProjectCodeTest.php 2019-11-04 09:02:13.808580217 +0100 +@@ -473,8 +473,11 @@ final class ProjectCodeTest extends Test ->files() ->name('*.php') ->in(__DIR__.'/../../src') diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec index 743a17d..0fb4807 100644 --- a/php-cs-fixer.spec +++ b/php-cs-fixer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 705490b0f282f21017d73561e9498d2b622ee34c +%global gh_commit ceaff36bee1ed3f1bbbedca36d2528c0826c336d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20150717 %global gh_owner FriendsOfPHP @@ -26,7 +26,7 @@ %global gh_diff_short %(c=%{gh_diff_commit}; echo ${c:0:7}) Name: php-cs-fixer -Version: 2.15.3 +Version: 2.16.0 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: A tool to automatically fix PHP code style @@ -341,6 +341,9 @@ exit $ret %changelog +* Mon Nov 4 2019 Remi Collet <remi@remirepo.net> - 2.16.0-1 +- update to 2.16.0 + * Sun Sep 1 2019 Remi Collet <remi@remirepo.net> - 2.15.3-1 - update to 2.15.3 |