<pman>Intégration de la branche dev74

This commit is contained in:
Jephté Clain 2025-10-22 18:28:03 +04:00
commit b721f8fee5
3 changed files with 15 additions and 8 deletions

9
.idea/php.xml generated
View File

@ -54,12 +54,21 @@
<path value="$PROJECT_DIR$/vendor/sebastian/resource-operations" /> <path value="$PROJECT_DIR$/vendor/sebastian/resource-operations" />
<path value="$PROJECT_DIR$/vendor/myclabs/php-enum" /> <path value="$PROJECT_DIR$/vendor/myclabs/php-enum" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" /> <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> </include_path>
</component> </component>
<component name="PhpProjectSharedConfiguration" php_language_level="7.4" /> <component name="PhpProjectSharedConfiguration" php_language_level="7.4" />
<component name="PhpStanOptionsConfiguration"> <component name="PhpStanOptionsConfiguration">
<option name="transferred" value="true" /> <option name="transferred" value="true" />
</component> </component>
<component name="PhpUnit">
<phpunit_settings>
<PhpUnitSettings custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" />
</phpunit_settings>
</component>
<component name="PsalmOptionsConfiguration"> <component name="PsalmOptionsConfiguration">
<option name="transferred" value="true" /> <option name="transferred" value="true" />
</component> </component>

View File

@ -4,7 +4,7 @@ UPSTREAM=dev74
DEVELOP=dev82 DEVELOP=dev82
FEATURE=wip82/ FEATURE=wip82/
RELEASE=rel82- RELEASE=rel82-
MAIN=dist82 MAIN=main82
TAG_PREFIX= TAG_PREFIX=
TAG_SUFFIX=p82 TAG_SUFFIX=p82
HOTFIX=hotf82- HOTFIX=hotf82-
@ -13,15 +13,13 @@ NOAUTO=
AFTER_CREATE_RELEASE=' AFTER_CREATE_RELEASE='
set -x set -x
pman --composer-select-profile dist pcomp-select-profile.php dist
composer u || exit 1
git commit -am "<pman>deps de dist" git commit -am "<pman>deps de dist"
true true
' '
AFTER_MERGE_RELEASE=' AFTER_MERGE_RELEASE='
set -x set -x
pman --composer-select-profile dev pcomp-select-profile.php dev
composer u || exit 1
git commit -am "<pman>deps de dev" git commit -am "<pman>deps de dev"
true true
' '

View File

@ -1,7 +1,7 @@
<?php <?php
namespace nulib\ext\phpss; namespace nulib\ext\phpss;
use nulib\ValueException; use nulib\exceptions;
use PhpOffice\PhpSpreadsheet\Cell\Coordinate; use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Spreadsheet;
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet; use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
@ -13,14 +13,14 @@ class wsutils {
} elseif (is_numeric($wsname)) { } elseif (is_numeric($wsname)) {
$sheetCount = $ss->getSheetCount(); $sheetCount = $ss->getSheetCount();
if ($wsname < 1 || $wsname > $sheetCount) { if ($wsname < 1 || $wsname > $sheetCount) {
throw ValueException::invalid_value($wsname, "sheet index"); throw exceptions::invalid_value($wsname, "sheet index");
} }
$ws = $ss->getSheet($wsname - 1); $ws = $ss->getSheet($wsname - 1);
} else { } else {
$ws = $ss->getSheetByName($wsname); $ws = $ss->getSheetByName($wsname);
if ($ws === null) { if ($ws === null) {
if ($create) $ws = $ss->createSheet()->setTitle($wsname); 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; return $ws;