<pman>Intégration de la branche rel74-0.7.0
This commit is contained in:
commit
b5b89bb304
@ -9,4 +9,4 @@ composer:
|
||||
dist:
|
||||
link: false
|
||||
require:
|
||||
nulib/base: ^0.6.0p74
|
||||
nulib/base: ^0.7.0p74
|
||||
|
||||
9
.idea/php.xml
generated
9
.idea/php.xml
generated
@ -54,12 +54,21 @@
|
||||
<path value="$PROJECT_DIR$/vendor/sebastian/resource-operations" />
|
||||
<path value="$PROJECT_DIR$/vendor/myclabs/php-enum" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/yaml" />
|
||||
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
|
||||
<path value="$PROJECT_DIR$/vendor/nulib/base" />
|
||||
</include_path>
|
||||
</component>
|
||||
<component name="PhpProjectSharedConfiguration" php_language_level="7.4" />
|
||||
<component name="PhpStanOptionsConfiguration">
|
||||
<option name="transferred" value="true" />
|
||||
</component>
|
||||
<component name="PhpUnit">
|
||||
<phpunit_settings>
|
||||
<PhpUnitSettings custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" />
|
||||
</phpunit_settings>
|
||||
</component>
|
||||
<component name="PsalmOptionsConfiguration">
|
||||
<option name="transferred" value="true" />
|
||||
</component>
|
||||
|
||||
@ -13,14 +13,14 @@ NOAUTO=
|
||||
|
||||
AFTER_CREATE_RELEASE='
|
||||
set -x
|
||||
pman --composer-select-profile dist
|
||||
pcomp-select-profile.php dist
|
||||
composer u || exit 1
|
||||
git commit -am "<pman>deps de dist"
|
||||
true
|
||||
'
|
||||
AFTER_MERGE_RELEASE='
|
||||
set -x
|
||||
pman --composer-select-profile dev
|
||||
pcomp-select-profile.php dev
|
||||
composer u || exit 1
|
||||
git commit -am "<pman>deps de dev"
|
||||
true
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
## Release 0.7.0p74 du 22/10/2025-18:52
|
||||
|
||||
* maj nulib/base-0.7.0
|
||||
|
||||
## Release 0.6.0p82 du 30/05/2025-23:29
|
||||
|
||||
## Release 0.6.0p74 du 30/05/2025-23:18
|
||||
|
||||
* `824c1ec` migration de nulib/php à nulib/base
|
||||
|
||||
25
README.md
25
README.md
@ -9,12 +9,19 @@ Avant de faire une release majeure sur nulib/phpss, faire d'abord la release
|
||||
majeure correspondante sur
|
||||
* nulib/base
|
||||
|
||||
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 "\
|
||||
@ -27,7 +34,10 @@ prel -v$version
|
||||
# en cas de conflit, sélectionner HEAD
|
||||
_merge82
|
||||
|
||||
## branche dev82
|
||||
## console 82
|
||||
|
||||
pu
|
||||
|
||||
git checkout dev82
|
||||
|
||||
sed -ri "\
|
||||
@ -40,10 +50,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
|
||||
@ -1 +1 @@
|
||||
0.6.0
|
||||
0.7.0
|
||||
|
||||
@ -3,6 +3,10 @@
|
||||
"type": "library",
|
||||
"description": "wrapper pour phpoffice/phpspreadsheet",
|
||||
"repositories": [
|
||||
{
|
||||
"type": "path",
|
||||
"url": "../nulib-base"
|
||||
},
|
||||
{
|
||||
"type": "composer",
|
||||
"url": "https://repos.univ-reunion.fr/composer"
|
||||
@ -15,7 +19,7 @@
|
||||
}
|
||||
},
|
||||
"require": {
|
||||
"nulib/base": "^0.6.0p74",
|
||||
"nulib/base": "^7.4-dev",
|
||||
"phpoffice/phpspreadsheet": "^1.0",
|
||||
"php": "^7.4"
|
||||
},
|
||||
|
||||
1482
composer.lock
generated
1482
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
namespace nulib\ext\phpss;
|
||||
|
||||
use nulib\ValueException;
|
||||
use nulib\exceptions;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
|
||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
|
||||
@ -13,14 +13,14 @@ class wsutils {
|
||||
} elseif (is_numeric($wsname)) {
|
||||
$sheetCount = $ss->getSheetCount();
|
||||
if ($wsname < 1 || $wsname > $sheetCount) {
|
||||
throw ValueException::invalid_value($wsname, "sheet index");
|
||||
throw exceptions::invalid_value($wsname, "sheet index");
|
||||
}
|
||||
$ws = $ss->getSheet($wsname - 1);
|
||||
} else {
|
||||
$ws = $ss->getSheetByName($wsname);
|
||||
if ($ws === null) {
|
||||
if ($create) $ws = $ss->createSheet()->setTitle($wsname);
|
||||
else throw ValueException::invalid_value($wsname, "sheet name");
|
||||
else throw exceptions::invalid_value($wsname, "sheet name");
|
||||
}
|
||||
}
|
||||
return $ws;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user