Skip to content

Commit

Permalink
Fix: Update composer/composer
Browse files Browse the repository at this point in the history
  • Loading branch information
localheinz committed Dec 11, 2023
1 parent e655b3c commit f5797bb
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ jobs:

env:
COMPOSER_NORMALIZE_PHAR: ".build/phar/composer-normalize.phar"
COMPOSER_VERSION: "2.6.5"
COMPOSER_VERSION: "2.6.6"

steps:
- name: "Checkout"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
env:
COMPOSER_NORMALIZE_PHAR: ".build/phar/composer-normalize.phar"
COMPOSER_NORMALIZE_PHAR_SIGNATURE: ".build/phar/composer-normalize.phar.asc"
COMPOSER_VERSION: "2.6.5"
COMPOSER_VERSION: "2.6.6"
GPG_KEYS: ".build/phar/keys.asc"
GPG_KEYS_ENCRYPTED: "phar/keys.asc.gpg"

Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

For a full diff see [`2.40.0...main`][2.40.0...main].

### Fixed

- Updated `composer/composer` ([#1188]), by [@localheinz]

## [`2.40.0`][2.40.0]

For a full diff see [`2.39.0...2.40.0`][2.39.0...2.40.0].
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
COMPOSER_VERSION:=2.6.5
COMPOSER_VERSION:=2.6.6

.PHONY: it
it: refactoring coding-standards security-analysis static-code-analysis tests ## Runs the refactoring, coding-standards, security-analysis, static-code-analysis, and tests targets
Expand Down
5 changes: 1 addition & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"localheinz/diff": "^1.1.1"
},
"require-dev": {
"composer/composer": "^2.6.5",
"composer/composer": "^2.6.6",
"ergebnis/license": "^2.4.0",
"ergebnis/php-cs-fixer-config": "~6.13.1",
"ergebnis/phpunit-slow-test-detector": "^2.7.0",
Expand All @@ -45,9 +45,6 @@
"symfony/filesystem": "^6.4.0",
"vimeo/psalm": "^5.17.0"
},
"conflict": {
"symfony/console": "^7.0.0"
},
"minimum-stability": "dev",
"prefer-stable": true,
"autoload": {
Expand Down
16 changes: 8 additions & 8 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f5797bb

Please sign in to comment.