diff --git a/phpunit.xml b/phpunit.xml
index 13203fa..5f3ffbe 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,7 +1,8 @@
@@ -9,4 +10,17 @@
test/phpunit
+
+
+ ./www/lib/CoreLibs
+
+
+
+
diff --git a/publish/publish.sh b/publish/publish.sh
index 7bdae40..a626942 100755
--- a/publish/publish.sh
+++ b/publish/publish.sh
@@ -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 \
+ http_response=$(curl -LJO \
+ -w "%{http_code}" \
--output-dir "${_PACKAGE_DOWNLOAD}" \
-H "Authorization: token ${_GITEA_TOKEN}" \
- "${_GITEA_URL_DL}/v${_VERSION}.zip";
+ "${_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}" \
- --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}";
+ 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
- echo "> Publish completed";
- echo "${_VERSION}" > "${_file_last_published}";
+ 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}";
+ 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;
diff --git a/src/Language/L10n.php b/src/Language/L10n.php
index 2703415..14dad30 100644
--- a/src/Language/L10n.php
+++ b/src/Language/L10n.php
@@ -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 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
{