BackfillExplicitOctalNotationTest: refactor and improve the test

As the tokenizer may now split a `T_STRING` token which follows a `T_LNUMBER` into two tokens, it is important to also test that the next token is set correctly.

To that end, I've refactored the test to include this test.

Includes:
* Simplifying the data provider by getting rid of the unnecessary nested array.
* Removing the assertions checking for `code` and `type` of the found token as those would always pass as the `getTargetToken()` method would otherwise fail the test already.
* Adding assertions testing the token code + content for the next token.
* Adding `$message` parameters to the assertions to be able to distinguish which one failed (if one fails).

Author: jrfnl

tests/Core/Tokenizer/BackfillExplicitOctalNotationTest.php

@@ -18,22 +18,26 @@ class BackfillExplicitOctalNotationTest extends AbstractMethodUnitTest
     /**
      * Test that explicitly-defined octal values are tokenized as a single number and not as a number and a string.
      *
-     * @param array $testData The data required for the specific test case.
+     * @param string     $marker      The comment which prefaces the target token in the test file.
+     * @param string     $value       The expected content of the token
+     * @param int|string $nextToken   The expected next token.
+     * @param string     $nextContent The expected content of the next token.
      *
      * @dataProvider dataExplicitOctalNotation
      * @covers       PHP_CodeSniffer\Tokenizers\PHP::tokenize
      *
      * @return void
      */
-    public function testExplicitOctalNotation($testData)
+    public function testExplicitOctalNotation($marker, $value, $nextToken, $nextContent)
     {
         $tokens = self::$phpcsFile->getTokens();
 
-        $number = $this->getTargetToken($testData['marker'], [T_LNUMBER]);
+        $number = $this->getTargetToken($marker, [T_LNUMBER]);
 
-        $this->assertSame(constant($testData['type']), $tokens[$number]['code']);
-        $this->assertSame($testData['type'], $tokens[$number]['type']);
-        $this->assertSame($testData['value'], $tokens[$number]['content']);
+        $this->assertSame($value, $tokens[$number]['content'], 'Content of integer token does not match expectation');
+
+        $this->assertSame($nextToken, $tokens[($number + 1)]['code'], 'Next token is not the expected type, but '.$tokens[($number + 1)]['type']);
+        $this->assertSame($nextContent, $tokens[($number + 1)]['content'], 'Next token did not have the expected contents');
 
     }//end testExplicitOctalNotation()
 
@@ -49,67 +53,58 @@ public function dataExplicitOctalNotation()
     {
         return [
             [
-                [
-                    'marker' => '/* testExplicitOctal */',
-                    'type'   => 'T_LNUMBER',
-                    'value'  => '0o137041',
-                ],
+                'marker'      => '/* testExplicitOctal */',
+                'value'       => '0o137041',
+                'nextToken'   => T_SEMICOLON,
+                'nextContent' => ';',
             ],
             [
-                [
-                    'marker' => '/* testExplicitOctalCapitalised */',
-                    'type'   => 'T_LNUMBER',
-                    'value'  => '0O137041',
-                ],
+                'marker'      => '/* testExplicitOctalCapitalised */',
+                'value'       => '0O137041',
+                'nextToken'   => T_SEMICOLON,
+                'nextContent' => ';',
             ],
             [
-                [
-                    'marker' => '/* testExplicitOctalWithNumericSeparator */',
-                    'type'   => 'T_LNUMBER',
-                    'value'  => '0o137_041',
-                ],
+                'marker'      => '/* testExplicitOctalWithNumericSeparator */',
+                'value'       => '0o137_041',
+                'nextToken'   => T_SEMICOLON,
+                'nextContent' => ';',
             ],
             [
-                [
-                    'marker' => '/* testInvalid1 */',
-                    'type'   => 'T_LNUMBER',
-                    'value'  => '0',
-                ],
+                'marker'      => '/* testInvalid1 */',
+                'value'       => '0',
+                'nextToken'   => T_STRING,
+                'nextContent' => 'o_137',
             ],
             [
-                [
-                    'marker' => '/* testInvalid2 */',
-                    'type'   => 'T_LNUMBER',
-                    'value'  => '0',
-                ],
+                'marker'      => '/* testInvalid2 */',
+                'value'       => '0',
+                'nextToken'   => T_STRING,
+                'nextContent' => 'O_41',
             ],
             [
-                [
-                    'marker' => '/* testInvalid3 */',
-                    'type'   => 'T_LNUMBER',
-                    'value'  => '0',
-                ],
+                'marker'      => '/* testInvalid3 */',
+                'value'       => '0',
+                'nextToken'   => T_STRING,
+                'nextContent' => 'o91',
             ],
             [
-                [
-                    'marker' => '/* testInvalid4 */',
-                    'type'   => 'T_LNUMBER',
-                    'value'  => '0O2',
-                ],
+                'marker'      => '/* testInvalid4 */',
+                'value'       => '0O2',
+                'nextToken'   => T_LNUMBER,
+                'nextContent' => '82',
             ],
             [
-                [
-                    'marker' => '/* testInvalid5 */',
-                    'type'   => 'T_LNUMBER',
-                    'value'  => '0o2',
-                ],
+                'marker'      => '/* testInvalid5 */',
+                'value'       => '0o2',
+                'nextToken'   => T_LNUMBER,
+                'nextContent' => '8_2',
             ],
             [
-                [
-                    'marker' => '/* testInvalid6 */',
-                    'type'   => 'T_LNUMBER',
-                    'value'  => '0o2',
-                ],
+                'marker'      => '/* testInvalid6 */',
+                'value'       => '0o2',
+                'nextToken'   => T_STRING,
+                'nextContent' => '_82',
             ],
         ];