From 97ff948239fc5c34431b19412b9dd89c7f545087 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 14 Feb 2020 15:54:31 +0100
Subject: update to 1.10.0-RC

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

(limited to 'composer-rpm.patch')

diff --git a/composer-rpm.patch b/composer-rpm.patch
index b6bccfb..ec7ff9b 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2019-08-03 10:30:10.000000000 +0200
-+++ ./bin/composer	2019-08-03 10:30:42.907772543 +0200
+--- ./bin/composer.rpm	2020-02-14 15:37:41.000000000 +0100
++++ ./bin/composer	2020-02-14 15:37:43.336528140 +0100
 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== '
  }
  
@@ -11,10 +11,10 @@ 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	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));
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2020-02-14 15:37:43.336528140 +0100
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2020-02-14 15:38:56.710201606 +0100
+@@ -305,7 +305,7 @@ EOF;
+         $this->filePutContentsIfModified($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');
 -        $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
@@ -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	2019-08-03 10:30:10.000000000 +0200
-+++ ./src/Composer/Compiler.php	2019-08-03 10:30:42.908772550 +0200
+--- ./src/Composer/Compiler.php.rpm	2020-02-14 15:37:41.000000000 +0100
++++ ./src/Composer/Compiler.php	2020-02-14 15:37:43.336528140 +0100
 @@ -97,7 +97,7 @@ class Compiler
          $finder = new Finder();
          $finder->files()
@@ -35,8 +35,8 @@ 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	2019-08-03 10:30:42.908772550 +0200
-+++ ./src/Composer/Json/JsonFile.php	2019-08-03 10:32:48.919630077 +0200
+--- ./src/Composer/Json/JsonFile.php.rpm	2020-02-14 15:37:41.000000000 +0100
++++ ./src/Composer/Json/JsonFile.php	2020-02-14 15:37:43.336528140 +0100
 @@ -34,7 +34,7 @@ class JsonFile
      const JSON_PRETTY_PRINT = 128;
      const JSON_UNESCAPED_UNICODE = 256;
@@ -46,7 +46,7 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
      private $path;
      private $rfs;
-@@ -160,7 +160,7 @@ class JsonFile
+@@ -173,7 +173,7 @@ class JsonFile
          }
  
          if (null === $schemaFile) {
@@ -56,8 +56,8 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./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
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2020-02-14 15:37:41.000000000 +0100
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2020-02-14 15:37:43.336528140 +0100
 @@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
      private function check($json)
      {
-- 
cgit