From cd25b8bfe61872c8472334f50145c53bf2799b32 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Sat, 3 Aug 2019 10:37:03 +0200
Subject: v1.9.0

---
 composer-rpm.patch | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

(limited to 'composer-rpm.patch')

diff --git a/composer-rpm.patch b/composer-rpm.patch
index 3ed61f4..b6bccfb 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,7 +1,7 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2018-07-26 09:44:36.765795459 +0200
-+++ ./bin/composer	2018-07-26 09:45:14.199012215 +0200
-@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli') {
+--- ./bin/composer.rpm	2019-08-03 10:30:10.000000000 +0200
++++ ./bin/composer	2019-08-03 10:30:42.907772543 +0200
+@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== '
  }
  
  setlocale(LC_ALL, 'C');
@@ -11,9 +11,9 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  use Composer\XdebugHandler\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2018-07-26 09:36:57.000000000 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2018-07-26 09:44:36.765795459 +0200
-@@ -305,7 +305,7 @@ EOF;
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2019-08-03 10:30:10.000000000 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2019-08-03 10:30:42.908772550 +0200
+@@ -306,7 +306,7 @@ EOF;
          file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
  
          $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2018-07-26 09:36:57.000000000 +0200
-+++ ./src/Composer/Compiler.php	2018-07-26 09:44:36.765795459 +0200
+--- ./src/Composer/Compiler.php.rpm	2019-08-03 10:30:10.000000000 +0200
++++ ./src/Composer/Compiler.php	2019-08-03 10:30:42.908772550 +0200
 @@ -97,7 +97,7 @@ class Compiler
          $finder = new Finder();
          $finder->files()
@@ -35,20 +35,29 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
              ->sort($finderSort)
          ;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2018-07-26 09:36:57.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php	2018-07-26 09:44:36.765795459 +0200
-@@ -156,7 +156,7 @@ class JsonFile
-             self::validateSyntax($content, $this->path);
+--- ./src/Composer/Json/JsonFile.php.rpm	2019-08-03 10:30:42.908772550 +0200
++++ ./src/Composer/Json/JsonFile.php	2019-08-03 10:32:48.919630077 +0200
+@@ -34,7 +34,7 @@ class JsonFile
+     const JSON_PRETTY_PRINT = 128;
+     const JSON_UNESCAPED_UNICODE = 256;
+ 
+-    const COMPOSER_SCHEMA_PATH = '/../../../res/composer-schema.json';
++    const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json';
+ 
+     private $path;
+     private $rfs;
+@@ -160,7 +160,7 @@ class JsonFile
          }
  
--        $schemaFile = __DIR__ . '/../../../res/composer-schema.json';
-+        $schemaFile = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
+         if (null === $schemaFile) {
+-            $schemaFile = __DIR__ . self::COMPOSER_SCHEMA_PATH;
++            $schemaFile = (getenv('BUILDROOT')?:'') . self::COMPOSER_SCHEMA_PATH;
+         }
  
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
-         if (false === strpos($schemaFile, '://')) {
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2018-07-26 09:36:57.000000000 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2018-07-26 09:44:36.765795459 +0200
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2019-08-03 10:30:10.000000000 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2019-08-03 10:30:42.908772550 +0200
 @@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
      private function check($json)
      {
-- 
cgit