Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6b1261b157 | |||
| b695c3ffdc |
+3
-3
@@ -1,12 +1,12 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<phive xmlns="https://phar.io/phive">
|
<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="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="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.50" location="./tools/phpstan" copy="false"/>
|
||||||
<phar name="phan" version="^5.4.3" installed="5.5.2" location="./tools/phan" 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="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="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="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>
|
</phive>
|
||||||
|
|||||||
+2
-2
@@ -15,7 +15,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"repositories": {
|
"repositories": {
|
||||||
"packages.omnicomproduction.jp.Composer": {
|
"git.egplusww.jp.Composer": {
|
||||||
"type": "composer",
|
"type": "composer",
|
||||||
"url": "https://packages.omnicomproduction.jp/api/packages/Composer/composer"
|
"url": "https://packages.omnicomproduction.jp/api/packages/Composer/composer"
|
||||||
}
|
}
|
||||||
@@ -23,7 +23,7 @@
|
|||||||
"require": {
|
"require": {
|
||||||
"egrajp/smarty-extended": "^5.4",
|
"egrajp/smarty-extended": "^5.4",
|
||||||
"php": ">=8.1",
|
"php": ">=8.1",
|
||||||
"gullevek/dotenv": "^2.0",
|
"gullevek/dotenv": "^3.0",
|
||||||
"psr/log": "^2.0 || ^3.0",
|
"psr/log": "^2.0 || ^3.0",
|
||||||
"php-privacy/openpgp": "^2.1"
|
"php-privacy/openpgp": "^2.1"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -811,87 +811,6 @@ class ArrayHandler
|
|||||||
);
|
);
|
||||||
return $in_array;
|
return $in_array;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO: move to CoreLibs ArrayCombined
|
|
||||||
* return one random entry from an array (value)
|
|
||||||
* the return entry is null if the incoming array is empty
|
|
||||||
* the array can also be an array of arrays
|
|
||||||
*
|
|
||||||
* @param array<mixed> $array
|
|
||||||
* @return string|int|float|bool|array<mixed>|null
|
|
||||||
*/
|
|
||||||
public static function getRandomEntryFromArray(array $array): string|int|float|bool|array|null
|
|
||||||
{
|
|
||||||
if (empty($array)) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
$random_index = array_rand($array);
|
|
||||||
return $array[$random_index];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO: move to CoreLibs ArrayCombined
|
|
||||||
* find and remove one value
|
|
||||||
* on default removes only the first entry
|
|
||||||
* on default does not strict compare
|
|
||||||
*
|
|
||||||
* @param array<mixed> $array
|
|
||||||
* @param string|int|float|bool|array<mixed> $value
|
|
||||||
* @param bool $strict [false]
|
|
||||||
* @return array<mixed>
|
|
||||||
*/
|
|
||||||
public static function removeArrayEntryByValue(
|
|
||||||
array $array,
|
|
||||||
string|int|float|bool|array $value,
|
|
||||||
bool $strict = false,
|
|
||||||
): array {
|
|
||||||
return array_filter($array, function ($element) use ($value, $strict) {
|
|
||||||
return $strict ?
|
|
||||||
$element !== $value :
|
|
||||||
$element != $value;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO: move to CoreLibs ArrayCombined
|
|
||||||
* add a string to each element in an array, default is at the end of the value,
|
|
||||||
* can be switched with the prefix flag
|
|
||||||
*
|
|
||||||
* @param array<string> $array
|
|
||||||
* @param string $string_to_add
|
|
||||||
* @param bool $prefix [false]
|
|
||||||
* @return array<string>
|
|
||||||
*/
|
|
||||||
public static function addStringToEachValueInArray(array $array, string $string_to_add, bool $prefix = false): array
|
|
||||||
{
|
|
||||||
return array_map(function ($value) use ($string_to_add, $prefix) {
|
|
||||||
return $prefix ?
|
|
||||||
$string_to_add . $value :
|
|
||||||
$value . $string_to_add;
|
|
||||||
}, $array);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* sort by key any array, even if it is nested
|
|
||||||
*
|
|
||||||
* @param array<mixed> $data
|
|
||||||
* @return array<mixed>
|
|
||||||
*/
|
|
||||||
public static function createSortedArrayByKey(array $data): array
|
|
||||||
{
|
|
||||||
// Sort by keys
|
|
||||||
ksort($data);
|
|
||||||
|
|
||||||
// Recursively sort nested arrays
|
|
||||||
foreach ($data as $key => $value) {
|
|
||||||
if (is_array($value)) {
|
|
||||||
$data[$key] = self::createSortedArrayByKey($value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $data;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// __END__
|
// __END__
|
||||||
|
|||||||
Reference in New Issue
Block a user