update to 2.3.6

1 files changed, 30 insertions, 18 deletions

diff --git a/composer-rpm.patch b/composer-rpm.patch
index 26ee894..5cfb149 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,7 +1,7 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2022-03-16 09:47:01.000000000 +0100
-+++ ./bin/composer	2022-03-16 09:53:25.479618079 +0100
-@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== '
+--- ./bin/composer.rpm	2022-06-02 06:47:42.000000000 +0200
++++ ./bin/composer	2022-06-02 06:49:45.037192985 +0200
+@@ -11,7 +11,7 @@ if (PHP_VERSION_ID < 70205) {
  }
  
  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	2022-03-16 09:47:01.000000000 +0100
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2022-03-16 09:53:25.479618079 +0100
-@@ -418,7 +418,7 @@ EOF;
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2022-06-02 06:47:42.000000000 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2022-06-02 06:49:45.037192985 +0200
+@@ -425,7 +425,7 @@ EOF;
          $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $checkPlatform));
  
          $filesystem->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	2022-03-16 09:47:01.000000000 +0100
-+++ ./src/Composer/Compiler.php	2022-03-16 09:53:25.480618076 +0100
+--- ./src/Composer/Compiler.php.rpm	2022-06-02 06:47:42.000000000 +0200
++++ ./src/Composer/Compiler.php	2022-06-02 06:49:45.037192985 +0200
 @@ -107,7 +107,7 @@ class Compiler
          // Add Composer resources
          $finder = new Finder();
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
          ;
          foreach ($finder as $file) {
 diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersions.php
---- ./src/Composer/InstalledVersions.php.rpm	2022-03-16 09:47:01.000000000 +0100
-+++ ./src/Composer/InstalledVersions.php	2022-03-16 09:53:25.480618076 +0100
+--- ./src/Composer/InstalledVersions.php.rpm	2022-06-02 06:47:42.000000000 +0200
++++ ./src/Composer/InstalledVersions.php	2022-06-02 06:49:45.037192985 +0200
 @@ -266,7 +266,7 @@ class InstalledVersions
          if (null === self::$installed) {
              // only require the installed.php file if this file is loaded from its dumped location,
@@ -56,9 +56,9 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio
              } else {
                  self::$installed = array();
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2022-03-16 09:54:28.547422853 +0100
-+++ ./src/Composer/Json/JsonFile.php	2022-03-16 09:56:07.126118722 +0100
-@@ -38,7 +38,7 @@ class JsonFile
+--- ./src/Composer/Json/JsonFile.php.rpm	2022-06-02 06:47:42.000000000 +0200
++++ ./src/Composer/Json/JsonFile.php	2022-06-02 06:49:45.037192985 +0200
+@@ -39,7 +39,7 @@ class JsonFile
      /** @deprecated Use \JSON_UNESCAPED_UNICODE */
      public const JSON_UNESCAPED_UNICODE = 256;
  
@@ -67,7 +67,7 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
      /** @var string */
      private $path;
-@@ -200,7 +200,7 @@ class JsonFile
+@@ -219,7 +219,7 @@ class JsonFile
          $isComposerSchemaFile = false;
          if (null === $schemaFile) {
              $isComposerSchemaFile = true;
@@ -76,9 +76,21 @@ 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 ./src/Composer/PHPStan/ConfigReturnTypeExtension.php.rpm ./src/Composer/PHPStan/ConfigReturnTypeExtension.php
+--- ./src/Composer/PHPStan/ConfigReturnTypeExtension.php.rpm	2022-06-02 06:50:28.987916014 +0200
++++ ./src/Composer/PHPStan/ConfigReturnTypeExtension.php	2022-06-02 06:51:05.429709332 +0200
+@@ -30,7 +30,7 @@ final class ConfigReturnTypeExtension im
+ 
+     public function __construct()
+     {
+-        $schema = JsonFile::parseJson((string) file_get_contents(__DIR__.'/../../../res/composer-schema.json'));
++        $schema = JsonFile::parseJson((string) file_get_contents('/usr/share/composer/res/composer-schema.json'));
+         /**
+          * @var string $prop
+          */
 diff -up ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php
---- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm	2021-10-28 22:44:15.000000000 +0200
-+++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php	2022-03-16 09:53:25.480618076 +0100
+--- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm	2022-05-24 13:56:16.000000000 +0200
++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php	2022-06-02 06:49:45.037192985 +0200
 @@ -125,7 +125,7 @@ class CaBundle
       */
      public static function getBundledCaBundlePath()
@@ -89,8 +101,8 @@ diff -up ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm ./src/Com
          // cURL does not understand 'phar://' paths
          // see https://github.com/composer/ca-bundle/issues/10
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2022-03-16 09:47:01.000000000 +0100
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2022-03-16 09:53:25.480618076 +0100
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2022-06-02 06:47:42.000000000 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2022-06-02 06:49:45.037192985 +0200
 @@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
      private function check(string $json)
      {