Compare commits

..

No commits in common. "8efedccb6ac52f7f487c503fa820c4749a5aa229" and "26b4bfddf5646f9313d419e568cd930efb9353eb" have entirely different histories.

6 changed files with 25 additions and 92 deletions

View File

@ -5,8 +5,8 @@ composer:
dev: dev:
link: true link: true
require: require:
nulib/base: ^7.4-dev nulib/php: ^7.4-dev
dist: dist:
link: false link: false
require: require:
nulib/base: ^0.6.0p74 nulib/php: ^0.5.0p74

View File

@ -1,9 +1,3 @@
## 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 ## Release 0.5.0p74 du 30/04/2025-04:46
## Release 0.4.0p82 du 14/03/2025-15:30 ## Release 0.4.0p82 du 14/03/2025-15:30

View File

@ -1,49 +0,0 @@
# 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/base
~~~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)" &&
echo "commit=$commit"
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

View File

@ -1 +1 @@
0.6.0 0.5.0

View File

@ -15,7 +15,7 @@
} }
}, },
"require": { "require": {
"nulib/base": "^0.6.0p74", "nulib/php": "^0.5.0p74",
"phpoffice/phpspreadsheet": "^1.0", "phpoffice/phpspreadsheet": "^1.0",
"php": "^7.4" "php": "^7.4"
}, },

54
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "046a2f42e01b302145e12c79bfb29587", "content-hash": "d0d9efbef8093b96775343530927123d",
"packages": [ "packages": [
{ {
"name": "composer/pcre", "name": "composer/pcre",
@ -395,21 +395,18 @@
"time": "2025-01-14T11:49:03+00:00" "time": "2025-01-14T11:49:03+00:00"
}, },
{ {
"name": "nulib/base", "name": "nulib/php",
"version": "0.6.0p74", "version": "0.5.0p74",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://git.univ-reunion.fr/sda-php/nulib-base.git", "url": "https://git.univ-reunion.fr/sda-php/nulib.git",
"reference": "ea531c41bcb054250b0efc334c6aaa6f77543070" "reference": "4037bf20424eb48708e5fdf9fc8e10f2ef71d134"
}, },
"require": { "require": {
"ext-json": "*", "ext-json": "*",
"php": "^7.4", "php": "^7.4",
"symfony/yaml": "^5.0" "symfony/yaml": "^5.0"
}, },
"replace": {
"nulib/php": "<0.6.0"
},
"require-dev": { "require-dev": {
"ext-curl": "*", "ext-curl": "*",
"ext-pcntl": "*", "ext-pcntl": "*",
@ -443,7 +440,7 @@
} }
], ],
"description": "fonctions et classes essentielles", "description": "fonctions et classes essentielles",
"time": "2025-05-30T18:35:54+00:00" "time": "2025-04-30T00:32:10+00:00"
}, },
{ {
"name": "phpoffice/phpspreadsheet", "name": "phpoffice/phpspreadsheet",
@ -831,7 +828,7 @@
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
"version": "v1.32.0", "version": "v1.31.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git", "url": "https://github.com/symfony/polyfill-ctype.git",
@ -890,7 +887,7 @@
"portable" "portable"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.32.0" "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
}, },
"funding": [ "funding": [
{ {
@ -910,20 +907,19 @@
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.32.0", "version": "v1.31.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493" "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
"reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493", "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-iconv": "*",
"php": ">=7.2" "php": ">=7.2"
}, },
"provide": { "provide": {
@ -971,7 +967,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.32.0" "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
}, },
"funding": [ "funding": [
{ {
@ -987,7 +983,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-12-23T08:48:59+00:00" "time": "2024-09-09T11:45:10+00:00"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
@ -1731,16 +1727,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "9.6.23", "version": "9.6.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "43d2cb18d0675c38bd44982a5d1d88f6d53d8d95" "reference": "f80235cb4d3caa59ae09be3adf1ded27521d1a9c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/43d2cb18d0675c38bd44982a5d1d88f6d53d8d95", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f80235cb4d3caa59ae09be3adf1ded27521d1a9c",
"reference": "43d2cb18d0675c38bd44982a5d1d88f6d53d8d95", "reference": "f80235cb4d3caa59ae09be3adf1ded27521d1a9c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1751,7 +1747,7 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"ext-xml": "*", "ext-xml": "*",
"ext-xmlwriter": "*", "ext-xmlwriter": "*",
"myclabs/deep-copy": "^1.13.1", "myclabs/deep-copy": "^1.12.1",
"phar-io/manifest": "^2.0.4", "phar-io/manifest": "^2.0.4",
"phar-io/version": "^3.2.1", "phar-io/version": "^3.2.1",
"php": ">=7.3", "php": ">=7.3",
@ -1814,7 +1810,7 @@
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues", "issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy", "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.23" "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.22"
}, },
"funding": [ "funding": [
{ {
@ -1825,20 +1821,12 @@
"url": "https://github.com/sebastianbergmann", "url": "https://github.com/sebastianbergmann",
"type": "github" "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", "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2025-05-02T06:40:34+00:00" "time": "2024-12-05T13:48:26+00:00"
}, },
{ {
"name": "sebastian/cli-parser", "name": "sebastian/cli-parser",