From d52108110ae2a1ac8cb468c74d6dc87a40095149 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 3 Jun 2021 13:55:50 +0200 Subject: duplicate v2 --- php-cs-fixer3-autoload.patch | 71 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 php-cs-fixer3-autoload.patch (limited to 'php-cs-fixer3-autoload.patch') diff --git a/php-cs-fixer3-autoload.patch b/php-cs-fixer3-autoload.patch new file mode 100644 index 0000000..e24ef55 --- /dev/null +++ b/php-cs-fixer3-autoload.patch @@ -0,0 +1,71 @@ +diff -up ./php-cs-fixer.rpm ./php-cs-fixer +--- ./php-cs-fixer.rpm 2020-12-08 10:29:13.190515695 +0100 ++++ ./php-cs-fixer 2020-12-08 10:30:26.191258296 +0100 +@@ -52,39 +52,7 @@ set_error_handler(static function ($seve + } + }); + +-$require = true; +-if (class_exists('Phar')) { +- // Maybe this file is used as phar-stub? Let's try! +- try { +- Phar::mapPhar('php-cs-fixer.phar'); +- +- require_once 'phar://php-cs-fixer.phar/vendor/autoload.php'; +- $require = false; +- } catch (PharException $e) { +- } +-} +- +-if ($require) { +- // OK, it's not, let give Composer autoloader a try! +- $possibleFiles = [__DIR__.'/../../autoload.php', __DIR__.'/../autoload.php', __DIR__.'/vendor/autoload.php']; +- $file = null; +- foreach ($possibleFiles as $possibleFile) { +- if (file_exists($possibleFile)) { +- $file = $possibleFile; +- +- break; +- } +- } +- +- 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'; + + 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 2020-12-08 07:57:58.000000000 +0100 ++++ ./src/Console/Command/HelpCommand.php 2020-12-08 10:29:13.190515695 +0100 +@@ -374,6 +374,8 @@ EOF + { + static $version = null; + ++ return Application::VERSION; ++ + if (null !== $version) { + return $version; + } +diff -up ./tests/AutoReview/ProjectCodeTest.php.rpm ./tests/AutoReview/ProjectCodeTest.php +--- ./tests/AutoReview/ProjectCodeTest.php.rpm 2020-12-08 07:57:59.000000000 +0100 ++++ ./tests/AutoReview/ProjectCodeTest.php 2020-12-08 10:29:13.190515695 +0100 +@@ -690,8 +690,11 @@ final class ProjectCodeTest extends Test + ->files() + ->name('*.php') + ->in(__DIR__.'/../../src') ++ ->notName('autoload.php') + ->exclude([ + 'Resources', ++ 'diff', ++ 'tests', + ]) + ; + -- cgit