From 160d25ed913ce835f5dac3b4aa1116619fa4dd29 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 5 Oct 2022 14:06:15 +0000 Subject: [PATCH] Tests: Ignore EOL differences in Style Engine API tests. Unix vs. Windows EOL style mismatches can cause misleading failures in tests using the heredoc syntax (`<<<`) or multiline strings as the expected result. This resolves two failures when running the test suite on Windows along the lines of: {{{ 1) Tests_Style_Engine_wpStyleEngineCSSRule::test_should_prettify_css_rule_output Failed asserting that two strings are identical. --- Expected +++ Actual @@ @@ #Warning: Strings contain different line endings! -'.baptiste { - margin-left: 0; - font-family: Detective Sans; +'.baptiste { + margin-left: 0; + font-family: Detective Sans; }' /var/www/tests/phpunit/tests/style-engine/wpStyleEngineCssRule.php:159 }}} Follow-up to [46612], [48443], [48466], [49691], [51135], [53282], [53319], [54156]. See #56467, #55652. Built from https://develop.svn.wordpress.org/trunk@54394 git-svn-id: http://core.svn.wordpress.org/trunk@53953 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-includes/version.php b/wp-includes/version.php index 3fd92aeade..c1690599d0 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.1-beta3-54393'; +$wp_version = '6.1-beta3-54394'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.