diff --git a/www/composer.lock b/www/composer.lock index 3ce08e51..7799a8f8 100644 --- a/www/composer.lock +++ b/www/composer.lock @@ -12,7 +12,7 @@ "dist": { "type": "path", "url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All", - "reference": "6bb957fcb3b4246ce5bf3817687ea211d3c7c7ab" + "reference": "e0356dcadf9cdb349b8025113b96e3735c8324c7" }, "require": { "php": ">=8.1" diff --git a/www/vendor/composer/installed.json b/www/vendor/composer/installed.json index 69f258e0..556ce822 100644 --- a/www/vendor/composer/installed.json +++ b/www/vendor/composer/installed.json @@ -7,7 +7,7 @@ "dist": { "type": "path", "url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All", - "reference": "6bb957fcb3b4246ce5bf3817687ea211d3c7c7ab" + "reference": "e0356dcadf9cdb349b8025113b96e3735c8324c7" }, "require": { "php": ">=8.1" diff --git a/www/vendor/composer/installed.php b/www/vendor/composer/installed.php index 902cf32f..9ec3c0d4 100644 --- a/www/vendor/composer/installed.php +++ b/www/vendor/composer/installed.php @@ -13,7 +13,7 @@ 'egrajp/corelibs-composer-all' => array( 'pretty_version' => 'dev-development', 'version' => 'dev-development', - 'reference' => '6bb957fcb3b4246ce5bf3817687ea211d3c7c7ab', + 'reference' => 'e0356dcadf9cdb349b8025113b96e3735c8324c7', 'type' => 'library', 'install_path' => __DIR__ . '/../egrajp/corelibs-composer-all', 'aliases' => array(), diff --git a/www/vendor/egrajp/corelibs-composer-all/publish/last.published b/www/vendor/egrajp/corelibs-composer-all/publish/last.published index 308c0cb5..2bf50aaf 100644 --- a/www/vendor/egrajp/corelibs-composer-all/publish/last.published +++ b/www/vendor/egrajp/corelibs-composer-all/publish/last.published @@ -1 +1 @@ -8.2.2 +8.3.0 diff --git a/www/vendor/egrajp/corelibs-composer-all/publish/publish.sh b/www/vendor/egrajp/corelibs-composer-all/publish/publish.sh index ad39db40..2ec45fe9 100755 --- a/www/vendor/egrajp/corelibs-composer-all/publish/publish.sh +++ b/www/vendor/egrajp/corelibs-composer-all/publish/publish.sh @@ -20,7 +20,11 @@ fi; # read in the .env.deploy file and we must have # GITLAB_USER # GITLAB_TOKEN +# GITLAB_URL +# GITEA_USER # GITEA_DEPLOY_TOKEN +# GITEA_URL_DL +# GITEA_URL_PUSH if [ ! -f "${BASE_FOLDER}.env.deploy" ]; then echo "Deploy enviroment file .env.deploy is missing"; exit; @@ -33,26 +37,27 @@ set +o allexport; echo "[START]"; # gitea -if [ ! -z "${GITEA_USER}" ] && [ ! -z "${GITEA_TOKEN}" ]; then +if [ ! -z "${GITEA_URL_DL}" ] && [ ! -z "${GITEA_URL_PUSH}" ] && + [ ! -z "${GITEA_USER}" ] && [ ! -z "${GITEA_TOKEN}" ]; then curl -LJO \ --output-dir "${BASE_FOLDER}" \ - https://git.egplusww.jp/Composer/CoreLibs-Composer-All/archive/v${VERSION}.zip; + ${GITEA_URL_DL}/v${VERSION}.zip; curl --user ${GITEA_USER}:${GITEA_TOKEN} \ --upload-file "${BASE_FOLDER}/CoreLibs-Composer-All-v${VERSION}.zip" \ - https://git.egplusww.jp/api/packages/Composer/composer?version=${VERSION}; + ${GITEA_URL_PUSH}?version=${VERSION}; echo "${VERSION}" > "${file_last_published}"; else echo "Missing either GITEA_USER or GITEA_TOKEN environment variable"; fi; # gitlab -if [ ! -z "${GITLAB_DEPLOY_TOKEN}" ]; then +if [ ! -z "${GITLAB_URL}" ] && [ ! -z "${GITLAB_DEPLOY_TOKEN}" ]; then curl --data tag=v${VERSION} \ --header "Deploy-Token: ${GITLAB_DEPLOY_TOKEN}" \ - "https://gitlab-na.factory.tools/api/v4/projects/950/packages/composer"; + "${GITLAB_URL}"; curl --data branch=master \ --header "Deploy-Token: ${GITLAB_DEPLOY_TOKEN}" \ - "https://gitlab-na.factory.tools/api/v4/projects/950/packages/composer"; + "${GITLAB_URL}"; echo "${VERSION}" > "${file_last_published}"; else echo "Missing GITLAB_DEPLOY_TOKEN environment variable"; diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Combined/ArrayHandler.php b/www/vendor/egrajp/corelibs-composer-all/src/Combined/ArrayHandler.php index 8619f348..a7cb5f1f 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/Combined/ArrayHandler.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/Combined/ArrayHandler.php @@ -208,7 +208,9 @@ class ArrayHandler $prev_depth = 0; foreach ($recursive as $key => $value) { if ($prev_depth > $recursive->getDepth()) { - $key_path = []; + // remove all trailing to ne depth + $diff = $prev_depth - $recursive->getDepth(); + array_splice($key_path, -$diff, $diff); } $prev_depth = $recursive->getDepth(); if ($flat === false) {