summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2025-08-27 08:28:20 +0200
committerRemi Collet <remi@php.net>2025-08-27 08:28:20 +0200
commitd8523c622905fb866ac789813689ae2b4f7c5c0e (patch)
tree22b5e0d7352827bbd3cfa510d7ada5e91af4d0af
parentb5659619f9f2b01217b4845105a45156c5af2d11 (diff)
update to 2.8.11HEADmaster
-rw-r--r--composer-bash-completion2
-rw-r--r--composer-rpm.patch2
-rw-r--r--composer.json2
-rw-r--r--composer.spec9
-rw-r--r--installed.json148
5 files changed, 91 insertions, 72 deletions
diff --git a/composer-bash-completion b/composer-bash-completion
index a14f0a3..81e4525 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.10")
+ local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.11")
for w in ${words[@]}; do
w=$(printf -- '%b' "$w")
# remove quotes from typed values
diff --git a/composer-rpm.patch b/composer-rpm.patch
index fdc97ac..7323225 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -39,7 +39,7 @@ diff -up ./vendor/composer/ca-bundle/src/CaBundle.php.rpm ./vendor/composer/ca-b
public static function getBundledCaBundlePath()
{
- $caBundleFile = __DIR__.'/../res/cacert.pem';
-+ $caBundleFile = '/etc/pki/tls/certs/ca-bundle.crt'; // System CA, always
++ $caBundleFile = '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem'; // System CA, always
// cURL does not understand 'phar://' paths
// see https://github.com/composer/ca-bundle/issues/10
diff --git a/composer.json b/composer.json
index 2d6b132..8d7f2a8 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": "^2.11 || ^3.2",
+ "react/promise": "^2.11 || ^3.3",
"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 c12b667..7314b81 100644
--- a/composer.spec
+++ b/composer.spec
@@ -11,7 +11,7 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit 53834f587d7ab2527eb237459d7b94d1fb9d4c5a
+%global gh_commit 00e1a3396eea67033775c4a49c772376f45acd73
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_branch 2.0-dev
%global gh_owner composer
@@ -19,7 +19,7 @@
%global api_version 2.6.0
%global run_version 2.2.2
-%global upstream_version 2.8.10
+%global upstream_version 2.8.11
#global upstream_prever RC1
#global upstream_lower rc1
@@ -79,7 +79,7 @@ BuildRequires: composer-generators
Requires: php(language) >= 7.2.5
Requires: php-cli
# System certificates
-Requires: ca-certificates
+Requires: /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
# From composer.json, suggest
# "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -208,6 +208,9 @@ php -r '
%changelog
+* Wed Aug 27 2025 Remi Collet <remi@remirepo.net> - 2.8.11-1
+- update to 2.8.11
+
* Fri Jul 11 2025 Remi Collet <remi@remirepo.net> - 2.8.10-1
- update to 2.8.10
diff --git a/installed.json b/installed.json
index 371b85b..947a34e 100644
--- a/installed.json
+++ b/installed.json
@@ -2,17 +2,17 @@
"packages": [
{
"name": "composer/ca-bundle",
- "version": "1.5.7",
- "version_normalized": "1.5.7.0",
+ "version": "1.5.8",
+ "version_normalized": "1.5.8.0",
"source": {
"type": "git",
"url": "https://github.com/composer/ca-bundle.git",
- "reference": "d665d22c417056996c59019579f1967dfe5c1e82"
+ "reference": "719026bb30813accb68271fee7e39552a58e9f65"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/ca-bundle/zipball/d665d22c417056996c59019579f1967dfe5c1e82",
- "reference": "d665d22c417056996c59019579f1967dfe5c1e82",
+ "url": "https://api.github.com/repos/composer/ca-bundle/zipball/719026bb30813accb68271fee7e39552a58e9f65",
+ "reference": "719026bb30813accb68271fee7e39552a58e9f65",
"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": "2025-05-26T15:08:54+00:00",
+ "time": "2025-08-20T18:49:47+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.7"
+ "source": "https://github.com/composer/ca-bundle/tree/1.5.8"
},
"funding": [
{
@@ -71,27 +71,23 @@
{
"url": "https://github.com/composer",
"type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/composer/composer",
- "type": "tidelift"
}
],
"install-path": "./ca-bundle"
},
{
"name": "composer/class-map-generator",
- "version": "1.6.1",
- "version_normalized": "1.6.1.0",
+ "version": "1.6.2",
+ "version_normalized": "1.6.2.0",
"source": {
"type": "git",
"url": "https://github.com/composer/class-map-generator.git",
- "reference": "134b705ddb0025d397d8318a75825fe3c9d1da34"
+ "reference": "ba9f089655d4cdd64e762a6044f411ccdaec0076"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/class-map-generator/zipball/134b705ddb0025d397d8318a75825fe3c9d1da34",
- "reference": "134b705ddb0025d397d8318a75825fe3c9d1da34",
+ "url": "https://api.github.com/repos/composer/class-map-generator/zipball/ba9f089655d4cdd64e762a6044f411ccdaec0076",
+ "reference": "ba9f089655d4cdd64e762a6044f411ccdaec0076",
"shasum": ""
},
"require": {
@@ -107,7 +103,7 @@
"phpunit/phpunit": "^8",
"symfony/filesystem": "^5.4 || ^6"
},
- "time": "2025-03-24T13:50:44+00:00",
+ "time": "2025-08-20T18:52:43+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -137,7 +133,7 @@
],
"support": {
"issues": "https://github.com/composer/class-map-generator/issues",
- "source": "https://github.com/composer/class-map-generator/tree/1.6.1"
+ "source": "https://github.com/composer/class-map-generator/tree/1.6.2"
},
"funding": [
{
@@ -147,10 +143,6 @@
{
"url": "https://github.com/composer",
"type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/composer/composer",
- "type": "tidelift"
}
],
"install-path": "./class-map-generator"
@@ -311,17 +303,17 @@
},
{
"name": "composer/semver",
- "version": "3.4.3",
- "version_normalized": "3.4.3.0",
+ "version": "3.4.4",
+ "version_normalized": "3.4.4.0",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
- "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12"
+ "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
- "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
+ "url": "https://api.github.com/repos/composer/semver/zipball/198166618906cb2de69b95d7d47e5fa8aa1b2b95",
+ "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95",
"shasum": ""
},
"require": {
@@ -331,7 +323,7 @@
"phpstan/phpstan": "^1.11",
"symfony/phpunit-bridge": "^3 || ^7"
},
- "time": "2024-09-19T14:15:21+00:00",
+ "time": "2025-08-20T19:15:30+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -375,7 +367,7 @@
"support": {
"irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/semver/issues",
- "source": "https://github.com/composer/semver/tree/3.4.3"
+ "source": "https://github.com/composer/semver/tree/3.4.4"
},
"funding": [
{
@@ -385,10 +377,6 @@
{
"url": "https://github.com/composer",
"type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/composer/composer",
- "type": "tidelift"
}
],
"install-path": "./semver"
@@ -805,27 +793,27 @@
},
{
"name": "react/promise",
- "version": "v3.2.0",
- "version_normalized": "3.2.0.0",
+ "version": "v3.3.0",
+ "version_normalized": "3.3.0.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/promise.git",
- "reference": "8a164643313c71354582dc850b42b33fa12a4b63"
+ "reference": "23444f53a813a3296c1368bb104793ce8d88f04a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/reactphp/promise/zipball/8a164643313c71354582dc850b42b33fa12a4b63",
- "reference": "8a164643313c71354582dc850b42b33fa12a4b63",
+ "url": "https://api.github.com/repos/reactphp/promise/zipball/23444f53a813a3296c1368bb104793ce8d88f04a",
+ "reference": "23444f53a813a3296c1368bb104793ce8d88f04a",
"shasum": ""
},
"require": {
"php": ">=7.1.0"
},
"require-dev": {
- "phpstan/phpstan": "1.10.39 || 1.4.10",
+ "phpstan/phpstan": "1.12.28 || 1.4.10",
"phpunit/phpunit": "^9.6 || ^7.5"
},
- "time": "2024-05-24T10:39:05+00:00",
+ "time": "2025-08-19T18:57:03+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -869,7 +857,7 @@
],
"support": {
"issues": "https://github.com/reactphp/promise/issues",
- "source": "https://github.com/reactphp/promise/tree/v3.2.0"
+ "source": "https://github.com/reactphp/promise/tree/v3.3.0"
},
"funding": [
{
@@ -1371,8 +1359,8 @@
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.32.0",
- "version_normalized": "1.32.0.0",
+ "version": "v1.33.0",
+ "version_normalized": "1.33.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
@@ -1433,7 +1421,7 @@
"portable"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.32.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
},
"funding": [
{
@@ -1445,6 +1433,10 @@
"type": "github"
},
{
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
+ {
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
@@ -1453,17 +1445,17 @@
},
{
"name": "symfony/polyfill-intl-grapheme",
- "version": "v1.32.0",
- "version_normalized": "1.32.0.0",
+ "version": "v1.33.0",
+ "version_normalized": "1.33.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
- "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
+ "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
- "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
+ "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
"shasum": ""
},
"require": {
@@ -1472,7 +1464,7 @@
"suggest": {
"ext-intl": "For best performance"
},
- "time": "2024-09-09T11:45:10+00:00",
+ "time": "2025-06-27T09:58:17+00:00",
"type": "library",
"extra": {
"thanks": {
@@ -1514,7 +1506,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.32.0"
+ "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
},
"funding": [
{
@@ -1526,6 +1518,10 @@
"type": "github"
},
{
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
+ {
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
@@ -1534,8 +1530,8 @@
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.32.0",
- "version_normalized": "1.32.0.0",
+ "version": "v1.33.0",
+ "version_normalized": "1.33.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -1598,7 +1594,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.32.0"
+ "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0"
},
"funding": [
{
@@ -1610,6 +1606,10 @@
"type": "github"
},
{
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
+ {
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
@@ -1618,8 +1618,8 @@
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.32.0",
- "version_normalized": "1.32.0.0",
+ "version": "v1.33.0",
+ "version_normalized": "1.33.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
@@ -1682,7 +1682,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.32.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
},
"funding": [
{
@@ -1694,6 +1694,10 @@
"type": "github"
},
{
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
+ {
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
@@ -1702,8 +1706,8 @@
},
{
"name": "symfony/polyfill-php73",
- "version": "v1.32.0",
- "version_normalized": "1.32.0.0",
+ "version": "v1.33.0",
+ "version_normalized": "1.33.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
@@ -1761,7 +1765,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php73/tree/v1.32.0"
+ "source": "https://github.com/symfony/polyfill-php73/tree/v1.33.0"
},
"funding": [
{
@@ -1773,6 +1777,10 @@
"type": "github"
},
{
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
+ {
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
@@ -1781,8 +1789,8 @@
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.32.0",
- "version_normalized": "1.32.0.0",
+ "version": "v1.33.0",
+ "version_normalized": "1.33.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
@@ -1844,7 +1852,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.32.0"
+ "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
},
"funding": [
{
@@ -1856,6 +1864,10 @@
"type": "github"
},
{
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
+ {
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
@@ -1864,8 +1876,8 @@
},
{
"name": "symfony/polyfill-php81",
- "version": "v1.32.0",
- "version_normalized": "1.32.0.0",
+ "version": "v1.33.0",
+ "version_normalized": "1.33.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php81.git",
@@ -1923,7 +1935,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php81/tree/v1.32.0"
+ "source": "https://github.com/symfony/polyfill-php81/tree/v1.33.0"
},
"funding": [
{
@@ -1935,6 +1947,10 @@
"type": "github"
},
{
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
+ {
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}