diff options
| -rw-r--r-- | composer-bash-completion | 2 | ||||
| -rw-r--r-- | composer-rpm.patch | 48 | ||||
| -rw-r--r-- | composer.spec | 13 | ||||
| -rw-r--r-- | installed.json | 42 |
4 files changed, 54 insertions, 51 deletions
diff --git a/composer-bash-completion b/composer-bash-completion index 713cb2f..4aed20f 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -24,7 +24,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.0") + local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.1") 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 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(); diff --git a/composer.spec b/composer.spec index a34c780..6067b97 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 026d6de6ea2c913974a7756661a3faac135cb36e +%global gh_commit 777d542e3af65f8e7a66a4d98ce7a697da339414 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -26,7 +26,7 @@ %global api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.4.0 +%global upstream_version 2.4.1 #global upstream_prever RC1 #global upstream_lower rc1 @@ -181,9 +181,9 @@ Provides: bundled(php-react-promise) = v2.9.0 Provides: bundled(php-seld-jsonlint) = 1.9.0 Provides: bundled(php-seld-phar-utils) = 1.2.0 Provides: bundled(php-seld-signal-handler) = 2.0.1 -Provides: bundled(php-symfony-console) = v5.4.11 +Provides: bundled(php-symfony-console) = v5.4.12 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 -Provides: bundled(php-symfony-filesystem) = v5.4.11 +Provides: bundled(php-symfony-filesystem) = v5.4.12 Provides: bundled(php-symfony-finder) = v5.4.11 Provides: bundled(php-symfony-polyfill-ctype) = v1.26.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.26.0 @@ -193,7 +193,7 @@ Provides: bundled(php-symfony-polyfill-php73) = v1.26.0 Provides: bundled(php-symfony-polyfill-php80) = v1.26.0 Provides: bundled(php-symfony-process) = v5.4.11 Provides: bundled(php-symfony-service-contracts) = v2.5.2 -Provides: bundled(php-symfony-string) = v5.4.11 +Provides: bundled(php-symfony-string) = v5.4.12 %endif # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -426,6 +426,9 @@ exit $ret %changelog +* Mon Aug 29 2022 Remi Collet <remi@remirepo.net> - 2.4.1-1 +- update to 2.4.1 + * Tue Aug 16 2022 Remi Collet <remi@remirepo.net> - 2.4.0-1 - update to 2.4.0 diff --git a/installed.json b/installed.json index 5eeabf4..c299172 100644 --- a/installed.json +++ b/installed.json @@ -977,17 +977,17 @@ }, { "name": "symfony/console", - "version": "v5.4.11", - "version_normalized": "5.4.11.0", + "version": "v5.4.12", + "version_normalized": "5.4.12.0", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "535846c7ee6bc4dd027ca0d93220601456734b10" + "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/535846c7ee6bc4dd027ca0d93220601456734b10", - "reference": "535846c7ee6bc4dd027ca0d93220601456734b10", + "url": "https://api.github.com/repos/symfony/console/zipball/c072aa8f724c3af64e2c7a96b796a4863d24dba1", + "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1", "shasum": "" }, "require": { @@ -1025,7 +1025,7 @@ "symfony/lock": "", "symfony/process": "" }, - "time": "2022-07-22T10:42:43+00:00", + "time": "2022-08-17T13:18:05+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -1059,7 +1059,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.11" + "source": "https://github.com/symfony/console/tree/v5.4.12" }, "funding": [ { @@ -1149,17 +1149,17 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.11", - "version_normalized": "5.4.11.0", + "version": "v5.4.12", + "version_normalized": "5.4.12.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd" + "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/6699fb0228d1bc35b12aed6dd5e7455457609ddd", - "reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/2d67c1f9a1937406a9be3171b4b22250c0a11447", + "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447", "shasum": "" }, "require": { @@ -1168,7 +1168,7 @@ "symfony/polyfill-mbstring": "~1.8", "symfony/polyfill-php80": "^1.16" }, - "time": "2022-07-20T13:00:38+00:00", + "time": "2022-08-02T13:48:16+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -1196,7 +1196,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.11" + "source": "https://github.com/symfony/filesystem/tree/v5.4.12" }, "funding": [ { @@ -1943,17 +1943,17 @@ }, { "name": "symfony/string", - "version": "v5.4.11", - "version_normalized": "5.4.11.0", + "version": "v5.4.12", + "version_normalized": "5.4.12.0", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322" + "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/5eb661e49ad389e4ae2b6e4df8d783a8a6548322", - "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322", + "url": "https://api.github.com/repos/symfony/string/zipball/2fc515e512d721bf31ea76bd02fe23ada4640058", + "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058", "shasum": "" }, "require": { @@ -1973,7 +1973,7 @@ "symfony/translation-contracts": "^1.1|^2", "symfony/var-exporter": "^4.4|^5.0|^6.0" }, - "time": "2022-07-24T16:15:25+00:00", + "time": "2022-08-12T17:03:11+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -2012,7 +2012,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.11" + "source": "https://github.com/symfony/string/tree/v5.4.12" }, "funding": [ { |