From cafa661a21870e34a5fdcd603b58e279dc5bce93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Wed, 2 Jun 2021 12:35:14 +0200 Subject: [PATCH] Fix: Update composer/composer --- CHANGELOG.md | 5 +++ Makefile | 2 +- composer.json | 2 +- composer.lock | 87 +++++++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 88 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 407e120f..2a8a4f95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,10 @@ For a full diff see [`2.13.4...2.14.0`][2.13.4...2.14.0]. * Updated `schema.json` ([#744]), by [@ergebnis-bot] +### Fixed + +* Updated `composer/composer` ([#750]), by [@localheinz] + ## [`2.13.4`][2.13.4] For a full diff see [`2.13.3...2.13.4`][2.13.3...2.13.4]. @@ -716,6 +720,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0]. [#707]: https://github.com/ergebnis/composer-normalize/pull/707 [#743]: https://github.com/ergebnis/composer-normalize/pull/743 [#744]: https://github.com/ergebnis/composer-normalize/pull/744 +[#750]: https://github.com/ergebnis/composer-normalize/pull/750 [@core23]: https://github.com/core23 [@dependabot]: https://github.com/dependabot diff --git a/Makefile b/Makefile index 5bac2b2c..8d451de1 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -COMPOSER_VERSION:=2.0.8 +COMPOSER_VERSION:=2.0.13 .PHONY: it it: coding-standards static-code-analysis tests ## Runs the coding-standards, static-code-analysis, and tests targets diff --git a/composer.json b/composer.json index 3e6761d7..0adb5e90 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "localheinz/diff": "^1.1.1" }, "require-dev": { - "composer/composer": "^1.10.19 || ^2.0.8", + "composer/composer": "^1.10.22 || ^2.0.13", "ergebnis/license": "^1.1.0", "ergebnis/php-cs-fixer-config": "^2.14.0", "ergebnis/phpstan-rules": "~0.15.3", diff --git a/composer.lock b/composer.lock index fc110c36..44857381 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e2bb6883ee4cef7afab377ca1d7ff9a4", + "content-hash": "1dcd0403b39d8206732d95142e18d9fa", "packages": [ { "name": "ergebnis/json-normalizer", @@ -512,20 +512,21 @@ }, { "name": "composer/composer", - "version": "2.0.8", + "version": "2.0.13", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "62139b2806178adb979d76bd3437534a1a9fd490" + "reference": "986e8b86b7b570632ad0a905c3726c33dd4c0efb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/62139b2806178adb979d76bd3437534a1a9fd490", - "reference": "62139b2806178adb979d76bd3437534a1a9fd490", + "url": "https://api.github.com/repos/composer/composer/zipball/986e8b86b7b570632ad0a905c3726c33dd4c0efb", + "reference": "986e8b86b7b570632ad0a905c3726c33dd4c0efb", "shasum": "" }, "require": { "composer/ca-bundle": "^1.0", + "composer/metadata-minifier": "^1.0", "composer/semver": "^3.0", "composer/spdx-licenses": "^1.2", "composer/xdebug-handler": "^1.1", @@ -586,6 +587,80 @@ "dependency", "package" ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/composer/issues", + "source": "https://github.com/composer/composer/tree/2.0.13" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2021-04-27T11:11:08+00:00" + }, + { + "name": "composer/metadata-minifier", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/composer/metadata-minifier.git", + "reference": "c549d23829536f0d0e984aaabbf02af91f443207" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/metadata-minifier/zipball/c549d23829536f0d0e984aaabbf02af91f443207", + "reference": "c549d23829536f0d0e984aaabbf02af91f443207", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "composer/composer": "^2", + "phpstan/phpstan": "^0.12.55", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\MetadataMinifier\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "Small utility library that handles metadata minification and expansion.", + "keywords": [ + "composer", + "compression" + ], + "support": { + "issues": "https://github.com/composer/metadata-minifier/issues", + "source": "https://github.com/composer/metadata-minifier/tree/1.0.0" + }, "funding": [ { "url": "https://packagist.com", @@ -600,7 +675,7 @@ "type": "tidelift" } ], - "time": "2020-12-03T16:20:39+00:00" + "time": "2021-04-07T13:37:33+00:00" }, { "name": "composer/package-versions-deprecated",