diff options
Diffstat (limited to 'php-cs-fixer-autoload.patch')
| -rw-r--r-- | php-cs-fixer-autoload.patch | 34 |
1 files changed, 20 insertions, 14 deletions
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') |