From b0c6f0cc9e5e15f822ea586df3d8aac8b4c30210 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Wed, 30 Apr 2025 04:46:36 +0400 Subject: [PATCH 1/8] deps de dev --- composer.json | 6 +++++- composer.lock | 20 ++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 1f566f0..2aa641b 100644 --- a/composer.json +++ b/composer.json @@ -3,6 +3,10 @@ "type": "library", "description": "wrapper pour phpoffice/phpspreadsheet", "repositories": [ + { + "type": "path", + "url": "../nulib" + }, { "type": "composer", "url": "https://repos.univ-reunion.fr/composer" @@ -15,7 +19,7 @@ } }, "require": { - "nulib/php": "^0.5.0p74", + "nulib/php": "^7.4-dev", "phpoffice/phpspreadsheet": "^1.0", "php": "^7.4" }, diff --git a/composer.lock b/composer.lock index c8bf112..fb0d11d 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": "d0d9efbef8093b96775343530927123d", + "content-hash": "d4342f68b5a710c89ae6ee1159f698c9", "packages": [ { "name": "composer/pcre", @@ -396,11 +396,11 @@ }, { "name": "nulib/php", - "version": "0.5.0p74", - "source": { - "type": "git", - "url": "https://git.univ-reunion.fr/sda-php/nulib.git", - "reference": "4037bf20424eb48708e5fdf9fc8e10f2ef71d134" + "version": "dev-dev74", + "dist": { + "type": "path", + "url": "../nulib", + "reference": "1671354fd8eed5044d3f7593f3db9185f4c16bc6" }, "require": { "ext-json": "*", @@ -440,7 +440,9 @@ } ], "description": "fonctions et classes essentielles", - "time": "2025-04-30T00:32:10+00:00" + "transport-options": { + "relative": true + } }, { "name": "phpoffice/phpspreadsheet", @@ -2844,7 +2846,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "nulib/php": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { From e68672917d2c51d5cf559835a71d49b66facd081 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Wed, 30 Apr 2025 04:48:26 +0400 Subject: [PATCH 2/8] Init changelog & version 0.5.0p82 --- CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 93bef39..a257870 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,5 @@ +## Release 0.5.0p82 du 30/04/2025-04:48 + ## Release 0.5.0p74 du 30/04/2025-04:46 ## Release 0.4.0p82 du 14/03/2025-15:30 From 6fd59afb257e8add4d6b5f524ab2f90a6531c9c7 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Wed, 30 Apr 2025 05:46:46 +0400 Subject: [PATCH 3/8] maj doc --- README.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..8d1873b --- /dev/null +++ b/README.md @@ -0,0 +1,46 @@ +# nulib-phpss + + +## Release + +Exemple: release de la version 0.6.0 + +Avant de faire une release majeure sur nulib/phpss, faire d'abord la release +majeure correspondante sur +* nulib/php + +~~~sh +version=0.6.0 + +major="${version%.*}.0" + +## branche dev74 +git checkout dev74 + +sed -ri "\ +/nulib\/.*:/s/[0-9]+.[0-9]+.0p74/${major}p74/ +" .composer.pman.yml +pci "maj projet" + +prel -v$version + +# en cas de conflit, sélectionner HEAD +_merge82 + +## branche dev82 +git checkout dev82 + +sed -ri "\ +/nulib\/.*:/s/[0-9]+.[0-9]+.0p82/${major}p82/ +" .composer.pman.yml +pci "maj projet" + +prel -C + +commit="$(git log --grep="Init changelog . version ${version}p82" --format=%H)" +git checkout dev74 +git cherry-pick "$commit" +pp -a +~~~ + +-*- 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 3e41a5d8a36382d102d0aaad0e2ef18ea49e2d90 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Mon, 12 May 2025 15:42:17 +0400 Subject: [PATCH 4/8] modifs.mineures sans commentaires --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8d1873b..17ba392 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,11 @@ pci "maj projet" prel -C -commit="$(git log --grep="Init changelog . version ${version}p82" --format=%H)" +commit="$(git log --grep="Init changelog . version ${version}p82" --format=%H)" && +echo "commit=$commit" + git checkout dev74 + git cherry-pick "$commit" pp -a ~~~ From 824c1ecb2bf37be77b77db3aa9a2e8b9a05e33f6 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Fri, 30 May 2025 23:17:27 +0400 Subject: [PATCH 5/8] =?UTF-8?q?migration=20de=20nulib/php=20=C3=A0=20nulib?= =?UTF-8?q?/base?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .composer.pman.yml | 4 ++-- README.md | 2 +- composer.json | 4 ++-- composer.lock | 52 ++++++++++++++++++++++++++++------------------ 4 files changed, 37 insertions(+), 25 deletions(-) diff --git a/.composer.pman.yml b/.composer.pman.yml index 6c9491f..0efd7c5 100644 --- a/.composer.pman.yml +++ b/.composer.pman.yml @@ -5,8 +5,8 @@ composer: dev: link: true require: - nulib/php: ^7.4-dev + nulib/base: ^7.4-dev dist: link: false require: - nulib/php: ^0.5.0p74 + nulib/base: ^0.5.0p74 diff --git a/README.md b/README.md index 17ba392..063aa21 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Exemple: release de la version 0.6.0 Avant de faire une release majeure sur nulib/phpss, faire d'abord la release majeure correspondante sur -* nulib/php +* nulib/base ~~~sh version=0.6.0 diff --git a/composer.json b/composer.json index 2aa641b..386e154 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "repositories": [ { "type": "path", - "url": "../nulib" + "url": "../nulib-base" }, { "type": "composer", @@ -19,7 +19,7 @@ } }, "require": { - "nulib/php": "^7.4-dev", + "nulib/base": "^7.4-dev", "phpoffice/phpspreadsheet": "^1.0", "php": "^7.4" }, diff --git a/composer.lock b/composer.lock index fb0d11d..920c2af 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": "d4342f68b5a710c89ae6ee1159f698c9", + "content-hash": "6dc1632c00c3a9480171d34a2976d8f5", "packages": [ { "name": "composer/pcre", @@ -395,18 +395,21 @@ "time": "2025-01-14T11:49:03+00:00" }, { - "name": "nulib/php", + "name": "nulib/base", "version": "dev-dev74", "dist": { "type": "path", - "url": "../nulib", - "reference": "1671354fd8eed5044d3f7593f3db9185f4c16bc6" + "url": "../nulib-base", + "reference": "a319baec05c4022edc07f738a9f4cbad3e486b82" }, "require": { "ext-json": "*", "php": "^7.4", "symfony/yaml": "^5.0" }, + "replace": { + "nulib/php": "<0.6.0" + }, "require-dev": { "ext-curl": "*", "ext-pcntl": "*", @@ -830,7 +833,7 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.31.0", + "version": "v1.32.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -889,7 +892,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.32.0" }, "funding": [ { @@ -909,19 +912,20 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.31.0", + "version": "v1.32.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" + "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", - "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493", + "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493", "shasum": "" }, "require": { + "ext-iconv": "*", "php": ">=7.2" }, "provide": { @@ -969,7 +973,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.32.0" }, "funding": [ { @@ -985,7 +989,7 @@ "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2024-12-23T08:48:59+00:00" }, { "name": "symfony/yaml", @@ -1729,16 +1733,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.22", + "version": "9.6.23", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "f80235cb4d3caa59ae09be3adf1ded27521d1a9c" + "reference": "43d2cb18d0675c38bd44982a5d1d88f6d53d8d95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f80235cb4d3caa59ae09be3adf1ded27521d1a9c", - "reference": "f80235cb4d3caa59ae09be3adf1ded27521d1a9c", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/43d2cb18d0675c38bd44982a5d1d88f6d53d8d95", + "reference": "43d2cb18d0675c38bd44982a5d1d88f6d53d8d95", "shasum": "" }, "require": { @@ -1749,7 +1753,7 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.12.1", + "myclabs/deep-copy": "^1.13.1", "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=7.3", @@ -1812,7 +1816,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.22" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.23" }, "funding": [ { @@ -1823,12 +1827,20 @@ "url": "https://github.com/sebastianbergmann", "type": "github" }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, { "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", "type": "tidelift" } ], - "time": "2024-12-05T13:48:26+00:00" + "time": "2025-05-02T06:40:34+00:00" }, { "name": "sebastian/cli-parser", @@ -2847,7 +2859,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "nulib/php": 20 + "nulib/base": 20 }, "prefer-stable": false, "prefer-lowest": false, From 7cc8467f58647b2be40d1e14a5f95ccbbc1ec659 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Fri, 30 May 2025 23:18:00 +0400 Subject: [PATCH 6/8] maj projet --- .composer.pman.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.composer.pman.yml b/.composer.pman.yml index 0efd7c5..7317391 100644 --- a/.composer.pman.yml +++ b/.composer.pman.yml @@ -9,4 +9,4 @@ composer: dist: link: false require: - nulib/base: ^0.5.0p74 + nulib/base: ^0.6.0p74 From aa854cda6fc55b62be34d45589e657478c13ff4e Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Fri, 30 May 2025 23:18:24 +0400 Subject: [PATCH 7/8] Init changelog & version 0.6.0p74 --- CHANGES.md | 4 ++++ VERSION.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index a257870..d043827 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +## Release 0.6.0p74 du 30/05/2025-23:18 + +* `824c1ec` migration de nulib/php à nulib/base + ## Release 0.5.0p82 du 30/04/2025-04:48 ## Release 0.5.0p74 du 30/04/2025-04:46 diff --git a/VERSION.txt b/VERSION.txt index 8f0916f..a918a2a 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -0.5.0 +0.6.0 From 5af367432630c0143cabdd1df40430dc6a2ccc02 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Fri, 30 May 2025 23:18:29 +0400 Subject: [PATCH 8/8] deps de dist --- composer.json | 6 +----- composer.lock | 20 ++++++++------------ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index 386e154..fbe012d 100644 --- a/composer.json +++ b/composer.json @@ -3,10 +3,6 @@ "type": "library", "description": "wrapper pour phpoffice/phpspreadsheet", "repositories": [ - { - "type": "path", - "url": "../nulib-base" - }, { "type": "composer", "url": "https://repos.univ-reunion.fr/composer" @@ -19,7 +15,7 @@ } }, "require": { - "nulib/base": "^7.4-dev", + "nulib/base": "^0.6.0p74", "phpoffice/phpspreadsheet": "^1.0", "php": "^7.4" }, diff --git a/composer.lock b/composer.lock index 920c2af..104f1b5 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": "6dc1632c00c3a9480171d34a2976d8f5", + "content-hash": "046a2f42e01b302145e12c79bfb29587", "packages": [ { "name": "composer/pcre", @@ -396,11 +396,11 @@ }, { "name": "nulib/base", - "version": "dev-dev74", - "dist": { - "type": "path", - "url": "../nulib-base", - "reference": "a319baec05c4022edc07f738a9f4cbad3e486b82" + "version": "0.6.0p74", + "source": { + "type": "git", + "url": "https://git.univ-reunion.fr/sda-php/nulib-base.git", + "reference": "ea531c41bcb054250b0efc334c6aaa6f77543070" }, "require": { "ext-json": "*", @@ -443,9 +443,7 @@ } ], "description": "fonctions et classes essentielles", - "transport-options": { - "relative": true - } + "time": "2025-05-30T18:35:54+00:00" }, { "name": "phpoffice/phpspreadsheet", @@ -2858,9 +2856,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "nulib/base": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": {