update to 2.8.3HEADmaster

4 files changed, 74 insertions, 71 deletions

diff --git a/composer-bash-completion b/composer-bash-completion
index 7a9b48d..4b7508d 100644
--- a/composer-bash-completion
+++ b/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.8.2")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.3")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.json b/composer.json
index a943cd7..743ca0b 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,7 @@
         "symfony/filesystem": "^5.4.35 || ^6.3.12 || ^7.0.3",
         "symfony/finder": "^5.4.35 || ^6.3.12 || ^7.0.3",
         "symfony/process": "^5.4.35 || ^6.3.12 || ^7.0.3",
-        "react/promise": "^3.2",
+        "react/promise": "^2.11 || ^3.2",
         "composer/pcre": "^2.2 || ^3.2",
         "symfony/polyfill-php73": "^1.24",
         "symfony/polyfill-php80": "^1.24",
diff --git a/composer.spec b/composer.spec
index 9a8bd33..de8b08b 100644
--- a/composer.spec
+++ b/composer.spec
@@ -13,7 +13,7 @@
 
 %bcond_with          generators
 
-%global gh_commit    6e543d03187c882ea1c6ba43add2467754427803
+%global gh_commit    2a7c71266b2545a3bed9f4860734081963f6e688
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -21,7 +21,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.8.2
+%global upstream_version 2.8.3
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -32,7 +32,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 # SPDX: composer and all dependencies are MIT
@@ -117,34 +117,34 @@ Requires:       php-zlib
 # Bundled libraries
 %if %{without generators}
 # License MIT
-Provides:       bundled(php-composer-ca-bundle) = 1.5.2
-Provides:       bundled(php-composer-class-map-generator) = 1.4.0
-Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
-Provides:       bundled(php-composer-pcre) = 2.3.1
-Provides:       bundled(php-composer-semver) = 3.4.3
-Provides:       bundled(php-composer-spdx-licenses) = 1.5.8
-Provides:       bundled(php-composer-xdebug-handler) = 3.0.5
-Provides:       bundled(php-justinrainbow-json-schema) = 5.3.0
-Provides:       bundled(php-psr-container) = 1.1.1
-Provides:       bundled(php-psr-log) = 1.1.4
-Provides:       bundled(php-react-promise) = v3.2.0
-Provides:       bundled(php-seld-jsonlint) = 1.11.0
-Provides:       bundled(php-seld-phar-utils) = 1.2.1
-Provides:       bundled(php-seld-signal-handler) = 2.0.2
-Provides:       bundled(php-symfony-console) = v5.4.45
-Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.3
-Provides:       bundled(php-symfony-filesystem) = v5.4.45
-Provides:       bundled(php-symfony-finder) = v5.4.45
-Provides:       bundled(php-symfony-polyfill-ctype) = v1.31.0
-Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.31.0
-Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.31.0
-Provides:       bundled(php-symfony-polyfill-mbstring) = v1.31.0
-Provides:       bundled(php-symfony-polyfill-php73) = v1.31.0
-Provides:       bundled(php-symfony-polyfill-php80) = v1.31.0
-Provides:       bundled(php-symfony-polyfill-php81) = v1.31.0
-Provides:       bundled(php-symfony-process) = v5.4.45
-Provides:       bundled(php-symfony-service-contracts) = v2.5.3
-Provides:       bundled(php-symfony-string) = v5.4.45
+Provides:       bundled(php-composer(composer/ca-bundle)) = 1.5.3
+Provides:       bundled(php-composer(composer/class-map-generator)) = 1.4.0
+Provides:       bundled(php-composer(composer/metadata-minifier)) = 1.0.0
+Provides:       bundled(php-composer(composer/pcre)) = 2.3.2
+Provides:       bundled(php-composer(composer/semver)) = 3.4.3
+Provides:       bundled(php-composer(composer/spdx-licenses)) = 1.5.8
+Provides:       bundled(php-composer(composer/xdebug-handler)) = 3.0.5
+Provides:       bundled(php-composer(justinrainbow/json-schema)) = 5.3.0
+Provides:       bundled(php-composer(psr/container)) = 1.1.1
+Provides:       bundled(php-composer(psr/log)) = 1.1.4
+Provides:       bundled(php-composer(react/promise)) = v3.2.0
+Provides:       bundled(php-composer(seld/jsonlint)) = 1.11.0
+Provides:       bundled(php-composer(seld/phar-utils)) = 1.2.1
+Provides:       bundled(php-composer(seld/signal-handler)) = 2.0.2
+Provides:       bundled(php-composer(symfony/console)) = v5.4.47
+Provides:       bundled(php-composer(symfony/deprecation-contracts)) = v2.5.3
+Provides:       bundled(php-composer(symfony/filesystem)) = v5.4.45
+Provides:       bundled(php-composer(symfony/finder)) = v5.4.45
+Provides:       bundled(php-composer(symfony/polyfill-ctype)) = v1.31.0
+Provides:       bundled(php-composer(symfony/polyfill-intl-grapheme)) = v1.31.0
+Provides:       bundled(php-composer(symfony/polyfill-intl-normalizer)) = v1.31.0
+Provides:       bundled(php-composer(symfony/polyfill-mbstring)) = v1.31.0
+Provides:       bundled(php-composer(symfony/polyfill-php73)) = v1.31.0
+Provides:       bundled(php-composer(symfony/polyfill-php80)) = v1.31.0
+Provides:       bundled(php-composer(symfony/polyfill-php81)) = v1.31.0
+Provides:       bundled(php-composer(symfony/process)) = v5.4.47
+Provides:       bundled(php-composer(symfony/service-contracts)) = v2.5.3
+Provides:       bundled(php-composer(symfony/string)) = v5.4.47
 # Composer library
 Provides:       php-composer(composer/composer) = %{version}
 %endif
