Skip to content

Commit f83e917

Browse files
committed
Removed use of deprecated auto_detect_line_endings ini setting (ref #3394)
1 parent a0b1858 commit f83e917

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ The file documents changes to the PHP_CodeSniffer project.
5050
### Removed
5151
- Removed support for installing via PEAR
5252
- Use composer or the phar files
53+
- Removed use of the deprecated `auto_detect_line_endings` ini setting
54+
- This removes support for files with `\r` line endings
5355
- Support for checking the coding standards of JS files has been removed
5456
- Support for checking the coding standards of CSS files has been removed
5557
- Support for the deprecated `@codingStandard` annotation syntax has been removed

src/Runner.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,10 +279,6 @@ public function init()
279279
define('PHP_CODESNIFFER_CBF', false);
280280
}
281281

282-
// Ensure this option is enabled or else line endings will not always
283-
// be detected properly for files created on a Mac with the /r line ending.
284-
ini_set('auto_detect_line_endings', true);
285-
286282
// Disable the PCRE JIT as this caused issues with parallel running.
287283
ini_set('pcre.jit', false);
288284

0 commit comments

Comments
 (0)