<pman>Intégration de la branche dev74

This commit is contained in:
Jephté Clain 2025-05-30 22:37:32 +04:00
commit 6b4a3530b6
9 changed files with 95 additions and 7 deletions

8
.idea/modules.xml generated Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/nulib-base.iml" filepath="$PROJECT_DIR$/.idea/nulib-base.iml" />
</modules>
</component>
</project>

12
.idea/nulib-base.iml generated Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/php/src" isTestSource="false" packagePrefix="nulib\" />
<sourceFolder url="file://$MODULE_DIR$/php/tests" isTestSource="true" packagePrefix="nulib\" />
<excludeFolder url="file://$MODULE_DIR$/php/vendor" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

62
.idea/php.xml generated
View File

@ -1,4 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PhpProjectSharedConfiguration" php_language_level="7.3" />
<component name="MessDetectorOptionsConfiguration">
<option name="transferred" value="true" />
</component>
<component name="PHPCSFixerOptionsConfiguration">
<option name="transferred" value="true" />
</component>
<component name="PHPCodeSnifferOptionsConfiguration">
<option name="highlightLevel" value="WARNING" />
<option name="transferred" value="true" />
</component>
<component name="PhpIncludePathManager">
<include_path>
<path value="$PROJECT_DIR$/php/vendor/symfony/polyfill-ctype" />
<path value="$PROJECT_DIR$/php/vendor/theseer/tokenizer" />
<path value="$PROJECT_DIR$/php/vendor/symfony/deprecation-contracts" />
<path value="$PROJECT_DIR$/php/vendor/symfony/yaml" />
<path value="$PROJECT_DIR$/php/vendor/phpunit/php-text-template" />
<path value="$PROJECT_DIR$/php/vendor/phpunit/php-file-iterator" />
<path value="$PROJECT_DIR$/php/vendor/phpunit/php-timer" />
<path value="$PROJECT_DIR$/php/vendor/phpunit/php-code-coverage" />
<path value="$PROJECT_DIR$/php/vendor/sebastian/type" />
<path value="$PROJECT_DIR$/php/vendor/sebastian/object-enumerator" />
<path value="$PROJECT_DIR$/php/vendor/sebastian/version" />
<path value="$PROJECT_DIR$/php/vendor/sebastian/global-state" />
<path value="$PROJECT_DIR$/php/vendor/sebastian/complexity" />
<path value="$PROJECT_DIR$/php/vendor/sebastian/environment" />
<path value="$PROJECT_DIR$/php/vendor/sebastian/recursion-context" />
<path value="$PROJECT_DIR$/php/vendor/sebastian/resource-operations" />
<path value="$PROJECT_DIR$/php/vendor/sebastian/diff" />
<path value="$PROJECT_DIR$/php/vendor/sebastian/cli-parser" />
<path value="$PROJECT_DIR$/php/vendor/doctrine/instantiator" />
<path value="$PROJECT_DIR$/php/vendor/sebastian/comparator" />
<path value="$PROJECT_DIR$/php/vendor/sebastian/lines-of-code" />
<path value="$PROJECT_DIR$/php/vendor/sebastian/code-unit-reverse-lookup" />
<path value="$PROJECT_DIR$/php/vendor/sebastian/code-unit" />
<path value="$PROJECT_DIR$/php/vendor/sebastian/object-reflector" />
<path value="$PROJECT_DIR$/php/vendor/sebastian/exporter" />
<path value="$PROJECT_DIR$/php/vendor/phpunit/phpunit" />
<path value="$PROJECT_DIR$/php/vendor/phpunit/php-invoker" />
<path value="$PROJECT_DIR$/php/vendor/phar-io/version" />
<path value="$PROJECT_DIR$/php/vendor/phar-io/manifest" />
<path value="$PROJECT_DIR$/php/vendor/nulib/tests" />
<path value="$PROJECT_DIR$/php/vendor/myclabs/deep-copy" />
<path value="$PROJECT_DIR$/php/vendor/nikic/php-parser" />
<path value="$PROJECT_DIR$/php/vendor/composer" />
</include_path>
</component>
<component name="PhpProjectSharedConfiguration" php_language_level="7.4">
<option name="suggestChangeDefaultLanguageLevel" value="false" />
</component>
<component name="PhpStanOptionsConfiguration">
<option name="transferred" value="true" />
</component>
<component name="PhpUnit">
<phpunit_settings>
<PhpUnitSettings configuration_file_path="$PROJECT_DIR$/php/vendor/sebastian/object-enumerator/phpunit.xml" custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" use_configuration_file="true" />
</phpunit_settings>
</component>
<component name="PsalmOptionsConfiguration">
<option name="transferred" value="true" />
</component>
</project>

