Move code block down after the initial comment processing logic.

Check for lower- or upper-case 'o'.
Don't adjust $token and $tokens variables; but set the token in $finalTokens, and adjust pointers.

Author: MarkBaker

src/Tokenizers/PHP.php

@@ -553,23 +553,6 @@ protected function tokenize($string)
                 $lastNotEmptyToken = ($newStackPtr - 1);
             }
 
-            /*
-                For Explicit Octal Notation prior to PHP 8.1 we need to combine the
-                T_NUMBER and T_STRING token values into a single token value, and
-                then ignore the T_STRING token.
-            */
-
-            if (PHP_VERSION_ID < 80100
-                && $tokenIsArray === true && $token[1] === '0'
-                && (isset($tokens[($stackPtr + 1)]) === true
-                && is_array($tokens[($stackPtr + 1)]) === true
-                && $tokens[($stackPtr + 1)][0] === T_STRING
-                && $tokens[($stackPtr + 1)][1][0] === 'o')
-            ) {
-                $token[1] .= $tokens[($stackPtr + 1)][1];
-                $tokens[($stackPtr + 1)] = '';
-            }
-
             /*
                 If we are using \r\n newline characters, the \r and \n are sometimes
                 split over two tokens. This normally occurs after comments. We need
@@ -663,6 +646,29 @@ protected function tokenize($string)
                 }//end if
             }//end if
 
+            /*
+                For Explicit Octal Notation prior to PHP 8.1 we need to combine the
+                T_LNUMBER and T_STRING token values into a single token value, and
+                then ignore the T_STRING token.
+            */
+
+            if (PHP_VERSION_ID < 80100
+                && $tokenIsArray === true && $token[1] === '0'
+                && (isset($tokens[($stackPtr + 1)]) === true
+                && is_array($tokens[($stackPtr + 1)]) === true
+                && $tokens[($stackPtr + 1)][0] === T_STRING
+                && strtolower($tokens[($stackPtr + 1)][1][0]) === 'o')
+            ) {
+                $finalTokens[$newStackPtr] = [
+                    'code'    => T_LNUMBER,
+                    'type'    => 'T_LNUMBER',
+                    'content' => $token[1] .= $tokens[($stackPtr + 1)][1],
+                ];
+                $stackPtr++;
+                $newStackPtr++;
+                continue;
+            }
+
             /*
                 PHP 8.1 introduced two dedicated tokens for the & character.
                 Retokenizing both of these to T_BITWISE_AND, which is the