v2.6.5

(cherry picked from commit c2d8866cfc)

composer-bash-completion

@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.1")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.5")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values

composer-rpm.patch

@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2022-08-29 07:36:37.000000000 +0200
-+++ ./bin/composer	2022-08-29 07:36:45.053967617 +0200
+--- ./bin/composer.rpm	2023-09-01 11:05:16.000000000 +0200
++++ ./bin/composer	2023-09-01 11:05:28.156309389 +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-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;
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2023-09-01 11:05:16.000000000 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2023-09-01 11:05:28.156309389 +0200
+@@ -448,7 +448,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,9 +23,9 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $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-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
+--- ./src/Composer/Compiler.php.rpm	2023-09-01 11:05:16.000000000 +0200
++++ ./src/Composer/Compiler.php	2023-09-01 11:05:28.156309389 +0200
+@@ -105,7 +105,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-08-29 07:36:37.000000000 +0200
-+++ ./src/Composer/InstalledVersions.php	2022-08-29 07:36:45.053967617 +0200
+--- ./src/Composer/InstalledVersions.php.rpm	2023-09-01 11:05:16.000000000 +0200
++++ ./src/Composer/InstalledVersions.php	2023-09-01 11:05:28.156309389 +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,
@@ -46,28 +46,28 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio
                  self::$installed = include __DIR__ . '/installed.php';
              } else {
                  self::$installed = array();
-@@ -339,7 +339,7 @@ class InstalledVersions
+@@ -341,7 +341,7 @@ class InstalledVersions
          if (null === self::$installed) {
              // only require the installed.php file if this file is loaded from its dumped location,
              // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
 -            if (substr(__DIR__, -8, 1) !== 'C') {
 +            if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) {
-                 self::$installed = require __DIR__ . '/installed.php';
-             } else {
-                 self::$installed = array();
+                 /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                 $required = require __DIR__ . '/installed.php';
+                 self::$installed = $required;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./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
+--- ./src/Composer/Json/JsonFile.php.rpm	2023-09-01 11:05:16.000000000 +0200
++++ ./src/Composer/Json/JsonFile.php	2023-09-01 11:06:16.767233012 +0200
+@@ -40,7 +40,7 @@ class JsonFile
      /** @deprecated Use \JSON_UNESCAPED_UNICODE */
      public const JSON_UNESCAPED_UNICODE = 256;
  
 -    public const COMPOSER_SCHEMA_PATH = __DIR__ . '/../../../res/composer-schema.json';
 +    public const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json';
  
-     /** @var string */
-     private $path;
-@@ -216,7 +216,7 @@ class JsonFile
+     public const INDENT_DEFAULT = '    ';
+ 
+@@ -229,7 +229,7 @@ class JsonFile
          $isComposerSchemaFile = false;
          if (null === $schemaFile) {
              $isComposerSchemaFile = true;
@@ -76,21 +76,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-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()
-     {
--        $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	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
+--- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm	2023-08-30 11:31:38.000000000 +0200
++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php	2023-09-01 11:05:28.156309389 +0200
 @@ -125,7 +125,7 @@ class CaBundle
       */
      public static function getBundledCaBundlePath()
@@ -100,16 +88,3 @@ 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-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) ['$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json']);
-+        $f = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
-+        $validator->check(json_decode($json), (object) ['$ref' => 'file://' . $f]);
- 
-         if (!$validator->isValid()) {
-             $errors = $validator->getErrors();

composer.spec

@@ -1,7 +1,7 @@
 # remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015-2022 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2015-2023 Remi Collet
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
@@ -10,15 +10,15 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    923278ad13e1621946eb76ab2882655d2cc396a4
+%global gh_commit    4b0fe89db9e65b1e64df633a992e70a7a215ab33
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
 %global gh_project   composer
-%global api_version  2.3.0
+%global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.5.1
+%global upstream_version 2.6.5
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -80,34 +80,34 @@ Requires:       php-cli
 Requires:       ca-certificates
 # Bundled libraries
 # License MIT
-Provides:       bundled(php-composer-ca-bundle) = 1.3.4
-Provides:       bundled(php-composer-class-map-generator) = 1.0.0
+Provides:       bundled(php-composer-ca-bundle) = 1.3.7
+Provides:       bundled(php-composer-class-map-generator) = 1.1.0
 Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
 Provides:       bundled(php-composer-pcre) = 2.1.0
-Provides:       bundled(php-composer-semver) = 3.3.2
+Provides:       bundled(php-composer-semver) = 3.4.0
 Provides:       bundled(php-composer-spdx-licenses) = 1.5.7
 Provides:       bundled(php-composer-xdebug-handler) = 3.0.3
-Provides:       bundled(php-justinrainbow-json-schema) = 5.2.12
+Provides:       bundled(php-justinrainbow-json-schema) = v5.2.13
 Provides:       bundled(php-psr-container) = 1.1.1
 Provides:       bundled(php-psr-log) = 1.1.4
-Provides:       bundled(php-react-promise) = v2.9.0
-Provides:       bundled(php-seld-jsonlint) = 1.9.0
+Provides:       bundled(php-react-promise) = v3.0.0
+Provides:       bundled(php-seld-jsonlint) = 1.10.0
 Provides:       bundled(php-seld-phar-utils) = 1.2.1
-Provides:       bundled(php-seld-signal-handler) = 2.0.1
-Provides:       bundled(php-symfony-console) = v5.4.16
+Provides:       bundled(php-seld-signal-handler) = 2.0.2
+Provides:       bundled(php-symfony-console) = v5.4.28
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.2
-Provides:       bundled(php-symfony-filesystem) = v5.4.13
-Provides:       bundled(php-symfony-finder) = v5.4.11
-Provides:       bundled(php-symfony-polyfill-ctype) = v1.27.0
-Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.27.0
-Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.27.0
-Provides:       bundled(php-symfony-polyfill-mbstring) = v1.27.0
-Provides:       bundled(php-symfony-polyfill-php73) = v1.27.0
-Provides:       bundled(php-symfony-polyfill-php80) = v1.27.0
-Provides:       bundled(php-symfony-polyfill-php81) = v1.27.0
-Provides:       bundled(php-symfony-process) = v5.4.11
+Provides:       bundled(php-symfony-filesystem) = v5.4.25
+Provides:       bundled(php-symfony-finder) = v5.4.27
+Provides:       bundled(php-symfony-polyfill-ctype) = v1.28.0
+Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.28.0
+Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.28.0
+Provides:       bundled(php-symfony-polyfill-mbstring) = v1.28.0
+Provides:       bundled(php-symfony-polyfill-php73) = v1.28.0
+Provides:       bundled(php-symfony-polyfill-php80) = v1.28.0
+Provides:       bundled(php-symfony-polyfill-php81) = v1.28.0
+Provides:       bundled(php-symfony-process) = v5.4.28
 Provides:       bundled(php-symfony-service-contracts) = v2.5.2
-Provides:       bundled(php-symfony-string) = v5.4.15
+Provides:       bundled(php-symfony-string) = v5.4.29
 
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -155,8 +155,8 @@ Documentation: https://getcomposer.org/doc/
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
-%patch0 -p1 -b .rpm
-%patch1 -p1 -b .noxdg
+%patch -P0 -p1 -b .rpm
+%patch -P1 -p1 -b .noxdg
 find . \( -name \*.rpm -o -name \*noxdg \) -delete -print
 
 if grep -r '\.\./res'; then
@@ -249,6 +249,45 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Fri Oct  6 2023 Remi Collet <remi@remirepo.net> - 2.6.5-1
+- update to 2.6.5
+
+* Fri Sep 29 2023 Remi Collet <remi@remirepo.net> - 2.6.4-1
+- update to 2.6.4
+
+* Fri Sep 15 2023 Remi Collet <remi@remirepo.net> - 2.6.3-1
+- update to 2.6.3
+
+* Mon Sep  4 2023 Remi Collet <remi@remirepo.net> - 2.6.2-1
+- update to 2.6.2
+
+* Fri Sep  1 2023 Remi Collet <remi@remirepo.net> - 2.6.1-1
+- update to 2.6.1
+
+* Fri Sep  1 2023 Remi Collet <remi@remirepo.net> - 2.6.0-1
+- update to 2.6.0
+
+* Sat Jun 10 2023 Remi Collet <remi@remirepo.net> - 2.5.8-1
+- update to 2.5.8
+
+* Wed May 24 2023 Remi Collet <remi@remirepo.net> - 2.5.7-1
+- update to 2.5.7
+
+* Wed May 24 2023 Remi Collet <remi@remirepo.net> - 2.5.6-1
+- update to 2.5.6
+
+* Tue Mar 21 2023 Remi Collet <remi@remirepo.net> - 2.5.5-1
+- update to 2.5.5
+
+* Wed Feb 15 2023 Remi Collet <remi@remirepo.net> - 2.5.4-1
+- update to 2.5.4
+
+* Fri Feb 10 2023 Remi Collet <remi@remirepo.net> - 2.5.3-1
+- update to 2.5.3
+
+* Mon Feb  6 2023 Remi Collet <remi@remirepo.net> - 2.5.2-1
+- update to 2.5.2
+
 * Thu Dec 22 2022 Remi Collet <remi@remirepo.net> - 2.5.1-1
 - update to 2.5.1
 

sources

@@ -1 +1 @@
-SHA512 (composer-2.5.1-923278a.tgz) = 3e8a54ea96982ec6e3ae8afdabc60b88abae05e96561536e444ef5b75aac543284cad90458ae78e4d6e0dbc129fde4b345533db1823b27f5404021dd62cb865b
+SHA512 (composer-2.6.5-4b0fe89.tgz) = 143a0f10237c23ebf869d3dcdcdbb60ad484846ef668ecb7d5e8dd1b17a34745470b45f82ab5f17165370882c7c3787244052876854e07a6c03b7a36a12a99ba