From e3b0ee152639b4388b15b78d229107f0caa20e5a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 6 May 2019 11:57:39 +0200 Subject: - update to 2.15.0 - add patch for libpcre2 10.33 from https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/4406 --- php-cs-fixer-autoload.patch | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'php-cs-fixer-autoload.patch') diff --git a/php-cs-fixer-autoload.patch b/php-cs-fixer-autoload.patch index 209084c..e5269d0 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 2018-06-04 08:32:38.764785724 +0200 -+++ ./php-cs-fixer 2018-06-04 08:33:04.580971680 +0200 -@@ -44,25 +44,7 @@ set_error_handler(function ($severity, $ +--- ./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, $ } }); @@ -22,6 +22,8 @@ diff -up ./php-cs-fixer.rpm ./php-cs-fixer - } else { - require_once __DIR__.'/vendor/autoload.php'; - } +- +- unset($a); -} -unset($require); +require_once '/usr/share/php/PhpCsFixer/autoload.php'; @@ -29,8 +31,8 @@ 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 2018-06-04 08:27:41.000000000 +0200 -+++ ./src/Console/Command/HelpCommand.php 2018-06-04 08:32:38.764785724 +0200 +--- ./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 { static $version = null; @@ -41,9 +43,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 2018-06-04 08:27:41.000000000 +0200 -+++ ./tests/AutoReview/ProjectCodeTest.php 2018-06-04 08:32:38.764785724 +0200 -@@ -413,8 +413,11 @@ final class ProjectCodeTest extends Test +--- ./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 ->files() ->name('*.php') ->in(__DIR__.'/../../src') -- cgit