From e7c64fc775ccb53291f4cc0dd77e9255970abc34 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 2 Oct 2017 16:14:23 +0200
Subject: v2.6.1

---
 php-cs-fixer-autoload.patch | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

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

diff --git a/php-cs-fixer-autoload.patch b/php-cs-fixer-autoload.patch
index 549be98..6e8261b 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 11:05:45.000000000 +0200
-+++ ./php-cs-fixer	2017-08-03 11:52:15.526145624 +0200
-@@ -40,12 +40,7 @@ set_error_handler(function ($severity, $
+--- ./php-cs-fixer.rpm	2017-10-02 16:04:28.744937463 +0200
++++ ./php-cs-fixer	2017-10-02 16:04:55.577092013 +0200
+@@ -39,18 +39,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 11:05:45.000000000 +0200
-+++ ./src/Console/Command/HelpCommand.php	2017-08-03 11:52:15.526145624 +0200
-@@ -343,6 +343,8 @@ EOF
+--- ./src/Console/Command/HelpCommand.php.rpm	2017-10-02 16:03:56.000000000 +0200
++++ ./src/Console/Command/HelpCommand.php	2017-10-02 16:04:28.744937463 +0200
+@@ -345,6 +345,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 11:05:45.000000000 +0200
-+++ ./tests/AutoReview/ProjectCodeTest.php	2017-08-03 11:52:47.461317357 +0200
-@@ -310,8 +310,10 @@ final class ProjectCodeTest extends Test
+--- ./tests/AutoReview/ProjectCodeTest.php.rpm	2017-10-02 16:03:56.000000000 +0200
++++ ./tests/AutoReview/ProjectCodeTest.php	2017-10-02 16:04:28.745937469 +0200
+@@ -383,8 +383,10 @@ final class ProjectCodeTest extends Test
              ->files()
              ->name('*.php')
              ->in(__DIR__.'/../../src')
-- 
cgit