Merge pull request #13169 from tenkoma/2.x-test-pass-with-php73

[2.x]Skip tests that fail on PHP 7.3 built-in functions
This commit is contained in:
Mark Story 2019-04-28 10:03:56 -04:00 committed by GitHub
commit 7d8da309ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions

View file

@ -43,9 +43,6 @@ matrix:
- php: 7.2 - php: 7.2
env: DB=mysql PHPUNIT=5.7.19 env: DB=mysql PHPUNIT=5.7.19
- php: 7.3
env: DB=mysql PHPUNIT=5.7.19
allow_failures:
- php: 7.3 - php: 7.3
env: DB=mysql PHPUNIT=5.7.19 env: DB=mysql PHPUNIT=5.7.19
exclude: exclude:

View file

@ -7640,6 +7640,10 @@ class MultibyteTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testUsingMbStrtoupperArmenian() { public function testUsingMbStrtoupperArmenian() {
if (extension_loaded('mbstring') && version_compare(PHP_VERSION, '7.3', '>=')) {
$this->markTestSkipped('PHP7.3+ built-in function mb_strtoupper() behaves slightly different from Multibyte::strtoupper()');
}
$string = 'աբգդեզէըթժիլխծկհձղճմյնշոչպջռսվտրցւփքօֆև'; $string = 'աբգդեզէըթժիլխծկհձղճմյնշոչպջռսվտրցւփքօֆև';
$result = mb_strtoupper($string); $result = mb_strtoupper($string);
$expected = 'ԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀՁՂՃՄՅՆՇՈՉՊՋՌՍՎՏՐՑՒՓՔՕՖև'; $expected = 'ԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀՁՂՃՄՅՆՇՈՉՊՋՌՍՎՏՐՑՒՓՔՕՖև';
@ -7652,6 +7656,10 @@ class MultibyteTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testUsingMbStrtoupperDiacritic() { public function testUsingMbStrtoupperDiacritic() {
if (extension_loaded('mbstring') && version_compare(PHP_VERSION, '7.3', '>=')) {
$this->markTestSkipped('PHP7.3+ built-in function mb_strtoupper() behaves slightly different from Multibyte::strtoupper()');
}
$string = 'ḁḃḅḇḉḋḍḏḑḓḕḗḙḛḝḟḡḣḥḧḩḫḭḯḱḳḵḷḹḻḽḿṁṃṅṇṉṋṍṏṑṓṕṗṙṛṝṟṡṣṥṧṩṫṭṯṱṳṵṷṹṻṽṿẁẃẅẇẉẋẍẏẑẓẕẖẗẘẙẚạảấầẩẫậắằẳẵặẹẻẽếềểễệỉịọỏốồổỗộớờởỡợụủứừửữựỳỵỷỹ'; $string = 'ḁḃḅḇḉḋḍḏḑḓḕḗḙḛḝḟḡḣḥḧḩḫḭḯḱḳḵḷḹḻḽḿṁṃṅṇṉṋṍṏṑṓṕṗṙṛṝṟṡṣṥṧṩṫṭṯṱṳṵṷṹṻṽṿẁẃẅẇẉẋẍẏẑẓẕẖẗẘẙẚạảấầẩẫậắằẳẵặẹẻẽếềểễệỉịọỏốồổỗộớờởỡợụủứừửữựỳỵỷỹ';
$result = mb_strtoupper($string); $result = mb_strtoupper($string);
$expected = 'ḀḂḄḆḈḊḌḎḐḒḔḖḘḚḜḞḠḢḤḦḨḪḬḮḰḲḴḶḸḺḼḾṀṂṄṆṈṊṌṎṐṒṔṖṘṚṜṞṠṢṤṦṨṪṬṮṰṲṴṶṸṺṼṾẀẂẄẆẈẊẌẎẐẒẔẖẗẘẙẚẠẢẤẦẨẪẬẮẰẲẴẶẸẺẼẾỀỂỄỆỈỊỌỎỐỒỔỖỘỚỜỞỠỢỤỦỨỪỬỮỰỲỴỶỸ'; $expected = 'ḀḂḄḆḈḊḌḎḐḒḔḖḘḚḜḞḠḢḤḦḨḪḬḮḰḲḴḶḸḺḼḾṀṂṄṆṈṊṌṎṐṒṔṖṘṚṜṞṠṢṤṦṨṪṬṮṰṲṴṶṸṺṼṾẀẂẄẆẈẊẌẎẐẒẔẖẗẘẙẚẠẢẤẦẨẪẬẮẰẲẴẶẸẺẼẾỀỂỄỆỈỊỌỎỐỒỔỖỘỚỜỞỠỢỤỦỨỪỬỮỰỲỴỶỸ';
@ -7664,6 +7672,10 @@ class MultibyteTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testUsingMbStrtoupperLigatures() { public function testUsingMbStrtoupperLigatures() {
if (extension_loaded('mbstring') && version_compare(PHP_VERSION, '7.3', '>=')) {
$this->markTestSkipped('PHP7.3+ built-in function mb_strtoupper() behaves slightly different from Multibyte::strtoupper()');
}
$string = 'fffiflffifflſtstﬓﬔﬕﬖﬗ'; $string = 'fffiflffifflſtstﬓﬔﬕﬖﬗ';
$result = mb_strtoupper($string); $result = mb_strtoupper($string);
$expected = 'fffiflffifflſtstﬓﬔﬕﬖﬗ'; $expected = 'fffiflffifflſtstﬓﬔﬕﬖﬗ';