Merge branch 'feature/tokenizer-php-octal-notation-bugfix' of https://github.com/jrfnl/PHP_CodeSniffer

Author: gsherwood

src/Tokenizers/PHP.php

@@ -730,7 +730,8 @@ protected function tokenize($string)
                 && (isset($tokens[($stackPtr + 1)]) === true
                 && is_array($tokens[($stackPtr + 1)]) === true
                 && $tokens[($stackPtr + 1)][0] === T_STRING
-                && strtolower($tokens[($stackPtr + 1)][1][0]) === 'o')
+                && strtolower($tokens[($stackPtr + 1)][1][0]) === 'o'
+                && $tokens[($stackPtr + 1)][1][1] !== '_')
             ) {
                 $finalTokens[$newStackPtr] = [
                     'code'    => T_LNUMBER,

tests/Core/Tokenizer/BackfillExplicitOctalNotationTest.inc

@@ -5,3 +5,12 @@ $foo = 0o137041;
 
 /* testExplicitOctalCapitalised */
 $bar = 0O137041;
+
+/* testExplicitOctalWithNumericSeparator */
+$octal = 0o137_041;
+
+/* testInvalid1 */
+$foo = 0o_137;
+
+/* testInvalid2 */
+$foo = 0O_41;

tests/Core/Tokenizer/BackfillExplicitOctalNotationTest.php

@@ -62,6 +62,27 @@ public function dataExplicitOctalNotation()
                     'value'  => '0O137041',
                 ],
             ],
+            [
+                [
+                    'marker' => '/* testExplicitOctalWithNumericSeparator */',
+                    'type'   => 'T_LNUMBER',
+                    'value'  => '0o137_041',
+                ],
+            ],
+            [
+                [
+                    'marker' => '/* testInvalid1 */',
+                    'type'   => 'T_LNUMBER',
+                    'value'  => '0',
+                ],
+            ],
+            [
+                [
+                    'marker' => '/* testInvalid2 */',
+                    'type'   => 'T_LNUMBER',
+                    'value'  => '0',
+                ],
+            ],
         ];
 
     }//end dataExplicitOctalNotation()

tests/Core/Tokenizer/BackfillNumericSeparatorTest.inc

@@ -77,6 +77,12 @@ $testValue = 107_925_284 .88;
 /* testInvalid10 */
 $testValue = 107_925_284/*comment*/.88;
 
+/* testInvalid11 */
+$foo = 0o_137;
+
+/* testInvalid12 */
+$foo = 0O_41;
+
 /*
  * Ensure that legitimate calculations are not touched by the backfill.
  */

tests/Core/Tokenizer/BackfillNumericSeparatorTest.php

@@ -336,6 +336,32 @@ public function dataNoBackfill()
                     ],
                 ],
             ],
+            [
+                '/* testInvalid11 */',
+                [
+                    [
+                        'code'    => T_LNUMBER,
+                        'content' => '0',
+                    ],
+                    [
+                        'code'    => T_STRING,
+                        'content' => 'o_137',
+                    ],
+                ],
+            ],
+            [
+                '/* testInvalid12 */',
+                [
+                    [
+                        'code'    => T_LNUMBER,
+                        'content' => '0',
+                    ],
+                    [
+                        'code'    => T_STRING,
+                        'content' => 'O_41',
+                    ],
+                ],
+            ],
             [
                 '/* testCalc1 */',
                 [