Skip to content

Commit 3b89b1b

Browse files
committed
Merge branch 'master' into 4.x
2 parents caf8060 + e611ee3 commit 3b89b1b

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

src/Config.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1718,11 +1718,6 @@ public static function getAllConfigData()
17181718
$configFile = dirname($path).DIRECTORY_SEPARATOR.'CodeSniffer.conf';
17191719
} else {
17201720
$configFile = dirname(__DIR__).DIRECTORY_SEPARATOR.'CodeSniffer.conf';
1721-
if (is_file($configFile) === false
1722-
&& strpos('@data_dir@', '@data_dir') === false
1723-
) {
1724-
$configFile = '@data_dir@/PHP_CodeSniffer/CodeSniffer.conf';
1725-
}
17261721
}
17271722

17281723
if (is_file($configFile) === false) {

0 commit comments

Comments
 (0)