@@ -182,7 +182,7 @@ php -r '
     foreach($pkgs["packages"] as $pkg) {
 		$lic = implode(" and ", $pkg["license"]);
 		if (!isset($res[$lic])) $res[$lic] = [];
-		$res[$lic][] = sprintf("Provides:       bundled(php-%s) = %s", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]);
+		$res[$lic][] = sprintf("Provides:       bundled(php-composer(%s)) = %s", $pkg["name"], $pkg["version"]);
 	}
 	foreach($res as $lic => $lib) {
 		sort($lib);
@@ -268,6 +268,9 @@ php -r '
 
 
 %changelog
+* Mon Nov 18 2024 Remi Collet <remi@remirepo.net> - 2.8.3-1
+- update to 2.8.3
+
 * Wed Oct 30 2024 Remi Collet <remi@remirepo.net> - 2.8.2-3
 - keep upstream layout for simplicity
 
diff --git a/installed.json b/installed.json
index aae34b3..4f3a37a 100644
--- a/installed.json
+++ b/installed.json
@@ -2,17 +2,17 @@
     "packages": [
         {
             "name": "composer/ca-bundle",
-            "version": "1.5.2",
-            "version_normalized": "1.5.2.0",
+            "version": "1.5.3",
+            "version_normalized": "1.5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "48a792895a2b7a6ee65dd5442c299d7b835b6137"
+                "reference": "3b1fc3f0be055baa7c6258b1467849c3e8204eb2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/48a792895a2b7a6ee65dd5442c299d7b835b6137",
-                "reference": "48a792895a2b7a6ee65dd5442c299d7b835b6137",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/3b1fc3f0be055baa7c6258b1467849c3e8204eb2",
+                "reference": "3b1fc3f0be055baa7c6258b1467849c3e8204eb2",
                 "shasum": ""
             },
             "require": {
@@ -26,7 +26,7 @@
                 "psr/log": "^1.0 || ^2.0 || ^3.0",
                 "symfony/process": "^4.0 || ^5.0 || ^6.0 || ^7.0"
             },
-            "time": "2024-09-25T07:49:53+00:00",
+            "time": "2024-11-04T10:15:26+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -61,7 +61,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/ca-bundle/issues",
-                "source": "https://github.com/composer/ca-bundle/tree/1.5.2"
+                "source": "https://github.com/composer/ca-bundle/tree/1.5.3"
             },
             "funding": [
                 {
@@ -229,17 +229,17 @@
         },
         {
             "name": "composer/pcre",
-            "version": "2.3.1",
-            "version_normalized": "2.3.1.0",
+            "version": "2.3.2",
+            "version_normalized": "2.3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "26859a860a7f140fc08422c3cc14ad9c2a287d79"
+                "reference": "ebb81df8f52b40172d14062ae96a06939d80a069"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/26859a860a7f140fc08422c3cc14ad9c2a287d79",
-                "reference": "26859a860a7f140fc08422c3cc14ad9c2a287d79",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/ebb81df8f52b40172d14062ae96a06939d80a069",
+                "reference": "ebb81df8f52b40172d14062ae96a06939d80a069",
                 "shasum": ""
             },
             "require": {
@@ -249,11 +249,11 @@
                 "phpstan/phpstan": "<1.11.10"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.11.10",
-                "phpstan/phpstan-strict-rules": "^1.1",
+                "phpstan/phpstan": "^1.12 || ^2",
+                "phpstan/phpstan-strict-rules": "^1 || ^2",
                 "phpunit/phpunit": "^8 || ^9"
             },
-            "time": "2024-08-27T12:02:26+00:00",
+            "time": "2024-11-12T16:24:47+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -291,7 +291,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/2.3.1"
+                "source": "https://github.com/composer/pcre/tree/2.3.2"
             },
             "funding": [
                 {
@@ -977,17 +977,17 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.45",
-            "version_normalized": "5.4.45.0",
+            "version": "v5.4.47",
+            "version_normalized": "5.4.47.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "108d436c2af470858bdaba3257baab3a74172017"
+                "reference": "c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/108d436c2af470858bdaba3257baab3a74172017",
-                "reference": "108d436c2af470858bdaba3257baab3a74172017",
+                "url": "https://api.github.com/repos/symfony/console/zipball/c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed",
+                "reference": "c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed",
                 "shasum": ""
             },
             "require": {
@@ -1025,7 +1025,7 @@
                 "symfony/lock": "",
                 "symfony/process": ""
             },
-            "time": "2024-10-08T07:27:17+00:00",
+            "time": "2024-11-06T11:30:55+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -1059,7 +1059,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.45"
+                "source": "https://github.com/symfony/console/tree/v5.4.47"
             },
             "funding": [
                 {
@@ -1856,24 +1856,24 @@
         },
         {
             "name": "symfony/process",
-            "version": "v5.4.45",
-            "version_normalized": "5.4.45.0",
+            "version": "v5.4.47",
+            "version_normalized": "5.4.47.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "95f3f19d0f8f06e4253c66a0828ddb69f8b8ede4"
+                "reference": "5d1662fb32ebc94f17ddb8d635454a776066733d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/95f3f19d0f8f06e4253c66a0828ddb69f8b8ede4",
-                "reference": "95f3f19d0f8f06e4253c66a0828ddb69f8b8ede4",
+                "url": "https://api.github.com/repos/symfony/process/zipball/5d1662fb32ebc94f17ddb8d635454a776066733d",
+                "reference": "5d1662fb32ebc94f17ddb8d635454a776066733d",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
                 "symfony/polyfill-php80": "^1.16"
             },
-            "time": "2024-09-25T14:11:13+00:00",
+            "time": "2024-11-06T11:36:42+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -1901,7 +1901,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v5.4.45"
+                "source": "https://github.com/symfony/process/tree/v5.4.47"
             },
             "funding": [
                 {
@@ -2007,17 +2007,17 @@
         },
         {
             "name": "symfony/string",
-            "version": "v5.4.45",
-            "version_normalized": "5.4.45.0",
+            "version": "v5.4.47",
+            "version_normalized": "5.4.47.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "7f6807add88b1e2635f3c6de5e1ace631ed7cad2"
+                "reference": "136ca7d72f72b599f2631aca474a4f8e26719799"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/7f6807add88b1e2635f3c6de5e1ace631ed7cad2",
-                "reference": "7f6807add88b1e2635f3c6de5e1ace631ed7cad2",
+                "url": "https://api.github.com/repos/symfony/string/zipball/136ca7d72f72b599f2631aca474a4f8e26719799",
+                "reference": "136ca7d72f72b599f2631aca474a4f8e26719799",
                 "shasum": ""
             },
             "require": {
@@ -2037,7 +2037,7 @@
                 "symfony/translation-contracts": "^1.1|^2",
                 "symfony/var-exporter": "^4.4|^5.0|^6.0"
             },
-            "time": "2024-09-25T14:11:13+00:00",
+            "time": "2024-11-10T20:33:58+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2076,7 +2076,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.45"
+                "source": "https://github.com/symfony/string/tree/v5.4.47"
             },
             "funding": [
                 {