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

phan and phpstan fixes

Browse Source
This commit is contained in:
Clemens Schwaighofer
2025-06-05 14:37:42 +09:00
parent dbc72472f9
commit 9115fc9557
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
4dev/tests/Convert/CoreLibsConvertStringsTest.php
View File

@@ -135,6 +135,11 @@ final class CoreLibsConvertStringsTest extends TestCase
public function splitFormatStringExceptionProvider(): array public function splitFormatStringExceptionProvider(): array
{ {
return [ return [
'string format with no splitter match' => [
'1234',
'22',
'12-34'
],
'invalid format string' => [ 'invalid format string' => [
'1234', '1234',
'2あ2', '2あ2',

2
www/admin/class_test.array.php
View File

@@ -333,7 +333,7 @@ print "(kosrt, lower case, reverse): "
print "<hr>"; print "<hr>";
$nested = [ $nested = [
'B' => 'foo', 'a', '0', 9, 'B' => 'foo', 'a', '0', 9,
1 => ['z', 'b', 'a'], '1' => ['z', 'b', 'a'],
'd' => ['zaip', 'bar', 'baz'] 'd' => ['zaip', 'bar', 'baz']
]; ];
print "Nested: " . DgS::printAr($nested) . "<br>"; print "Nested: " . DgS::printAr($nested) . "<br>";

4
www/lib/CoreLibs/Combined/ArrayHandler.php
View File

@@ -251,10 +251,10 @@ class ArrayHandler
* @param array<mixed> $array * @param array<mixed> $array
* @param string|int|float|bool $search_value * @param string|int|float|bool $search_value
* @param string|array<string> $required_key * @param string|array<string> $required_key
* @param ?string $serach_key [null] * @param ?string $search_key [null]
* @param string $path_separator [DATA_SEPARATOR] * @param string $path_separator [DATA_SEPARATOR]
* @param string $current_path * @param string $current_path
* @return array<array{content?:array<mixed>,path?:string,missing_key?:string}> * @return array<array{content?:array<mixed>,path?:string,missing_key?:array<string>}>
*/ */
public static function findArraysMissingKey( public static function findArraysMissingKey(
array $array, array $array,

9
www/lib/CoreLibs/Convert/Strings.php
View File

@@ -85,7 +85,12 @@ class Strings
); );
} }
// get the split characters that are not numerical and check they are ascii // get the split characters that are not numerical and check they are ascii
$split_characters = self::removeDuplicates(preg_replace('/[0-9]/', '', $split_format)); $split_characters = self::removeDuplicates(preg_replace('/[0-9]/', '', $split_format) ?: '');
if (empty($split_characters)) {
throw new \InvalidArgumentException(
"A split character must exist in the format string: " . $split_format
);
}
if (preg_match('/[^\x20-\x7e]/', $split_characters)) { if (preg_match('/[^\x20-\x7e]/', $split_characters)) {
throw new \InvalidArgumentException( throw new \InvalidArgumentException(
"The split character has to be a valid ascii character: " . $split_characters "The split character has to be a valid ascii character: " . $split_characters
@@ -296,7 +301,7 @@ class Strings
* check if a regex is invalid, returns array with flag and error string * check if a regex is invalid, returns array with flag and error string
* *
* @param string $pattern * @param string $pattern
* @return array{valid:bool,preg_error:0,error:null|string,pcre_error:null|string} * @return array{valid:bool,preg_error:int,error:null|string,pcre_error:null|string}
*/ */
public static function validateRegex(string $pattern): array public static function validateRegex(string $pattern): array
{ {