update to 2.4.1

1 files changed, 24 insertions, 24 deletions

diff --git a/composer-rpm.patch b/composer-rpm.patch
index 5cfb149..224503a 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2022-06-02 06:47:42.000000000 +0200
-+++ ./bin/composer	2022-06-02 06:49:45.037192985 +0200
+--- ./bin/composer.rpm	2022-08-29 07:36:37.000000000 +0200
++++ ./bin/composer	2022-08-29 07:36:45.053967617 +0200
 @@ -11,7 +11,7 @@ if (PHP_VERSION_ID < 70205) {
  }
  
@@ -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-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;
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2022-08-29 07:36:45.053967617 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2022-08-29 07:38:03.936134475 +0200
+@@ -431,7 +431,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');
@@ -21,11 +21,11 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
 +        $filesystem->safeCopy((getenv('BUILDROOT')?:'') . '/usr/share/composer/LICENSE', $targetDir.'/LICENSE');
  
          if ($this->runScripts) {
-             $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
+             $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, [], [
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./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
+--- ./src/Composer/Compiler.php.rpm	2022-08-29 07:36:37.000000000 +0200
++++ ./src/Composer/Compiler.php	2022-08-29 07:36:45.053967617 +0200
+@@ -106,7 +106,7 @@ class Compiler
          // Add Composer resources
          $finder = new Finder();
          $finder->files()
@@ -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-06-02 06:47:42.000000000 +0200
-+++ ./src/Composer/InstalledVersions.php	2022-06-02 06:49:45.037192985 +0200
+--- ./src/Composer/InstalledVersions.php.rpm	2022-08-29 07:36:37.000000000 +0200
++++ ./src/Composer/InstalledVersions.php	2022-08-29 07:36:45.053967617 +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,8 +56,8 @@ 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-06-02 06:47:42.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php	2022-06-02 06:49:45.037192985 +0200
+--- ./src/Composer/Json/JsonFile.php.rpm	2022-08-29 07:36:37.000000000 +0200
++++ ./src/Composer/Json/JsonFile.php	2022-08-29 07:36:45.053967617 +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;
-@@ -219,7 +219,7 @@ class JsonFile
+@@ -216,7 +216,7 @@ class JsonFile
          $isComposerSchemaFile = false;
          if (null === $schemaFile) {
              $isComposerSchemaFile = true;
@@ -77,9 +77,9 @@ 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
+--- ./src/Composer/PHPStan/ConfigReturnTypeExtension.php.rpm	2022-08-29 07:36:37.000000000 +0200
++++ ./src/Composer/PHPStan/ConfigReturnTypeExtension.php	2022-08-29 07:36:45.054967614 +0200
+@@ -39,7 +39,7 @@ final class ConfigReturnTypeExtension im
  
      public function __construct()
      {
@@ -89,8 +89,8 @@ diff -up ./src/Composer/PHPStan/ConfigReturnTypeExtension.php.rpm ./src/Composer
           * @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	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
+--- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm	2022-07-20 09:14:26.000000000 +0200
++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php	2022-08-29 07:36:45.054967614 +0200
 @@ -125,7 +125,7 @@ class CaBundle
       */
      public static function getBundledCaBundlePath()
@@ -101,15 +101,15 @@ 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-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
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2022-08-29 07:36:45.054967614 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2022-08-29 07:39:34.814922582 +0200
+@@ -96,7 +96,8 @@ class ComposerSchemaTest extends TestCas
      private function check(string $json)
      {
          $validator = new Validator();
--        $validator->check(json_decode($json), (object) array('$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json'));
+-        $validator->check(json_decode($json), (object) ['$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json']);
 +        $f = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
-+        $validator->check(json_decode($json), (object) array('$ref' => 'file://' . $f));
++        $validator->check(json_decode($json), (object) ['$ref' => 'file://' . $f]);
  
          if (!$validator->isValid()) {
              $errors = $validator->getErrors();