From b4536fdb1154a983991873c74fa4de75b5e3102d Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Wed, 22 Oct 2025 18:53:20 +0400 Subject: [PATCH 1/6] maj projet --- .pman.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pman.conf b/.pman.conf index 9567ae4..1787100 100644 --- a/.pman.conf +++ b/.pman.conf @@ -13,14 +13,14 @@ NOAUTO= AFTER_CREATE_RELEASE=' set -x -pcomp-select-profile.php dist +pcomp-select_profile.php dist composer u || exit 1 git commit -am "deps de dist" true ' AFTER_MERGE_RELEASE=' set -x -pcomp-select-profile.php dev +pcomp-select_profile.php dev composer u || exit 1 git commit -am "deps de dev" true From 5cb7f31eb1d0bddeeb88d95e12aadd67476ecbf7 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Wed, 22 Oct 2025 19:06:15 +0400 Subject: [PATCH 2/6] maj doc --- README.md | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) 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 From 7d616288b837a0ef20de06ac839b03e57c943772 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Wed, 22 Oct 2025 19:06:43 +0400 Subject: [PATCH 3/6] maj projet --- .composer.pman.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.composer.pman.yml b/.composer.pman.yml index 3795638..53a38f5 100644 --- a/.composer.pman.yml +++ b/.composer.pman.yml @@ -11,6 +11,6 @@ composer: dist: link: false require-dev: - nulib/base: ^0.6.0p74 - nulib/spout: ^0.6.0p74 - nulib/phpss: ^0.6.0p74 + nulib/base: ^0.7.0p74 + nulib/spout: ^0.7.0p74 + nulib/phpss: ^0.7.0p74 From d9db165865e0532e175404e4f7153ef1ae6a661c Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Wed, 22 Oct 2025 19:07:05 +0400 Subject: [PATCH 4/6] Init changelog & version 0.7.0p74 --- CHANGES.md | 4 ++++ VERSION.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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/VERSION.txt b/VERSION.txt index a918a2a..faef31a 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -0.6.0 +0.7.0 From 98f205499d7078ca5ab35e147ac11230fe1e1ee2 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Wed, 22 Oct 2025 19:07:13 +0400 Subject: [PATCH 5/6] deps de dist --- composer.json | 18 ++-------- composer.lock | 97 +++++++++++++++++++++++---------------------------- 2 files changed, 46 insertions(+), 69 deletions(-) diff --git a/composer.json b/composer.json index da8dad2..657ad07 100644 --- a/composer.json +++ b/composer.json @@ -3,18 +3,6 @@ "type": "library", "description": "espace de maturation pour les librairies", "repositories": [ - { - "type": "path", - "url": "../nulib-base" - }, - { - "type": "path", - "url": "../nulib-spout" - }, - { - "type": "path", - "url": "../nulib-phpss" - }, { "type": "composer", "url": "https://repos.univ-reunion.fr/composer" @@ -30,9 +18,9 @@ "php": "^7.4" }, "require-dev": { - "nulib/base": "^7.4-dev", - "nulib/spout": "^7.4-dev", - "nulib/phpss": "^7.4-dev", + "nulib/base": "^0.7.0p74", + "nulib/spout": "^0.7.0p74", + "nulib/phpss": "^0.7.0p74", "nulib/tests": "^7.4", "ext-posix": "*", "ext-pcntl": "*", diff --git a/composer.lock b/composer.lock index ea3409a..b768a2d 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": "2dc79f259fa01ba2a990fbcb8fcec728", + "content-hash": "11d764f82f5881d832cc100b24c5ce82", "packages": [], "packages-dev": [ { @@ -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,25 +991,25 @@ ], "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", - "version": "dev-dev74", - "dist": { - "type": "path", - "url": "../nulib-base", - "reference": "c62de542c35b8c394a56ebab221734409e0c9759" + "version": "0.7.0p74", + "source": { + "type": "git", + "url": "https://git.univ-reunion.fr/sda-php/nulib-base.git", + "reference": "64ab6c70e4f089c43714ec3d38dab7161aeb2b0d" }, "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": "*" @@ -1059,20 +1059,18 @@ } ], "description": "fonctions et classes essentielles", - "transport-options": { - "relative": true - } + "time": "2025-10-22T14:34:02+00:00" }, { "name": "nulib/phpss", - "version": "dev-dev74", - "dist": { - "type": "path", - "url": "../nulib-phpss", - "reference": "45ad56b20155e3ad07b97f85bb959bff82218228" + "version": "0.7.1p74", + "source": { + "type": "git", + "url": "https://git.univ-reunion.fr/sda-php/nulib-phpss.git", + "reference": "cb456f24ddc1cdcf3cab7c02da6f707b57c8dd2f" }, "require": { - "nulib/base": "^7.4-dev", + "nulib/base": "^0.7.0p74", "php": "^7.4", "phpoffice/phpspreadsheet": "^1.0" }, @@ -1103,17 +1101,15 @@ } ], "description": "wrapper pour phpoffice/phpspreadsheet", - "transport-options": { - "relative": true - } + "time": "2025-10-22T14:53:59+00:00" }, { "name": "nulib/spout", - "version": "dev-dev74", - "dist": { - "type": "path", - "url": "../nulib-spout", - "reference": "239c8aff8a5defa0e605f3d92df110b74c221f67" + "version": "0.7.1p74", + "source": { + "type": "git", + "url": "https://git.univ-reunion.fr/sda-php/nulib-spout.git", + "reference": "9b1e49ac39c65d849114aeccf559e08b715bd600" }, "require": { "ext-dom": "*", @@ -1121,7 +1117,7 @@ "ext-libxml": "*", "ext-xmlreader": "*", "ext-zip": "*", - "nulib/base": "^7.4-dev", + "nulib/base": "^0.7.0p74", "php": "^7.4" }, "replace": { @@ -1159,9 +1155,7 @@ } ], "description": "wrapper pour openspout/openspout", - "transport-options": { - "relative": true - } + "time": "2025-10-22T14:41:02+00:00" }, { "name": "nulib/tests", @@ -1321,16 +1315,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 +1345,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 +1384,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 +1392,7 @@ "type": "github" } ], - "time": "2025-09-30T11:54:53+00:00" + "time": "2025-10-15T16:49:08+00:00" }, { "name": "phpoffice/phpspreadsheet", @@ -4278,11 +4271,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "nulib/base": 20, - "nulib/spout": 20, - "nulib/phpss": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { From 0d713f521dc45e96315dcd0bd092bfcbd7a75f1f Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Wed, 22 Oct 2025 19:07:18 +0400 Subject: [PATCH 6/6] deps de dev --- composer.json | 18 ++++++++++++++--- composer.lock | 54 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 47 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index 657ad07..da8dad2 100644 --- a/composer.json +++ b/composer.json @@ -3,6 +3,18 @@ "type": "library", "description": "espace de maturation pour les librairies", "repositories": [ + { + "type": "path", + "url": "../nulib-base" + }, + { + "type": "path", + "url": "../nulib-spout" + }, + { + "type": "path", + "url": "../nulib-phpss" + }, { "type": "composer", "url": "https://repos.univ-reunion.fr/composer" @@ -18,9 +30,9 @@ "php": "^7.4" }, "require-dev": { - "nulib/base": "^0.7.0p74", - "nulib/spout": "^0.7.0p74", - "nulib/phpss": "^0.7.0p74", + "nulib/base": "^7.4-dev", + "nulib/spout": "^7.4-dev", + "nulib/phpss": "^7.4-dev", "nulib/tests": "^7.4", "ext-posix": "*", "ext-pcntl": "*", diff --git a/composer.lock b/composer.lock index b768a2d..94a6934 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": "11d764f82f5881d832cc100b24c5ce82", + "content-hash": "2dc79f259fa01ba2a990fbcb8fcec728", "packages": [], "packages-dev": [ { @@ -997,11 +997,11 @@ }, { "name": "nulib/base", - "version": "0.7.0p74", - "source": { - "type": "git", - "url": "https://git.univ-reunion.fr/sda-php/nulib-base.git", - "reference": "64ab6c70e4f089c43714ec3d38dab7161aeb2b0d" + "version": "dev-dev74", + "dist": { + "type": "path", + "url": "../nulib-base", + "reference": "b6d53059a3dc39d0aa9d4492c362e9f1d1cce16e" }, "require": { "ext-json": "*", @@ -1059,18 +1059,20 @@ } ], "description": "fonctions et classes essentielles", - "time": "2025-10-22T14:34:02+00:00" + "transport-options": { + "relative": true + } }, { "name": "nulib/phpss", - "version": "0.7.1p74", - "source": { - "type": "git", - "url": "https://git.univ-reunion.fr/sda-php/nulib-phpss.git", - "reference": "cb456f24ddc1cdcf3cab7c02da6f707b57c8dd2f" + "version": "dev-dev74", + "dist": { + "type": "path", + "url": "../nulib-phpss", + "reference": "06802fe052af5259cd4a1d83d928025ed69bbefa" }, "require": { - "nulib/base": "^0.7.0p74", + "nulib/base": "^7.4-dev", "php": "^7.4", "phpoffice/phpspreadsheet": "^1.0" }, @@ -1101,15 +1103,17 @@ } ], "description": "wrapper pour phpoffice/phpspreadsheet", - "time": "2025-10-22T14:53:59+00:00" + "transport-options": { + "relative": true + } }, { "name": "nulib/spout", - "version": "0.7.1p74", - "source": { - "type": "git", - "url": "https://git.univ-reunion.fr/sda-php/nulib-spout.git", - "reference": "9b1e49ac39c65d849114aeccf559e08b715bd600" + "version": "dev-dev74", + "dist": { + "type": "path", + "url": "../nulib-spout", + "reference": "d843ef4600a6906debc9b6947971f7fe58e4869c" }, "require": { "ext-dom": "*", @@ -1117,7 +1121,7 @@ "ext-libxml": "*", "ext-xmlreader": "*", "ext-zip": "*", - "nulib/base": "^0.7.0p74", + "nulib/base": "^7.4-dev", "php": "^7.4" }, "replace": { @@ -1155,7 +1159,9 @@ } ], "description": "wrapper pour openspout/openspout", - "time": "2025-10-22T14:41:02+00:00" + "transport-options": { + "relative": true + } }, { "name": "nulib/tests", @@ -4271,7 +4277,11 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "nulib/base": 20, + "nulib/spout": 20, + "nulib/phpss": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": {