From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 7 May 2020 16:36:48 +0000 (+0200)
Subject: Remove redundant htmlentities() tests
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ef65dd114ef319bf2fe53c667389d18f2d87a2e;p=php

Remove redundant htmlentities() tests

Test 04 and 15 are the same as 02 and 03, just for different
encodings. They don't add value, but their execution depends
on available locales, so they're easy to miss...
---

diff --git a/ext/standard/tests/strings/htmlentities04.phpt b/ext/standard/tests/strings/htmlentities04.phpt
deleted file mode 100644
index 7e47d8d4fc..0000000000
--- a/ext/standard/tests/strings/htmlentities04.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-htmlentities() test 4 (setlocale / ja_JP.EUC-JP)
---SKIPIF--
-<?php
-$result = (bool)setlocale(LC_CTYPE, "ja_JP.EUC-JP", "ja_JP.eucJP");
-if (!$result || preg_match('/EUC[^a-zA-Z]*JP/i', setlocale(LC_CTYPE, 0)) == 0) {
-	die("skip setlocale() failed\n");
-}
-?>
---INI--
-output_handler=
-default_charset=
-internal_encoding=pass
---FILE--
-<?php
-    setlocale( LC_CTYPE, "ja_JP.EUC-JP", "ja_JP.eucJP" );
-    var_dump(htmlentities("\xa1\xa2\xa1\xa3\xa1\xa4", ENT_QUOTES, ''));
-?>
---EXPECTF--
-Notice: htmlentities(): Only basic entities substitution is supported for multi-byte encodings other than UTF-8; functionality is equivalent to htmlspecialchars in %s line %d
-string(6) "¡¢¡£¡¤"
diff --git a/ext/standard/tests/strings/htmlentities15.phpt b/ext/standard/tests/strings/htmlentities15.phpt
deleted file mode 100644
index 4144d62e96..0000000000
--- a/ext/standard/tests/strings/htmlentities15.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-htmlentities() test 15 (setlocale / KOI8-R)
---INI--
-output_handler=
-default_charset=
-internal_encoding=pass
---SKIPIF--
-<?php
-$result = (bool)setlocale(LC_CTYPE, "ru_RU.koi8r", "ru_RU.KOI8-R");
-if (!$result || preg_match('/koi8/i', setlocale(LC_CTYPE, 0)) == 0) {
-	die("skip setlocale() failed\n");
-}
-?>
---DESCRIPTION--
-As of PHP 5.4, htmlentities() no longer makes replacements with numerical
-entities. Hence, for this input there's no substitution.
---FILE--
-<?php
-setlocale(LC_CTYPE, "ru_RU.koi8r", "ru_RU.KOI8-R");
-$str = "ÒÏÓËÏÛÎÙÊ";
-var_dump($str, htmlentities($str, ENT_QUOTES, ''));
-?>
---EXPECT--
-string(9) "ÒÏÓËÏÛÎÙÊ"
-string(9) "ÒÏÓËÏÛÎÙÊ"