Compare commits

..

4 Commits

Author SHA1 Message Date
Clemens Schwaighofer 1e3ce162e5 L10n phpdoc updates 2026-05-12 11:46:19 +09:00
Clemens Schwaighofer 22806d6add README file name update and content fixes for URLs 2026-05-12 10:00:25 +09:00
Clemens Schwaighofer 46e39fa85d publish script update 2026-05-11 17:49:38 +09:00
Clemens Schwaighofer 8eb8e33dc4 Version: 9.41.0.2 2026-05-11 17:46:58 +09:00
6 changed files with 49 additions and 25 deletions
@@ -17,7 +17,7 @@ Run `publish/publish.sh` script to create composer packages.
This will automatically run all commands to create the packages
### composer.egplusww.jp web host
### composer.omnicomproduction.jp web host
For the local composer package host.
@@ -30,7 +30,7 @@ The entry is a copy of the `composer.json` with the following new entries:
"version": "X.Y.Z",
...
"dist": {
"url": "https://git.egplusww.jp/Composer/CoreLibs-Composer-All/archive/vX.Y.Z.zip",
"url": "https://packages.omnicomproduction.jp/Composer/CoreLibs-Composer-All/archive/vX.Y.Z.zip",
"type": "zip"
},
...
View File
+15 -1
View File
@@ -1,7 +1,8 @@
<phpunit
cacheResultFile="/tmp/phpunit-corelibs-composer.result.cache"
colors="true"
verbose="true"
verbose="false"
convertDeprecationsToExceptions="true"
bootstrap="test/phpunit/bootstrap.php"
>
<testsuites>
@@ -9,4 +10,17 @@
<directory>test/phpunit</directory>
</testsuite>
</testsuites>
<coverage processUncoveredFiles="true">
<include>
<directory suffix=".php">./www/lib/CoreLibs</directory>
</include>
<!-- <report>
<html outputDirectory="build/coverage-report"/>
</report> -->
</coverage>
<!-- <source>
<include>
<directory>./src</directory>
</include>
</source> -->
</phpunit>
+1 -1
View File
@@ -1 +1 @@
9.41.0
9.41.0.2
+29 -19
View File
@@ -31,30 +31,39 @@ function gitea_publish
[ -n "${_GITEA_URL_DL}" ] && [ -n "${_GITEA_URL_PUSH}" ] &&
[ -n "${_GITEA_USER}" ] && [ -n "${_GITEA_TOKEN}" ]; then
echo "> Publish ${_GITEA_UPLOAD_FILENAME} with ${_VERSION} to: ${_GITEA_URL_PUSH}";
error=0;
if [ ! -f "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" ]; then
echo "> Download: ${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip";
curl -LJO \
--output-dir "${_PACKAGE_DOWNLOAD}" \
-H "Authorization: token ${_GITEA_TOKEN}" \
"${_GITEA_URL_DL}/v${_VERSION}.zip";
http_response=$(curl -LJO \
-w "%{http_code}" \
--output-dir "${_PACKAGE_DOWNLOAD}" \
-H "Authorization: token ${_GITEA_TOKEN}" \
"${_GITEA_URL_DL}/v${_VERSION}.zip"
);
if [ "$http_response" -eq 200 ]; then
echo "[!] Error downloading file: ${http_response}";
error=1;
fi;
fi;
# if this is the short name, if long down load does not work
if [ -f "${_PACKAGE_DOWNLOAD}v${_VERSION}.zip" ]; then
mv "${_PACKAGE_DOWNLOAD}v${_VERSION}.zip" "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip";
fi;
if [ ! -f "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" ]; then
echo "[!] Package file does not exist for version: ${_VERSION}";
else
response=$(curl --user "${_GITEA_USER}":"${_GITEA_TOKEN}" \
if [ $error -eq 0 ]; then
# if this is the short name rename to long name, if long name down load does not work
if [ -f "${_PACKAGE_DOWNLOAD}v${_VERSION}.zip" ]; then
mv "${_PACKAGE_DOWNLOAD}v${_VERSION}.zip" "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip";
fi;
if [ ! -f "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" ]; then
echo "[!] Package file does not exist for version: ${_VERSION}";
else
response=$(curl --user "${_GITEA_USER}":"${_GITEA_TOKEN}" \
--upload-file "${_PACKAGE_DOWNLOAD}${_GITEA_UPLOAD_FILENAME}-v${_VERSION}.zip" \
"${_GITEA_URL_PUSH}"?version="${_VERSION}");
status=$(echo "${response}" | jq .errors[].status);
message=$(echo "${response}" | jq .errors[].message);
if [ -n "${status}" ]; then
echo "[!] Error ${status}: ${message}";
else
echo "> Publish completed";
echo "${_VERSION}" > "${_file_last_published}";
status=$(echo "${response}" | jq .errors[].status);
message=$(echo "${response}" | jq .errors[].message);
if [ -n "${status}" ]; then
echo "[!] Error ${status}: ${message}";
else
echo "> Publish completed";
echo "${_VERSION}" > "${_file_last_published}";
fi;
fi;
fi;
else
@@ -96,6 +105,7 @@ if [ -f "${file_last_published}" ]; then
LAST_PUBLISHED_VERSION=$(cat "${file_last_published}");
if dpkg --compare-versions "${VERSION}" le "${LAST_PUBLISHED_VERSION}"; then
echo "[!] git tag version ${VERSION} is not newer than previous published version ${LAST_PUBLISHED_VERSION}";
exit;
fi;
fi;
+2 -2
View File
@@ -301,7 +301,7 @@ class L10n
* Get the local as array same to the GetLocale::setLocale return
* This does not set from outside, but only what is set in the l10n class
*
* @return array{locale: string, lang: string, lang_short: string, domain: string, encoding: string, path: string}
* @return array{locale:string,lang:string,lang_short:string,domain:string,encoding:string,path:string}
*/
public function getLocaleAsArray(): array
{
@@ -321,7 +321,7 @@ class L10n
* parse the locale string for further processing
*
* @param string $locale Locale to parse
* @return array<string,string|null> array with lang, country, charset, modifier
* @return array{lang:string|null,country:string|null,charset:string|null,modifier:string|null} parsed locale
*/
public static function parseLocale(string $locale = ''): array
{