From 3f72c77ce47ee0906905b83161d9c1d24e425d89 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sat, 13 Oct 2018 11:21:27 +0200 Subject: Convert CRLF line endings to LF This patch simplifies line endings tracked in the Git repository and syncs them to all include the LF style instead of the CRLF files. Newline characters: - LF (\n) (*nix and Mac) - CRLF (\r\n) (Windows) - CR (\r) (old Mac, obsolete) To see which line endings are in the index and in the working copy the following command can be used: `git ls-files --eol` Git additionally provides `.gitattributes` file to specify if some files need to have specific line endings on all platforms (either CRLF or LF). Changed files shouldn't cause issues on modern Windows platforms because also Git can do output conversion is core.autocrlf=true is set on Windows and use CRLF newlines in all files in the working tree. Unless CRLF files are tracked specifically, Git by default tracks all files in the index using LF newlines. --- ext/mbstring/tests/bug52981.phpt | 46 ++++++++++++++++++++-------------------- ext/mbstring/tests/bug75944.phpt | 26 +++++++++++------------ 2 files changed, 36 insertions(+), 36 deletions(-) (limited to 'ext/mbstring') diff --git a/ext/mbstring/tests/bug52981.phpt b/ext/mbstring/tests/bug52981.phpt index fe96a56f08..7dce14a7ad 100644 --- a/ext/mbstring/tests/bug52981.phpt +++ b/ext/mbstring/tests/bug52981.phpt @@ -1,23 +1,23 @@ ---TEST-- -Bug #52981 (Unicode properties are outdated (from Unicode 3.2)) ---SKIPIF-- - ---FILE-- - +--FILE-- + ---FILE-- - ---EXPECT-- -string(12) "Windows-1251" -string(12) "Windows-1251" - +--TEST-- +Bug #75944 (wrong detection cp1251 encoding because of missing last cyrillic letter) +--SKIPIF-- + +--FILE-- + +--EXPECT-- +string(12) "Windows-1251" +string(12) "Windows-1251" + -- cgit v1.2.1