Skip to content

Commit 6bd5567

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Add missing SKIPIF (mbstring)
2 parents 2eae789 + db4f5e4 commit 6bd5567

File tree

4 files changed

+8
-0
lines changed

4 files changed

+8
-0
lines changed

ext/mbstring/tests/bug77165.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Bug #77165: mb_check_encoding crashes when argument given an empty array
3+
--SKIPIF--
4+
<?php require 'skipif.inc'; ?>
35
--FILE--
46
<?php
57
var_dump(mb_check_encoding(array()));

ext/mbstring/tests/bug77454.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Bug #77454: mb_scrub() silently truncates after a null byte
3+
--SKIPIF--
4+
<?php require 'skipif.inc'; ?>
35
--FILE--
46
<?php
57
$str = "before\0after";

ext/mbstring/tests/internal_encoding.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Check that "internal_encoding" ini is picked up by mbstring
3+
--SKIPIF--
4+
<?php require 'skipif.inc'; ?>
35
--INI--
46
internal_encoding=iso-8859-1
57
--FILE--

ext/mbstring/tests/mb_convert_encoding_leak.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
mb_convert_encoding() shouldn't leak keys
3+
--SKIPIF--
4+
<?php require 'skipif.inc'; ?>
35
--FILE--
46
<?php
57

0 commit comments

Comments
 (0)