6
.idea/vcs.xml generated Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

View File

@ -1 +1,3 @@
## Release 0.6.0p74 du 30/05/2025-22:35
29/05/2025 Renommer le répertoire de nulib à nulib-base et le package de nulib/php à nulib/base

View File

@ -9,4 +9,4 @@ const NULIB_APP_app_params = [
"projdir" => __DIR__ . '/..',
"appcode" => \app\config\bootstrap::APPCODE,
];
require __DIR__.'/../vendor/nulib/php/php/src/app/cli/include-launcher.php';
require __DIR__.'/../vendor/nulib/base/php/src/app/cli/include-launcher.php';

View File

@ -8,7 +8,7 @@ PROJDIR=; COMPOSERDIR=; COMPOSERPHAR=; VENDORDIR=; BUILDENV0=; BUILDENV=
BUILD_IMAGES=(php-apache mariadb10); export BUILD_FLAVOUR=; DIST=; IMAGENAME=
DISTFILES=(); TEMPLATEFILES=(); VARFILES=()
source "$RUNPHP" || exit 1
source "$PROJDIR/$VENDORDIR/nulib/php/load.sh" || exit 1
source "$PROJDIR/$VENDORDIR/nulib/base/load.sh" || exit 1
require: template
# recenser les valeur de proxy
@ -149,9 +149,9 @@ function _build() {
dockerfiles=(
"$MYDIR/Dockerfile.$1.local"
"$MYDIR/Dockerfile.$1$BUILD_FLAVOUR"
"$PROJDIR/$VENDORDIR/nulib/php/dockerfiles/Dockerfile.$1$BUILD_FLAVOUR"
"$PROJDIR/$VENDORDIR/nulib/base/dockerfiles/Dockerfile.$1$BUILD_FLAVOUR"
"$MYDIR/Dockerfile.$1"
"$PROJDIR/$VENDORDIR/nulib/php/dockerfiles/Dockerfile.$1"
"$PROJDIR/$VENDORDIR/nulib/base/dockerfiles/Dockerfile.$1"
)
for dockerfile in "${dockerfiles[@]}"; do
[ -f "$dockerfile" ] && break

View File

@ -232,7 +232,7 @@ function host_check_projdir() {
[ -n "$RUNPHP_STANDALONE" ] && return
local install
if [ ! -f "$PROJDIR/$VENDORDIR/nulib/php/load.sh" ]; then
if [ ! -f "$PROJDIR/$VENDORDIR/nulib/base/load.sh" ]; then
install=1
elif [ ! -f "$PROJDIR/.composer.lock.runphp" ]; then
install=1

View File

@ -10,7 +10,7 @@ if [ -z "$_RUNPHP_IN_DOCKER" ]; then
exec "$MYDIR/$RUNPHP" "$0" "$@"
fi
source "$MYDIR/$RUNPHP" || exit 1
source "$PROJDIR/$VENDORDIR/nulib/php/load.sh" || exit 1
source "$PROJDIR/$VENDORDIR/nulib/base/load.sh" || exit 1
args=(
"description"