diff --git a/CHANGES.md b/CHANGES.md index 3779907..8eda28b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +## Release 0.7.0p74 du 22/10/2025-19:06 + +* maj nulib/base-0.7.0 + ## Release 0.6.0p82 du 30/05/2025-23:39 ## Release 0.6.0p74 du 30/05/2025-23:35 diff --git a/README.md b/README.md index eecc3f9..43fdaf6 100644 --- a/README.md +++ b/README.md @@ -11,12 +11,19 @@ majeure correspondante sur * nulib/spout * nulib/phpss +Ouvrir deux consoles +* console "74" avec le checkout de la version php7.4 +* console "82" avec le checkout de la version php8.2 + ~~~sh +## dans les deux consoles + version=0.6.0 major="${version%.*}.0" -## branche dev74 +## console 74 + git checkout dev74 sed -ri "\ @@ -29,7 +36,10 @@ prel -v$version # en cas de conflit, sélectionner HEAD _merge82 -## branche dev82 +## console 82 + +pu + git checkout dev82 sed -ri "\ @@ -42,10 +52,21 @@ prel -C commit="$(git log --grep="Init changelog . version ${version}p82" --format=%H)" && echo "commit=$commit" +## console 74 + +# reprendre la valeur affichée par la précédente commande +commit=XXX + +pu + git checkout dev74 git cherry-pick "$commit" pp -a + +## console 82 + +pu ~~~ -*- coding: utf-8 mode: markdown -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8:noeol:binary \ No newline at end of file diff --git a/VERSION.txt b/VERSION.txt index a918a2a..faef31a 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -0.6.0 +0.7.0 diff --git a/composer.lock b/composer.lock index ea3409a..94a6934 100644 --- a/composer.lock +++ b/composer.lock @@ -233,20 +233,20 @@ }, { "name": "ezyang/htmlpurifier", - "version": "v4.18.0", + "version": "v4.19.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "cb56001e54359df7ae76dc522d08845dc741621b" + "reference": "b287d2a16aceffbf6e0295559b39662612b77fcf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/cb56001e54359df7ae76dc522d08845dc741621b", - "reference": "cb56001e54359df7ae76dc522d08845dc741621b", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/b287d2a16aceffbf6e0295559b39662612b77fcf", + "reference": "b287d2a16aceffbf6e0295559b39662612b77fcf", "shasum": "" }, "require": { - "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0" + "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0" }, "require-dev": { "cerdic/css-tidy": "^1.7 || ^2.0", @@ -288,9 +288,9 @@ ], "support": { "issues": "https://github.com/ezyang/htmlpurifier/issues", - "source": "https://github.com/ezyang/htmlpurifier/tree/v4.18.0" + "source": "https://github.com/ezyang/htmlpurifier/tree/v4.19.0" }, - "time": "2024-11-01T03:51:45+00:00" + "time": "2025-10-17T16:34:55+00:00" }, { "name": "league/commonmark", @@ -939,16 +939,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.6.1", + "version": "v5.6.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2" + "reference": "3a454ca033b9e06b63282ce19562e892747449bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2", - "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3a454ca033b9e06b63282ce19562e892747449bb", + "reference": "3a454ca033b9e06b63282ce19562e892747449bb", "shasum": "" }, "require": { @@ -991,9 +991,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.2" }, - "time": "2025-08-13T20:13:15+00:00" + "time": "2025-10-21T19:32:17+00:00" }, { "name": "nulib/base", @@ -1001,15 +1001,15 @@ "dist": { "type": "path", "url": "../nulib-base", - "reference": "c62de542c35b8c394a56ebab221734409e0c9759" + "reference": "b6d53059a3dc39d0aa9d4492c362e9f1d1cce16e" }, "require": { "ext-json": "*", - "league/commonmark": "^2.4", + "league/commonmark": "^2.7", "php": "^7.4", "phpmailer/phpmailer": "^6.8", "symfony/expression-language": "^5.4", - "symfony/yaml": "^5.0" + "symfony/yaml": "^5.4" }, "replace": { "nulib/php": "*" @@ -1069,7 +1069,7 @@ "dist": { "type": "path", "url": "../nulib-phpss", - "reference": "45ad56b20155e3ad07b97f85bb959bff82218228" + "reference": "06802fe052af5259cd4a1d83d928025ed69bbefa" }, "require": { "nulib/base": "^7.4-dev", @@ -1113,7 +1113,7 @@ "dist": { "type": "path", "url": "../nulib-spout", - "reference": "239c8aff8a5defa0e605f3d92df110b74c221f67" + "reference": "d843ef4600a6906debc9b6947971f7fe58e4869c" }, "require": { "ext-dom": "*", @@ -1321,16 +1321,16 @@ }, { "name": "phpmailer/phpmailer", - "version": "v6.11.1", + "version": "v6.12.0", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "d9e3b36b47f04b497a0164c5a20f92acb4593284" + "reference": "d1ac35d784bf9f5e61b424901d5a014967f15b12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/d9e3b36b47f04b497a0164c5a20f92acb4593284", - "reference": "d9e3b36b47f04b497a0164c5a20f92acb4593284", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/d1ac35d784bf9f5e61b424901d5a014967f15b12", + "reference": "d1ac35d784bf9f5e61b424901d5a014967f15b12", "shasum": "" }, "require": { @@ -1351,7 +1351,6 @@ }, "suggest": { "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication", - "ext-imap": "Needed to support advanced email address parsing according to RFC822", "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses", "ext-openssl": "Needed for secure SMTP sending and DKIM signing", "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication", @@ -1391,7 +1390,7 @@ "description": "PHPMailer is a full-featured email creation and transfer class for PHP", "support": { "issues": "https://github.com/PHPMailer/PHPMailer/issues", - "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.11.1" + "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.12.0" }, "funding": [ { @@ -1399,7 +1398,7 @@ "type": "github" } ], - "time": "2025-09-30T11:54:53+00:00" + "time": "2025-10-15T16:49:08+00:00" }, { "name": "phpoffice/phpspreadsheet",