Skip to content

Commit

Permalink
Bump to PHP 7.2, stick to phpunit 8.5
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolas-grekas committed Sep 9, 2024
1 parent 2bf2520 commit 85181ba
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
12 changes: 0 additions & 12 deletions Mbstring.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,6 @@ final class Mbstring
public static function mb_convert_encoding($s, $toEncoding, $fromEncoding = null)
{
if (\is_array($s)) {
if (\PHP_VERSION_ID < 70200) {
trigger_error('mb_convert_encoding() expects parameter 1 to be string, array given', \E_USER_WARNING);

return null;
}

$r = [];
foreach ($s as $str) {
$r[] = self::mb_convert_encoding($str, $toEncoding, $fromEncoding);
Expand Down Expand Up @@ -430,12 +424,6 @@ public static function mb_encoding_aliases($encoding)

public static function mb_check_encoding($var = null, $encoding = null)
{
if (\PHP_VERSION_ID < 70200 && \is_array($var)) {
trigger_error('mb_check_encoding() expects parameter 1 to be string, array given', \E_USER_WARNING);

return null;
}

if (null === $encoding) {
if (null === $var) {
return false;
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
],
"require": {
"php": ">=7.1"
"php": ">=7.2"
},
"provide": {
"ext-mbstring": "*"
Expand Down

0 comments on commit 85181ba

Please sign in to comment.