diff --git a/.changes/2.7.0.md b/.changes/2.7.0.md new file mode 100644 index 0000000..f3da2ca --- /dev/null +++ b/.changes/2.7.0.md @@ -0,0 +1,3 @@ +## 2.7.0 - 2025-01-20 +### Release +* Update chill bundles to version 3.6.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 390b49a..e0f21ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html), and is generated by [Changie](https://github.com/miniscruff/changie). +## 2.7.0 - 2025-01-20 +### Release +* Update chill bundles to version 3.6.0 + ## 2.6.0 - 2025-01-08 ### Release * Update to chill bundles v3.5.3 diff --git a/composer.json b/composer.json index 1b642f3..9aa62c4 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "ext-iconv": "*", "champs-libres/wopi-bundle": "dev-master@dev", "champs-libres/wopi-lib": "dev-master@dev", - "chill-project/chill-bundles": "dev-user_edit_form@dev", + "chill-project/chill-bundles": "3.6.0", "chill-project/chill-deploy": "^1.0", "graylog2/gelf-php": "^2.0", "symfony/console": "5.4.*", diff --git a/composer.lock b/composer.lock index 73f407b..ef7f15a 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": "aebddbd51d951d8d0ac15afaebf7ba0b", + "content-hash": "d69b68c3ec9ef39f6153cde872c726fa", "packages": [ { "name": "brick/math", @@ -185,16 +185,16 @@ }, { "name": "chill-project/chill-bundles", - "version": "dev-user_edit_form", + "version": "v3.6.0", "source": { "type": "git", "url": "https://gitlab.com/Chill-Projet/chill-bundles.git", - "reference": "527285bb13d5cd7e3b4f0293267ccc0fcd5d1e92" + "reference": "19fa308c06a40751b1ad509d042d0cf6961d150b" }, "dist": { "type": "zip", - "url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=527285bb13d5cd7e3b4f0293267ccc0fcd5d1e92", - "reference": "527285bb13d5cd7e3b4f0293267ccc0fcd5d1e92", + "url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=19fa308c06a40751b1ad509d042d0cf6961d150b", + "reference": "19fa308c06a40751b1ad509d042d0cf6961d150b", "shasum": "" }, "require": { @@ -340,9 +340,9 @@ ], "support": { "issues": "https://gitlab.com/Chill-Projet/chill-bundles/-/issues", - "source": "https://gitlab.com/Chill-Projet/chill-bundles/-/tree/user_edit_form" + "source": "https://gitlab.com/Chill-Projet/chill-bundles/-/tree/v3.6.0" }, - "time": "2025-01-20T12:31:38+00:00" + "time": "2025-01-16T18:00:48+00:00" }, { "name": "chill-project/chill-deploy", @@ -2307,22 +2307,25 @@ }, { "name": "graylog2/gelf-php", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/bzikarsky/gelf-php.git", - "reference": "29ef48fa6eac6c8787b588949483f1739c57ad4f" + "reference": "d592ca54e81f1d678470e100788e87e319bd923b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bzikarsky/gelf-php/zipball/29ef48fa6eac6c8787b588949483f1739c57ad4f", - "reference": "29ef48fa6eac6c8787b588949483f1739c57ad4f", + "url": "https://api.github.com/repos/bzikarsky/gelf-php/zipball/d592ca54e81f1d678470e100788e87e319bd923b", + "reference": "d592ca54e81f1d678470e100788e87e319bd923b", "shasum": "" }, "require": { "php": ">=8.0", "psr/log": "^1|^2|^3" }, + "conflict": { + "monolog/monolog": "^1" + }, "provide": { "psr/log-implementation": "3.0.0" }, @@ -2354,9 +2357,9 @@ "description": "A php implementation to send log-messages to a GELF compatible backend like Graylog2.", "support": { "issues": "https://github.com/bzikarsky/gelf-php/issues", - "source": "https://github.com/bzikarsky/gelf-php/tree/2.0.1" + "source": "https://github.com/bzikarsky/gelf-php/tree/2.0.2" }, - "time": "2023-05-23T14:45:24+00:00" + "time": "2025-01-20T15:05:32+00:00" }, { "name": "guzzlehttp/guzzle", @@ -12521,8 +12524,7 @@ "minimum-stability": "stable", "stability-flags": { "champs-libres/wopi-bundle": 20, - "champs-libres/wopi-lib": 20, - "chill-project/chill-bundles": 20 + "champs-libres/wopi-lib": 20 }, "prefer-stable": true, "prefer-lowest": false,