From f9c420058015d02e913f0d65c41242ec7b8a0cee Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Sat, 1 Mar 2025 09:26:36 +0400 Subject: [PATCH 1/9] =?UTF-8?q?r=C3=A9tablir=20deps=20de=20dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1f19f97..329e133 100644 --- a/composer.json +++ b/composer.json @@ -3,6 +3,10 @@ "type": "library", "description": "wrapper pour openspout/openspout", "repositories": [ + { + "type": "path", + "url": "../nulib" + }, { "type": "composer", "url": "https://repos.univ-reunion.fr/composer" @@ -18,7 +22,7 @@ "openspout/openspout": "v3.7.4" }, "require": { - "nulib/php": "^0.3.0p74", + "nulib/php": "^7.4-dev", "ext-dom": "*", "ext-filter": "*", "ext-libxml": "*", From ddce350e102677ebc124060ae47520cfd10a54fb Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Sun, 2 Mar 2025 15:32:30 +0400 Subject: [PATCH 2/9] ajout config .pman.yml --- .pman.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .pman.yml diff --git a/.pman.yml b/.pman.yml new file mode 100644 index 0000000..a220438 --- /dev/null +++ b/.pman.yml @@ -0,0 +1,12 @@ +# -*- coding: utf-8 mode: yaml -*- vim:sw=2:sts=2:et:ai:si:sta:fenc=utf-8 + +composer: + profiles: [ dev, dist ] + dev: + link: true + require: + nulib/php: ^7.4-dev + dist: + link: false + require: + nulib/php: ^0.3.0p74 From 88448ad7acc09a7b5ffcdc8615bdf9f5689c1d2c Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Sun, 2 Mar 2025 19:15:02 +0400 Subject: [PATCH 3/9] maj projet --- .pman.conf | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.pman.conf b/.pman.conf index 271161c..0a1b199 100644 --- a/.pman.conf +++ b/.pman.conf @@ -9,4 +9,15 @@ TAG_PREFIX= TAG_SUFFIX=p74 HOTFIX=hotf74- DIST= -NOAUTO=1 +NOAUTO= + +AFTER_CREATE_RELEASE=' +pman --composer-select-profile dist +composer u +git commit -am "deps de prod" +' +AFTER_MERGE_RELEASE=' +pman --composer-select-profile dev +composer u +git commit -am "deps de dev" +' From 0fec142a904e485c30b73200ce4e3fe41c73ca89 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Sun, 2 Mar 2025 19:16:06 +0400 Subject: [PATCH 4/9] modifs.mineures sans commentaires --- .pman.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pman.conf b/.pman.conf index 0a1b199..26818d1 100644 --- a/.pman.conf +++ b/.pman.conf @@ -14,7 +14,7 @@ NOAUTO= AFTER_CREATE_RELEASE=' pman --composer-select-profile dist composer u -git commit -am "deps de prod" +git commit -am "deps de dist" ' AFTER_MERGE_RELEASE=' pman --composer-select-profile dev From d70c1096c2647ed2ba071b27a0a5869429730ebe Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Tue, 4 Mar 2025 12:22:33 +0400 Subject: [PATCH 5/9] maj projet --- .pman.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pman.conf b/.pman.conf index 26818d1..afc1654 100644 --- a/.pman.conf +++ b/.pman.conf @@ -13,11 +13,11 @@ NOAUTO= AFTER_CREATE_RELEASE=' pman --composer-select-profile dist -composer u +composer u || exit 1 git commit -am "deps de dist" ' AFTER_MERGE_RELEASE=' pman --composer-select-profile dev -composer u +composer u || exit 1 git commit -am "deps de dev" ' From 7e9031169d5f4fc692da04ebf97175cfab08fdf0 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Tue, 4 Mar 2025 12:39:26 +0400 Subject: [PATCH 6/9] tracer le hook --- .pman.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.pman.conf b/.pman.conf index afc1654..03a7d14 100644 --- a/.pman.conf +++ b/.pman.conf @@ -12,12 +12,16 @@ DIST= NOAUTO= AFTER_CREATE_RELEASE=' +set -x pman --composer-select-profile dist composer u || exit 1 git commit -am "deps de dist" +true ' AFTER_MERGE_RELEASE=' +set -x pman --composer-select-profile dev composer u || exit 1 git commit -am "deps de dev" +true ' From 19ffe721ce37deb308ffc313eaf57b4064e7d9ed Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Tue, 4 Mar 2025 12:17:57 +0400 Subject: [PATCH 7/9] Init changelog & version 0.3.1p82 --- CHANGES.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index a5c1a7d..dec66e2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,10 @@ +## Release 0.3.1p82 du 04/03/2025-12:17 + +* `519f341` application patch page_order +* `85e9740` réorganiser les patches + +## Release 0.3.0p82 du 01/03/2025-09:28 + ## Release 0.3.0p74 du 01/03/2025-09:23 release initiale From 4567f505997132c0e032dbfdfc8184fa5df04e92 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Fri, 14 Mar 2025 15:35:30 +0400 Subject: [PATCH 8/9] Init changelog & version 0.4.0p74 --- CHANGES.md | 5 +++++ VERSION.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index dec66e2..3a24c49 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,8 @@ +## Release 0.4.0p74 du 14/03/2025-15:35 + +* `7e90311` tracer le hook +* `ddce350` ajout config .pman.yml + ## Release 0.3.1p82 du 04/03/2025-12:17 * `519f341` application patch page_order diff --git a/VERSION.txt b/VERSION.txt index 0d91a54..1d0ba9e 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -0.3.0 +0.4.0 From 67ad1e472a1feca4e547273e0a0c1d8b1509a68f Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Fri, 14 Mar 2025 15:35:51 +0400 Subject: [PATCH 9/9] deps de dist --- composer.json | 6 +----- composer.lock | 54 ++++++++++++++++++++++++--------------------------- 2 files changed, 26 insertions(+), 34 deletions(-) diff --git a/composer.json b/composer.json index 329e133..1f19f97 100644 --- a/composer.json +++ b/composer.json @@ -3,10 +3,6 @@ "type": "library", "description": "wrapper pour openspout/openspout", "repositories": [ - { - "type": "path", - "url": "../nulib" - }, { "type": "composer", "url": "https://repos.univ-reunion.fr/composer" @@ -22,7 +18,7 @@ "openspout/openspout": "v3.7.4" }, "require": { - "nulib/php": "^7.4-dev", + "nulib/php": "^0.3.0p74", "ext-dom": "*", "ext-filter": "*", "ext-libxml": "*", diff --git a/composer.lock b/composer.lock index 1165915..77e743c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,15 +4,15 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1096948ae214037700effae248ef800b", + "content-hash": "88b8dd015d5eea4d8b64ac39191acbf6", "packages": [ { "name": "nulib/php", - "version": "dev-dev74", - "dist": { - "type": "path", - "url": "../nulib", - "reference": "192a7f52c3b70f3f8ddc651f4be3992122c8ab04" + "version": "0.3.4p74", + "source": { + "type": "git", + "url": "https://git.univ-reunion.fr/sda-php/nulib.git", + "reference": "d4d51ffcea8ba641900cc7f2114be0b52f0d9e0b" }, "require": { "ext-json": "*", @@ -50,9 +50,7 @@ } ], "description": "fonctions et classes essentielles", - "transport-options": { - "relative": true - } + "time": "2025-03-01T02:23:16+00:00" }, { "name": "symfony/deprecation-contracts", @@ -747,16 +745,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.70.0", + "version": "v3.72.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "2ecd5aae0edc937f0d5aa4a22d1d705c6b2e084e" + "reference": "900389362c43d116fee1ffc51f7878145fa61b57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/2ecd5aae0edc937f0d5aa4a22d1d705c6b2e084e", - "reference": "2ecd5aae0edc937f0d5aa4a22d1d705c6b2e084e", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/900389362c43d116fee1ffc51f7878145fa61b57", + "reference": "900389362c43d116fee1ffc51f7878145fa61b57", "shasum": "" }, "require": { @@ -786,18 +784,18 @@ "symfony/stopwatch": "^5.4 || ^6.4 || ^7.0" }, "require-dev": { - "facile-it/paraunit": "^1.3.1 || ^2.5", - "infection/infection": "^0.29.10", - "justinrainbow/json-schema": "^5.3 || ^6.0", + "facile-it/paraunit": "^1.3.1 || ^2.6", + "infection/infection": "^0.29.14", + "justinrainbow/json-schema": "^5.3 || ^6.2", "keradus/cli-executor": "^2.1", "mikey179/vfsstream": "^1.6.12", "php-coveralls/php-coveralls": "^2.7", "php-cs-fixer/accessible-object": "^1.1", "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.6", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.6", - "phpunit/phpunit": "^9.6.22 || ^10.5.45 || ^11.5.7", - "symfony/var-dumper": "^5.4.48 || ^6.4.18 || ^7.2.0", - "symfony/yaml": "^5.4.45 || ^6.4.18 || ^7.2.0" + "phpunit/phpunit": "^9.6.22 || ^10.5.45 || ^11.5.12", + "symfony/var-dumper": "^5.4.48 || ^6.4.18 || ^7.2.3", + "symfony/yaml": "^5.4.45 || ^6.4.18 || ^7.2.3" }, "suggest": { "ext-dom": "For handling output formats in XML", @@ -838,7 +836,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.70.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.72.0" }, "funding": [ { @@ -846,7 +844,7 @@ "type": "github" } ], - "time": "2025-02-22T23:30:51+00:00" + "time": "2025-03-13T11:25:37+00:00" }, { "name": "myclabs/deep-copy", @@ -1124,16 +1122,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.19", + "version": "1.12.21", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "c42ba9bab7a940ed00092ecb1c77bad98896d789" + "reference": "14276fdef70575106a3392a4ed553c06a984df28" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c42ba9bab7a940ed00092ecb1c77bad98896d789", - "reference": "c42ba9bab7a940ed00092ecb1c77bad98896d789", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/14276fdef70575106a3392a4ed553c06a984df28", + "reference": "14276fdef70575106a3392a4ed553c06a984df28", "shasum": "" }, "require": { @@ -1178,7 +1176,7 @@ "type": "github" } ], - "time": "2025-02-19T15:42:21+00:00" + "time": "2025-03-09T09:24:50+00:00" }, { "name": "phpstan/phpstan-phpunit", @@ -4570,9 +4568,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "nulib/php": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": {