diff --git a/.composer.pman.yml b/.composer.pman.yml index 5d33807..16d4d3e 100644 --- a/.composer.pman.yml +++ b/.composer.pman.yml @@ -5,8 +5,8 @@ composer: dev: link: true require: - nulib/php: ^8.2-dev + nulib/base: ^8.2-dev dist: link: false require: - nulib/php: ^0.5.0p82 + nulib/base: ^0.5.0p82 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/README.md b/README.md new file mode 100644 index 0000000..063aa21 --- /dev/null +++ b/README.md @@ -0,0 +1,49 @@ +# 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 \ No newline at end of file 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 diff --git a/composer.json b/composer.json index f70c7b5..ab15a46 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "repositories": [ { "type": "path", - "url": "../nulib" + "url": "../nulib-base" }, { "type": "composer", diff --git a/composer.lock b/composer.lock index ca965af..18fcc94 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": "34445aa6f912ea531f9bda732789af63", + "content-hash": "6dc1632c00c3a9480171d34a2976d8f5", "packages": [ { "name": "composer/pcre", @@ -271,18 +271,84 @@ "time": "2022-12-02T22:17:43+00:00" }, { - "name": "nulib/php", - "version": "dev-dev82", + "name": "myclabs/php-enum", + "version": "1.8.5", + "source": { + "type": "git", + "url": "https://github.com/myclabs/php-enum.git", + "reference": "e7be26966b7398204a234f8673fdad5ac6277802" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/php-enum/zipball/e7be26966b7398204a234f8673fdad5ac6277802", + "reference": "e7be26966b7398204a234f8673fdad5ac6277802", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": "^7.3 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.5", + "squizlabs/php_codesniffer": "1.*", + "vimeo/psalm": "^4.6.2 || ^5.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "MyCLabs\\Enum\\": "src/" + }, + "classmap": [ + "stubs/Stringable.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP Enum contributors", + "homepage": "https://github.com/myclabs/php-enum/graphs/contributors" + } + ], + "description": "PHP Enum implementation", + "homepage": "https://github.com/myclabs/php-enum", + "keywords": [ + "enum" + ], + "support": { + "issues": "https://github.com/myclabs/php-enum/issues", + "source": "https://github.com/myclabs/php-enum/tree/1.8.5" + }, + "funding": [ + { + "url": "https://github.com/mnapoli", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/php-enum", + "type": "tidelift" + } + ], + "time": "2025-01-14T11:49:03+00:00" + }, + { + "name": "nulib/base", + "version": "dev-dev74", "dist": { "type": "path", - "url": "../nulib", - "reference": "a8094658d8ae21c9e66fba3120b9efede4d54ce7" + "url": "../nulib-base", + "reference": "a319baec05c4022edc07f738a9f4cbad3e486b82" }, "require": { "ext-json": "*", "php": "^8.2", "symfony/yaml": "^7.1" }, + "replace": { + "nulib/php": "<0.6.0" + }, "require-dev": { "ext-curl": "*", "ext-pcntl": "*", @@ -705,7 +771,7 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.31.0", + "version": "v1.32.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -764,7 +830,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": [ { @@ -782,6 +848,87 @@ ], "time": "2024-09-09T11:45:10+00:00" }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.32.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493", + "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493", + "shasum": "" + }, + "require": { + "ext-iconv": "*", + "php": ">=7.2" + }, + "provide": { + "ext-mbstring": "*" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.32.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-12-23T08:48:59+00:00" + }, { "name": "symfony/yaml", "version": "v7.2.5", @@ -1453,16 +1600,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.45", + "version": "9.6.23", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "bd68a781d8e30348bc297449f5234b3458267ae8" + "reference": "43d2cb18d0675c38bd44982a5d1d88f6d53d8d95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bd68a781d8e30348bc297449f5234b3458267ae8", - "reference": "bd68a781d8e30348bc297449f5234b3458267ae8", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/43d2cb18d0675c38bd44982a5d1d88f6d53d8d95", + "reference": "43d2cb18d0675c38bd44982a5d1d88f6d53d8d95", "shasum": "" }, "require": { @@ -1472,7 +1619,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": ">=8.1", @@ -1534,7 +1681,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.45" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.23" }, "funding": [ { @@ -1545,12 +1692,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": "2025-02-06T16:08:12+00:00" + "time": "2025-05-02T06:40:34+00:00" }, { "name": "sebastian/cli-parser", @@ -2522,7 +2677,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "nulib/php": 20 + "nulib/base": 20 }, "prefer-stable": false, "prefer-lowest": false,