Skip to content

Commit 1804e9c

Browse files
committed
Changelog for #2085
1 parent 77a6836 commit 1804e9c

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

package.xml

+4
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ http://pear.php.net/dtd/package-2.0.xsd">
4343
- Generic.Functions.FunctionCallArgumentSpacing now properly fixes multi-line function calls with leading commas
4444
-- Previously, newlines between function arguments would be removed
4545
-- Thanks to Juliette Reinders Folmer for the patch
46+
- Generic.PHP.Syntax will now use PHP_BINARY instead of trying to discover the executable path
47+
-- This ensures that the sniff will always syntax check files using the PHP version that PHPCS is running under
48+
-- Setting the php_path config var will still override this value as normal
49+
-- Thanks to Willem Stuursma-Ruwen for the patch
4650
- PSR2.Namespaces.UseDeclaration now supports commas at the end of group use declarations
4751
-- Also improves checking and fixing for use statements containing parse errors
4852
-- Thanks to Juliette Reinders Folmer for the patch

src/Config.php

+1-4
Original file line numberDiff line numberDiff line change
@@ -1517,10 +1517,7 @@ public static function getExecutablePath($name)
15171517
}
15181518

15191519
if ($name === "php") {
1520-
/*
1521-
* For php, we know the executable path. There's no need to look it up.
1522-
*/
1523-
1520+
// For php, we know the executable path. There's no need to look it up.
15241521
return PHP_BINARY;
15251522
}
15261523

0 commit comments

Comments
 (0)