Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Clemens Schwaighofer
|
1e3ce162e5 | ||
|
Clemens Schwaighofer
|
22806d6add | ||
|
Clemens Schwaighofer
|
46e39fa85d | ||
|
Clemens Schwaighofer
|
8eb8e33dc4 | ||
|
Clemens Schwaighofer
|
afcb953d2d | ||
|
Clemens Schwaighofer
|
742b4087aa | ||
|
Clemens Schwaighofer
|
f0c8daf26a | ||
|
Clemens Schwaighofer
|
ee32a90ff9 | ||
|
Clemens Schwaighofer
|
1823fd369b | ||
|
Clemens Schwaighofer
|
116f0a770c | ||
|
Clemens Schwaighofer
|
b2123a183d |
+2
-2
@@ -54,8 +54,8 @@ return [
|
||||
// Note that the **only** effect of choosing `'5.6'` is to infer that functions removed in php 7.0 exist.
|
||||
// (See `backward_compatibility_checks` for additional options)
|
||||
// Automatically inferred from composer.json requirement for "php" of ">=8.2"
|
||||
'target_php_version' => '8.2',
|
||||
"minimum_target_php_version" => "8.2",
|
||||
'target_php_version' => '8.3',
|
||||
"minimum_target_php_version" => "8.3",
|
||||
// turn color on (-C)
|
||||
"color_issue_messages_if_supported" => true,
|
||||
|
||||
|
||||
@@ -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"
|
||||
},
|
||||
...
|
||||
+2
-2
@@ -18,7 +18,7 @@
|
||||
"minimum-stability": "stable",
|
||||
"prefer-stable": true,
|
||||
"require": {
|
||||
"php": ">=8.2",
|
||||
"php": ">=8.3",
|
||||
"psr/log": "^3.0"
|
||||
},
|
||||
"require-dev": {
|
||||
@@ -27,7 +27,7 @@
|
||||
"phpstan/phpstan-deprecation-rules": "^2.0",
|
||||
"phan/phan": "^5.4",
|
||||
"egrajp/smarty-extended": "^5.4",
|
||||
"gullevek/dotenv": "dev-master",
|
||||
"gullevek/dotenv": "^3",
|
||||
"phpunit/phpunit": "^9"
|
||||
},
|
||||
"repositories": [{
|
||||
|
||||
+15
-1
@@ -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 @@
|
||||
9.40.0
|
||||
9.41.0.2
|
||||
|
||||
+32
-14
@@ -11,6 +11,9 @@ go_flag="$1";
|
||||
|
||||
function gitea_publish
|
||||
{
|
||||
# MUST have in app.ini, else upload will fail
|
||||
# [repository]
|
||||
# PREFIX_ARCHIVE_FILES = false
|
||||
_GITEA_PUBLISH="${1}"
|
||||
_GITEA_UPLOAD_FILENAME="${2}"
|
||||
_GITEA_URL_DL="${3}"
|
||||
@@ -28,26 +31,40 @@ 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}" \
|
||||
"${_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 [ ! -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";
|
||||
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;
|
||||
echo "${_VERSION}" > "${_file_last_published}";
|
||||
fi;
|
||||
else
|
||||
echo "[!] Missing either GITEA_UPLOAD_FILENAME, GITEA_URL_DL, GITEA_URL_PUSH, GITEA_USER or GITEA_TOKEN environment variable";
|
||||
@@ -88,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;
|
||||
|
||||
|
||||
+9
-3
@@ -58,15 +58,21 @@ class File
|
||||
* else returns '' for any other finfo read problem
|
||||
*
|
||||
* @param string $read_file File to read, relative or absolute path
|
||||
* @return string
|
||||
* @return string mime type
|
||||
* @throws \UnexpectedValueException if file cannot be read or is not a file
|
||||
* @throws \RangeException if we cannot get a mime type and throw exception is on
|
||||
*/
|
||||
public static function getMimeType(string $read_file): string
|
||||
{
|
||||
$finfo = new \finfo(FILEINFO_MIME_TYPE);
|
||||
if (!is_file($read_file)) {
|
||||
if (!is_file($read_file) || !is_readable($read_file)) {
|
||||
throw new \UnexpectedValueException('[getMimeType] File not found: ' . $read_file);
|
||||
}
|
||||
return $finfo->file($read_file) ?: '';
|
||||
$mime_type = $finfo->file($read_file);
|
||||
if ($mime_type === false) {
|
||||
throw new \RangeException('[getMimeType] Cannot get mime type for: ' . $read_file);
|
||||
}
|
||||
return $mime_type;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -133,7 +133,7 @@ class DateTime
|
||||
} else {
|
||||
for ($i = 0, $iMax = count($timegroups); $i < $iMax; $i++) {
|
||||
$output = floor((float)$timestamp / $timegroups[$i]);
|
||||
$timestamp = (float)$timestamp % $timegroups[$i];
|
||||
$timestamp = $timestamp % $timegroups[$i];
|
||||
// output has days|hours|min|sec
|
||||
if ($output || $time_string) {
|
||||
$time_string .= $output . $labels[$i] . (($i + 1) != count($timegroups) ? ' ' : '');
|
||||
@@ -453,7 +453,7 @@ class DateTime
|
||||
}
|
||||
if (isset($matches[11]) && is_numeric($matches[11])) {
|
||||
// for milliseconds, we need to divide by 1000 and add them
|
||||
$timestamp += (float)($matches[11] / 1000);
|
||||
$timestamp += ((float)$matches[11] / 1000);
|
||||
}
|
||||
if ($negative) {
|
||||
// cast to float so we can do a negative multiplication
|
||||
|
||||
@@ -154,7 +154,7 @@ class Byte
|
||||
if (!empty($matches[1])) {
|
||||
$number_negative = true;
|
||||
}
|
||||
if (isset($matches[2]) && isset($matches[3])) {
|
||||
if (isset($matches[2])) {
|
||||
// remove all non valid characters from the number
|
||||
$number = preg_replace('/[^0-9\.]/', '', $matches[2]);
|
||||
// final clean up and convert to float
|
||||
|
||||
@@ -957,9 +957,9 @@ class Color
|
||||
* Undocumented function
|
||||
*
|
||||
* @param HWB $hwb
|
||||
* @return Lch
|
||||
* @return LCH
|
||||
*/
|
||||
public static function hwbToLch(HWB $hwb): Lch
|
||||
public static function hwbToLch(HWB $hwb): LCH
|
||||
{
|
||||
return self::rgbToLch(
|
||||
self::hwbToRgb($hwb)
|
||||
@@ -1078,10 +1078,10 @@ class Color
|
||||
/**
|
||||
* OkLab to Lch (CIE)
|
||||
*
|
||||
* @param LAB $lab
|
||||
* @param Lab $lab
|
||||
* @return LCH
|
||||
*/
|
||||
public static function okLabToLch(LAB $lab): LCH
|
||||
public static function okLabToLch(Lab $lab): LCH
|
||||
{
|
||||
return self::labToLch(
|
||||
self::okLabToLab($lab)
|
||||
@@ -1092,9 +1092,9 @@ class Color
|
||||
* Lch (CIE) to OkLab
|
||||
*
|
||||
* @param LCH $lch
|
||||
* @return LAB
|
||||
* @return Lab
|
||||
*/
|
||||
public static function lchToOkLab(LCH $lch): LAB
|
||||
public static function lchToOkLab(LCH $lch): Lab
|
||||
{
|
||||
return self::labToOkLab(
|
||||
self::lchToLab($lch)
|
||||
|
||||
@@ -74,11 +74,15 @@ class Json
|
||||
* Weill set the internval last error state and info can be read with jsonGetLastError
|
||||
*
|
||||
* @param string $json
|
||||
* @param int $flags only JSON_INVALID_UTF8_IGNORE is currently allowed
|
||||
* @param int $flags only JSON_INVALID_UTF8_IGNORE is currently allowed
|
||||
* @return bool
|
||||
* @throws \InvalidArgumentException if flags is invalid
|
||||
*/
|
||||
public static function jsonValidate(string $json, int $flags = 0): bool
|
||||
{
|
||||
if ($flags != 0 && $flags != JSON_INVALID_UTF8_IGNORE) {
|
||||
throw new \InvalidArgumentException("For flag only 0 or JSON_INVALID_UTF8_IGNORE is allwed: " . $flags);
|
||||
}
|
||||
$json_valid = json_validate($json, flags:$flags);
|
||||
self::$json_last_error = json_last_error();
|
||||
return $json_valid;
|
||||
|
||||
+12
-6
@@ -2562,21 +2562,27 @@ class IO
|
||||
// set field names
|
||||
$this->cursor_ext[$query_hash]['field_names'] = [];
|
||||
for ($i = 0; $i < $this->cursor_ext[$query_hash]['num_fields']; $i++) {
|
||||
$this->cursor_ext[$query_hash]['field_names'][] =
|
||||
$this->db_functions->__dbFieldName(
|
||||
if (
|
||||
($field_name = $this->db_functions->__dbFieldName(
|
||||
$this->cursor_ext[$query_hash]['cursor'],
|
||||
$i
|
||||
);
|
||||
)) !== false
|
||||
) {
|
||||
$this->cursor_ext[$query_hash]['field_names'][] = $field_name;
|
||||
}
|
||||
}
|
||||
$this->field_names = $this->cursor_ext[$query_hash]['field_names'];
|
||||
// field types
|
||||
$this->cursor_ext[$query_hash]['field_types'] = [];
|
||||
for ($i = 0; $i < $this->cursor_ext[$query_hash]['num_fields']; $i++) {
|
||||
$this->cursor_ext[$query_hash]['field_types'][] =
|
||||
$this->db_functions->__dbFieldType(
|
||||
if (
|
||||
($field_type = $this->db_functions->__dbFieldType(
|
||||
$this->cursor_ext[$query_hash]['cursor'],
|
||||
$i
|
||||
);
|
||||
)) !== false
|
||||
) {
|
||||
$this->cursor_ext[$query_hash]['field_types'][] = $field_type;
|
||||
}
|
||||
}
|
||||
$this->field_types = $this->cursor_ext[$query_hash]['field_types'];
|
||||
// combined name => type
|
||||
|
||||
@@ -51,7 +51,7 @@ enum Convert: int
|
||||
/**
|
||||
* Get internal name from int value
|
||||
*
|
||||
* @param int $value
|
||||
* @param int $value
|
||||
* @return self
|
||||
*/
|
||||
public static function fromValue(int $value): self
|
||||
|
||||
@@ -134,8 +134,8 @@ class Support
|
||||
* Convert bool value to string value. Short name alias for printBool
|
||||
*
|
||||
* @param bool $bool Bool value to be transformed
|
||||
* @param string $true [='true'] Override default string 'true'
|
||||
* @param string $false [=false'] Override default string 'false'
|
||||
* @param string $true [=true] Override default string 'true'
|
||||
* @param string $false [=false] Override default string 'false'
|
||||
* @return string $true or $false string for true/false bool
|
||||
*/
|
||||
public static function prBl(
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -63,7 +63,7 @@ enum Flag: int
|
||||
/**
|
||||
* Get internal name from int value
|
||||
*
|
||||
* @param int $value
|
||||
* @param value-of<self::VALUES> $value
|
||||
* @return self
|
||||
*/
|
||||
public static function fromValue(int $value): self
|
||||
|
||||
@@ -178,11 +178,11 @@ class Elements
|
||||
"/(href=\")?(\>)?\b($protRegex)([\w\.\-?&=+%#~,;\/]+)\b([\.\-?&=+%#~,;\/]*)(\|([^\||^#]+)(#([^\|]+))?\|)?/",
|
||||
function ($matches) {
|
||||
return self::createUrl(
|
||||
$matches[1] ?? '',
|
||||
$matches[2] ?? '',
|
||||
$matches[3] ?? '',
|
||||
$matches[4] ?? '',
|
||||
$matches[5] ?? '',
|
||||
$matches[1],
|
||||
$matches[2],
|
||||
$matches[3],
|
||||
$matches[4],
|
||||
$matches[5],
|
||||
$matches[7] ?? '',
|
||||
$matches[9] ?? ''
|
||||
);
|
||||
|
||||
@@ -277,6 +277,38 @@ final class CoreLibsConvertJsonTest extends TestCase
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if invalid flag throws exception
|
||||
*
|
||||
* @covers ::jsonValidate
|
||||
* @testdox jsonValidate test exception thrown on invalid flag
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testJsonValidateInvalidFlag(): void
|
||||
{
|
||||
$this->expectException("\InvalidArgumentException");
|
||||
\CoreLibs\Convert\Json::jsonValidate('{"valid": "json"}', 5);
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if valid flag throws no exception
|
||||
*
|
||||
* @covers ::jsonValidate
|
||||
* @testdox jsonValidate test no exception on valid flag
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testJsonValidateValidflag(): void
|
||||
{
|
||||
$this->assertTrue(
|
||||
\CoreLibs\Convert\Json::jsonValidate('{"valid": "json"}', 0)
|
||||
);
|
||||
$this->assertTrue(
|
||||
\CoreLibs\Convert\Json::jsonValidate('{"valid": "json"}', JSON_INVALID_UTF8_IGNORE)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Undocumented function
|
||||
*
|
||||
|
||||
@@ -45,7 +45,6 @@ use CoreLibs\DB\Support\ConvertPlaceholder;
|
||||
* Test class for DB\IO + DB\SQL\PgSQL
|
||||
* This will only test the PgSQL parts
|
||||
* @coversDefaultClass \CoreLibs\DB\IO
|
||||
* @coversDefaultClass \CoreLibs\DB\SQL\PgSQL
|
||||
* @testdox \CoreLibs\DB\IO method tests for SQL\PgSQL
|
||||
*/
|
||||
final class CoreLibsDBIOTest extends TestCase
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
$set = 0;
|
||||
foreach (['/../../www', '/../www', '/../..', '/..', '/../../src', '/../src'] as $src) {
|
||||
foreach (['/../../www', '/../www', '/../../src', '/../src', '/../..', '/..'] as $src) {
|
||||
if (is_file(dirname(__DIR__) . $src . '/vendor/autoload.php')) {
|
||||
require dirname(__DIR__) . $src . '/vendor/autoload.php';
|
||||
$set = 1;
|
||||
|
||||
Reference in New Issue
Block a user