Skip to content

Commit cfdc6c9

Browse files
gsherwoodgsherwood
committed
Merge branch 'context-sensitive' of https://github.com/kukulich/PHP_CodeSniffer 
2 parents 5672074 + c73f456 commit cfdc6c9

File tree

5 files changed

+874
-165
lines changed

5 files changed

+874
-165
lines changed

‎package.xml

+6
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
141141
<file baseinstalldir="" name="BackfillNumericSeparatorTest.php" role="test" />
142142
<file baseinstalldir="" name="BitwiseOrTest.inc" role="test" />
143143
<file baseinstalldir="" name="BitwiseOrTest.php" role="test" />
144+
<file baseinstalldir="" name="ContextSensitiveKeywordsTest.inc" role="test" />
145+
<file baseinstalldir="" name="ContextSensitiveKeywordsTest.php" role="test" />
144146
<file baseinstalldir="" name="DefaultKeywordTest.inc" role="test" />
145147
<file baseinstalldir="" name="DefaultKeywordTest.php" role="test" />
146148
<file baseinstalldir="" name="DoubleArrowTest.inc" role="test" />
@@ -2100,6 +2102,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
21002102
<install as="CodeSniffer/Core/Tokenizer/BackfillNumericSeparatorTest.inc" name="tests/Core/Tokenizer/BackfillNumericSeparatorTest.inc" />
21012103
<install as="CodeSniffer/Core/Tokenizer/BitwiseOrTest.php" name="tests/Core/Tokenizer/BitwiseOrTest.php" />
21022104
<install as="CodeSniffer/Core/Tokenizer/BitwiseOrTest.inc" name="tests/Core/Tokenizer/BitwiseOrTest.inc" />
2105+
<install as="CodeSniffer/Core/Tokenizer/ContextSensitiveKeywordsTest.php" name="tests/Core/Tokenizer/ContextSensitiveKeywordsTest.php" />
2106+
<install as="CodeSniffer/Core/Tokenizer/ContextSensitiveKeywordsTest.inc" name="tests/Core/Tokenizer/ContextSensitiveKeywordsTest.inc" />
21032107
<install as="CodeSniffer/Core/Tokenizer/DefaultKeywordTest.php" name="tests/Core/Tokenizer/DefaultKeywordTest.php" />
21042108
<install as="CodeSniffer/Core/Tokenizer/DefaultKeywordTest.inc" name="tests/Core/Tokenizer/DefaultKeywordTest.inc" />
21052109
<install as="CodeSniffer/Core/Tokenizer/DoubleArrowTest.php" name="tests/Core/Tokenizer/DoubleArrowTest.php" />
@@ -2194,6 +2198,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
21942198
<install as="CodeSniffer/Core/Tokenizer/BackfillNumericSeparatorTest.inc" name="tests/Core/Tokenizer/BackfillNumericSeparatorTest.inc" />
21952199
<install as="CodeSniffer/Core/Tokenizer/BitwiseOrTest.php" name="tests/Core/Tokenizer/BitwiseOrTest.php" />
21962200
<install as="CodeSniffer/Core/Tokenizer/BitwiseOrTest.inc" name="tests/Core/Tokenizer/BitwiseOrTest.inc" />
2201+
<install as="CodeSniffer/Core/Tokenizer/ContextSensitiveKeywordsTest.php" name="tests/Core/Tokenizer/ContextSensitiveKeywordsTest.php" />
2202+
<install as="CodeSniffer/Core/Tokenizer/ContextSensitiveKeywordsTest.inc" name="tests/Core/Tokenizer/ContextSensitiveKeywordsTest.inc" />
21972203
<install as="CodeSniffer/Core/Tokenizer/DefaultKeywordTest.php" name="tests/Core/Tokenizer/DefaultKeywordTest.php" />
21982204
<install as="CodeSniffer/Core/Tokenizer/DefaultKeywordTest.inc" name="tests/Core/Tokenizer/DefaultKeywordTest.inc" />
21992205
<install as="CodeSniffer/Core/Tokenizer/DoubleArrowTest.php" name="tests/Core/Tokenizer/DoubleArrowTest.php" />

0 commit comments

Comments
 (0)