Skip to content

Commit a7da037

Browse files
committed
Merge branch 'master' into report-memory-improvements
Conflicts: CodeSniffer.php package.xml
2 parents 28d5a29 + 5ea0972 commit a7da037

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

CodeSniffer/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
111111
T_PROTECTED,
112112
T_AS,
113113
T_INSTEADOF,
114+
T_NS_SEPARATOR,
114115
);
115116

116117
$prevToken = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);

CodeSniffer/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,6 @@ class RightSideVisTest {
4545
}
4646
}
4747

48+
namespace Something\sizeof;
49+
4850
?>

package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
2727
<license uri="https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt">BSD 3-Clause License</license>
2828
<notes>
2929
- Fixed bug #20093 : Bug with ternary operator token
30+
- Fixed bug #20100 : incorrect Function mysql() has been deprecated report
3031
</notes>
3132
<contents>
3233
<dir name="/">

0 commit comments

Comments
 (0)