Skip to content

Commit 5f4c9cc

Browse files
committed
Fixed bug #1769 : Custom define function triggers a warning about declaring new symbols
1 parent 4d88bb2 commit 5f4c9cc

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
139139
- Fixed bug #1761 : Generic.WhiteSpace.ScopeIndent error on multi-line function call with static closure argument
140140
- Fixed bug #1762 : Generic.WhiteSpace.Disallow[Space/Tab]Indent not inspecting content before open tag
141141
-- Thanks to Juliette Reinders Folmer for the patch
142+
- Fixed bug #1769 : Custom "define" function triggers a warning about declaring new symbols
142143
</notes>
143144
<contents>
144145
<dir name="/">

src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,9 @@ private function searchForConflict($phpcsFile, $start, $end, $tokens)
178178
&& strtolower($tokens[$i]['content']) === 'define'
179179
) {
180180
$prev = $phpcsFile->findPrevious(T_WHITESPACE, ($i - 1), null, true);
181-
if ($tokens[$prev]['code'] !== T_OBJECT_OPERATOR) {
181+
if ($tokens[$prev]['code'] !== T_OBJECT_OPERATOR
182+
&& $tokens[$prev]['code'] !== T_DOUBLE_COLON
183+
) {
182184
if ($firstSymbol === null) {
183185
$firstSymbol = $i;
184186
}

src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.2.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ $var = myFunction();
1212
print_r($var);
1313
echo $object->define();
1414
echo $object -> define();
15+
Foo::define();
1516

1617
$c = new class extends Something{
1718

0 commit comments

Comments
 (0)