From 7e2e9772a2c923f200dccbd27f72541f668cc785 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 16 Nov 2021 08:25:26 +0100
Subject: update to 3.3.1

---
 php-cs-fixer3-autoload.patch | 58 ++++++++++----------------------------------
 1 file changed, 13 insertions(+), 45 deletions(-)

(limited to 'php-cs-fixer3-autoload.patch')

diff --git a/php-cs-fixer3-autoload.patch b/php-cs-fixer3-autoload.patch
index 6c348f2..cbba6eb 100644
--- a/php-cs-fixer3-autoload.patch
+++ b/php-cs-fixer3-autoload.patch
@@ -1,51 +1,19 @@
 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
-@@ -67,39 +67,7 @@ set_error_handler(static function ($seve
-     }
- });
+--- ./php-cs-fixer.rpm	2021-11-16 07:37:19.622816772 +0100
++++ ./php-cs-fixer	2021-11-16 07:39:38.008397640 +0100
+@@ -85,7 +85,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/PhpCsFixer3/autoload.php';
- 
- use Composer\XdebugHandler\XdebugHandler;
- use PhpCsFixer\Console\Application;
+     if ($require) {
+         // OK, it's not, let give Composer autoloader a try!
+-        $possibleFiles = [__DIR__.'/../../autoload.php', __DIR__.'/../autoload.php', __DIR__.'/vendor/autoload.php'];
++        $possibleFiles = ['/usr/share/php/PhpCsFixer3/autoload.php'];
+         $file = null;
+         foreach ($possibleFiles as $possibleFile) {
+             if (file_exists($possibleFile)) {
 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
-@@ -721,8 +721,11 @@ final class ProjectCodeTest extends Test
+--- ./tests/AutoReview/ProjectCodeTest.php.rpm	2021-11-16 07:35:55.000000000 +0100
++++ ./tests/AutoReview/ProjectCodeTest.php	2021-11-16 07:37:19.622816772 +0100
+@@ -764,8 +764,11 @@ final class ProjectCodeTest extends Test
              ->files()
              ->name('*.php')
              ->in(__DIR__.'/../../src')
-- 
cgit