<pman>Intégration de la branche dev74
This commit is contained in:
commit
b721f8fee5
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>
|
||||
|
||||
@ -4,7 +4,7 @@ UPSTREAM=dev74
|
||||
DEVELOP=dev82
|
||||
FEATURE=wip82/
|
||||
RELEASE=rel82-
|
||||
MAIN=dist82
|
||||
MAIN=main82
|
||||
TAG_PREFIX=
|
||||
TAG_SUFFIX=p82
|
||||
HOTFIX=hotf82-
|
||||
@ -13,15 +13,13 @@ NOAUTO=
|
||||
|
||||
AFTER_CREATE_RELEASE='
|
||||
set -x
|
||||
pman --composer-select-profile dist
|
||||
composer u || exit 1
|
||||
pcomp-select-profile.php dist
|
||||
git commit -am "<pman>deps de dist"
|
||||
true
|
||||
'
|
||||
AFTER_MERGE_RELEASE='
|
||||
set -x
|
||||
pman --composer-select-profile dev
|
||||
composer u || exit 1
|
||||
pcomp-select-profile.php dev
|
||||
git commit -am "<pman>deps de dev"
|
||||
true
|
||||
'
|
||||
|
||||
@ -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