CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Composer update

Browse Source
This commit is contained in:
Clemens Schwaighofer
2023-04-26 15:41:39 +09:00
parent f0e6b5b8e9
commit d6187005f4
6 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/composer.lock generated
View File

@@ -12,7 +12,7 @@
"dist": { "dist": {
"type": "path", "type": "path",
"url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All", "url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All",
"reference": "6bb957fcb3b4246ce5bf3817687ea211d3c7c7ab" "reference": "e0356dcadf9cdb349b8025113b96e3735c8324c7"
}, },
"require": { "require": {
"php": ">=8.1" "php": ">=8.1"

2
www/vendor/composer/installed.json vendored
View File

@@ -7,7 +7,7 @@
"dist": { "dist": {
"type": "path", "type": "path",
"url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All", "url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All",
"reference": "6bb957fcb3b4246ce5bf3817687ea211d3c7c7ab" "reference": "e0356dcadf9cdb349b8025113b96e3735c8324c7"
}, },
"require": { "require": {
"php": ">=8.1" "php": ">=8.1"

2
www/vendor/composer/installed.php vendored
View File

@@ -13,7 +13,7 @@
'egrajp/corelibs-composer-all' => array( 'egrajp/corelibs-composer-all' => array(
'pretty_version' => 'dev-development', 'pretty_version' => 'dev-development',
'version' => 'dev-development', 'version' => 'dev-development',
'reference' => '6bb957fcb3b4246ce5bf3817687ea211d3c7c7ab', 'reference' => 'e0356dcadf9cdb349b8025113b96e3735c8324c7',
'type' => 'library', 'type' => 'library',
'install_path' => __DIR__ . '/../egrajp/corelibs-composer-all', 'install_path' => __DIR__ . '/../egrajp/corelibs-composer-all',
'aliases' => array(), 'aliases' => array(),

2
www/vendor/egrajp/corelibs-composer-all/publish/last.published vendored
View File

@@ -1 +1 @@
8.2.2 8.3.0

17
www/vendor/egrajp/corelibs-composer-all/publish/publish.sh vendored
View File

@@ -20,7 +20,11 @@ fi;
# read in the .env.deploy file and we must have # read in the .env.deploy file and we must have
# GITLAB_USER # GITLAB_USER
# GITLAB_TOKEN # GITLAB_TOKEN
# GITLAB_URL
# GITEA_USER
# GITEA_DEPLOY_TOKEN # GITEA_DEPLOY_TOKEN
# GITEA_URL_DL
# GITEA_URL_PUSH
if [ ! -f "${BASE_FOLDER}.env.deploy" ]; then if [ ! -f "${BASE_FOLDER}.env.deploy" ]; then
echo "Deploy enviroment file .env.deploy is missing"; echo "Deploy enviroment file .env.deploy is missing";
exit; exit;
@@ -33,26 +37,27 @@ set +o allexport;
echo "[START]"; echo "[START]";
# gitea # 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 \ curl -LJO \
--output-dir "${BASE_FOLDER}" \ --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} \ curl --user ${GITEA_USER}:${GITEA_TOKEN} \
--upload-file "${BASE_FOLDER}/CoreLibs-Composer-All-v${VERSION}.zip" \ --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}"; echo "${VERSION}" > "${file_last_published}";
else else
echo "Missing either GITEA_USER or GITEA_TOKEN environment variable"; echo "Missing either GITEA_USER or GITEA_TOKEN environment variable";
fi; fi;
# gitlab # gitlab
if [ ! -z "${GITLAB_DEPLOY_TOKEN}" ]; then if [ ! -z "${GITLAB_URL}" ] && [ ! -z "${GITLAB_DEPLOY_TOKEN}" ]; then
curl --data tag=v${VERSION} \ curl --data tag=v${VERSION} \
--header "Deploy-Token: ${GITLAB_DEPLOY_TOKEN}" \ --header "Deploy-Token: ${GITLAB_DEPLOY_TOKEN}" \
"https://gitlab-na.factory.tools/api/v4/projects/950/packages/composer"; "${GITLAB_URL}";
curl --data branch=master \ curl --data branch=master \
--header "Deploy-Token: ${GITLAB_DEPLOY_TOKEN}" \ --header "Deploy-Token: ${GITLAB_DEPLOY_TOKEN}" \
"https://gitlab-na.factory.tools/api/v4/projects/950/packages/composer"; "${GITLAB_URL}";
echo "${VERSION}" > "${file_last_published}"; echo "${VERSION}" > "${file_last_published}";
else else
echo "Missing GITLAB_DEPLOY_TOKEN environment variable"; echo "Missing GITLAB_DEPLOY_TOKEN environment variable";

4
www/vendor/egrajp/corelibs-composer-all/src/Combined/ArrayHandler.php vendored
View File

@@ -208,7 +208,9 @@ class ArrayHandler
$prev_depth = 0; $prev_depth = 0;
foreach ($recursive as $key => $value) { foreach ($recursive as $key => $value) {
if ($prev_depth > $recursive->getDepth()) { 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(); $prev_depth = $recursive->getDepth();
if ($flat === false) { if ($flat === false) {