Compare commits
5 Commits
188f0b57d0
...
a8755c8c0f
| Author | SHA1 | Date | |
|---|---|---|---|
 Clemens Schwaighofer
|
a8755c8c0f | ||
|
Clemens Schwaighofer
|
85f7e114b0 | ||
|
Clemens Schwaighofer
|
6b1261b157 | ||
|
Clemens Schwaighofer
|
b695c3ffdc | ||
|
Clemens Schwaighofer
|
90d76bbd6c |
@@ -6,3 +6,4 @@ tools/
|
||||
**/.env
|
||||
**/.target
|
||||
package-lock.json
|
||||
build/
|
||||
|
||||
+3
-3
@@ -1,12 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<phive xmlns="https://phar.io/phive">
|
||||
<phar name="phpunit" version="~9.6" installed="9.6.31" location="./tools/phpunit" copy="false"/>
|
||||
<phar name="phpunit" version="~9.6" installed="9.6.34" location="./tools/phpunit" copy="false"/>
|
||||
<phar name="phpcbf" version="4" installed="4.0.1" location="./tools/phpcbf" copy="false"/>
|
||||
<phar name="phpcs" version="4" installed="4.0.1" location="./tools/phpcs" copy="false"/>
|
||||
<phar name="phpstan" version="^2.0" installed="2.1.33" location="./tools/phpstan" copy="false"/>
|
||||
<phar name="phpstan" version="^2.0" installed="2.1.54" location="./tools/phpstan" copy="false"/>
|
||||
<phar name="phan" version="^5.4.3" installed="5.5.2" location="./tools/phan" copy="false"/>
|
||||
<phar name="psalm" version="^5.26.1" installed="5.26.1" location="./tools/psalm" copy="false"/>
|
||||
<phar name="phpdox" version="^0.12.0" installed="0.12.0" location="./tools/phpdox" copy="false"/>
|
||||
<phar name="phpdocumentor" version="^3.4.2" installed="3.9.1" location="./tools/phpDocumentor" copy="false"/>
|
||||
<phar name="php-cs-fixer" version="^3.34.1" installed="3.92.4" location="./tools/php-cs-fixer" copy="false"/>
|
||||
<phar name="php-cs-fixer" version="^3.34.1" installed="3.95.1" location="./tools/php-cs-fixer" copy="false"/>
|
||||
</phive>
|
||||
|
||||
@@ -49,6 +49,7 @@ php_version="";
|
||||
no_php_version=0;
|
||||
use_composer=0;
|
||||
opt_generate_coverage="";
|
||||
opt_generate_coverage_html="";
|
||||
while [ -n "${1-}" ]; do
|
||||
case "${1}" in
|
||||
-t | --testdox)
|
||||
@@ -65,6 +66,10 @@ while [ -n "${1-}" ]; do
|
||||
opt_generate_coverage="--coverage-text";
|
||||
shift
|
||||
;;
|
||||
--coverage-report)
|
||||
opt_generate_coverage_html="--coverage-html build/coverage-report";
|
||||
shift
|
||||
;;
|
||||
-p | --php)
|
||||
php_version="${2-}";
|
||||
shift
|
||||
@@ -114,6 +119,7 @@ PHPUNIT_CALL+=(
|
||||
"${opt_testdox}"
|
||||
"${opt_verbose}"
|
||||
"${opt_generate_coverage}"
|
||||
"${opt_generate_coverage_html}"
|
||||
"-c" "${PHPUNIT_CONFIG}"
|
||||
"${BASE_PATH}4dev/tests/"
|
||||
);
|
||||
|
||||
@@ -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
|
||||
*
|
||||
|
||||
+5
-2
@@ -1,8 +1,11 @@
|
||||
// https://www.typescriptlang.org/tsconfig/#compilerOptions
|
||||
{
|
||||
"compilerOptions": {
|
||||
"module": "ESNext",
|
||||
"moduleResolution": "Node",
|
||||
// if "bundler"
|
||||
// "module": "ESNext",
|
||||
"module": "NodeNext",
|
||||
// "bundler" (front), "nodenext" or "node16"
|
||||
"moduleResolution": "nodenext",
|
||||
"target": "ES2020",
|
||||
"jsx": "react",
|
||||
"checkJs": true,
|
||||
|
||||
@@ -14,6 +14,9 @@
|
||||
<include>
|
||||
<directory suffix=".php">./www/lib/CoreLibs</directory>
|
||||
</include>
|
||||
<!-- <report>
|
||||
<html outputDirectory="build/coverage-report"/>
|
||||
</report> -->
|
||||
</coverage>
|
||||
<!-- <source>
|
||||
<include>
|
||||
|
||||
@@ -38,6 +38,11 @@ print "GETFILENAMEENDING: $file: " . File::getFilenameEnding($file) . "<br>";
|
||||
$file = getcwd() . DIRECTORY_SEPARATOR . 'class_test.file.php';
|
||||
print "GETLINESFROMFILE: $file: " . File::getLinesFromFile($file) . "<br>";
|
||||
print "MIMEINFO: $file: " . File::getMimeType($file) . "<br>";
|
||||
try {
|
||||
print "MIMEINFO: $file: " . File::getMimeType("does_not_exists.txt") . "<br>";
|
||||
} catch (\Exception $e) {
|
||||
print "Error: " . get_class($e) . ": " . $e->getMessage() . "<br>";
|
||||
}
|
||||
|
||||
print "</body></html>";
|
||||
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@
|
||||
"require": {
|
||||
"egrajp/smarty-extended": "^5.4",
|
||||
"php": ">=8.1",
|
||||
"gullevek/dotenv": "^2.0",
|
||||
"gullevek/dotenv": "^3.0",
|
||||
"psr/log": "^2.0 || ^3.0",
|
||||
"php-privacy/openpgp": "^2.1"
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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] ?? ''
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user