-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/tokenizer-php-bugfix-double-quoted-strings' of h…
- Loading branch information
Showing
4 changed files
with
196 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| <?php | ||
|
|
||
| // Test source: https://gist.github.com/iluuu1994/72e2154fc4150f2258316b0255b698f2#file-test-php | ||
|
|
||
| /* testSimple1 */ | ||
| "$foo"; | ||
| /* testSimple2 */ | ||
| "{$foo}"; | ||
| /* testSimple3 */ | ||
| "${foo}"; | ||
|
|
||
| /* testDIM1 */ | ||
| "$foo[bar]"; | ||
| /* testDIM2 */ | ||
| "{$foo['bar']}"; | ||
| /* testDIM3 */ | ||
| "${foo['bar']}"; | ||
|
|
||
| /* testProperty1 */ | ||
| "$foo->bar"; | ||
| /* testProperty2 */ | ||
| "{$foo->bar}"; | ||
|
|
||
| /* testMethod1 */ | ||
| "{$foo->bar()}"; | ||
|
|
||
| /* testClosure1 */ | ||
| "{$foo()}"; | ||
|
|
||
| /* testChain1 */ | ||
| "{$foo['bar']->baz()()}"; | ||
|
|
||
| /* testVariableVar1 */ | ||
| "${$bar}"; | ||
| /* testVariableVar2 */ | ||
| "${(foo)}"; | ||
| /* testVariableVar3 */ | ||
| "${foo->bar}"; | ||
|
|
||
| /* testNested1 */ | ||
| "${foo["${bar}"]}"; | ||
| /* testNested2 */ | ||
| "${foo["${bar['baz']}"]}"; | ||
| /* testNested3 */ | ||
| "${foo->{$baz}}"; | ||
| /* testNested4 */ | ||
| "${foo->{${'a'}}}"; | ||
| /* testNested5 */ | ||
| "${foo->{"${'a'}"}}"; | ||
|
|
||
| /* testParseError */ | ||
| "${foo["${bar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| <?php | ||
| /** | ||
| * Tests that embedded variables and expressions in double quoted strings are tokenized | ||
| * as one double quoted string token. | ||
| * | ||
| * @author Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl> | ||
| * @copyright 2022 Squiz Pty Ltd (ABN 77 084 670 600) | ||
| * @license https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence | ||
| */ | ||
|
|
||
| namespace PHP_CodeSniffer\Tests\Core\Tokenizer; | ||
|
|
||
| use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest; | ||
|
|
||
| class DoubleQuotedStringTest extends AbstractMethodUnitTest | ||
| { | ||
|
|
||
|
|
||
| /** | ||
| * Test that double quoted strings contain the complete string. | ||
| * | ||
| * @param string $testMarker The comment which prefaces the target token in the test file. | ||
| * @param string $expectedContent The expected content of the double quoted string. | ||
| * | ||
| * @dataProvider dataDoubleQuotedString | ||
| * @covers PHP_CodeSniffer\Tokenizers\PHP::tokenize | ||
| * | ||
| * @return void | ||
| */ | ||
| public function testDoubleQuotedString($testMarker, $expectedContent) | ||
| { | ||
| $tokens = self::$phpcsFile->getTokens(); | ||
|
|
||
| $target = $this->getTargetToken($testMarker, T_DOUBLE_QUOTED_STRING); | ||
| $this->assertSame($expectedContent, $tokens[$target]['content']); | ||
|
|
||
| }//end testDoubleQuotedString() | ||
|
|
||
|
|
||
| /** | ||
| * Data provider. | ||
| * | ||
| * @see testDoubleQuotedString() | ||
| * | ||
| * @return array | ||
| */ | ||
| public function dataDoubleQuotedString() | ||
| { | ||
| return [ | ||
| [ | ||
| 'testMarker' => '/* testSimple1 */', | ||
| 'expectedContent' => '"$foo"', | ||
| ], | ||
| [ | ||
| 'testMarker' => '/* testSimple2 */', | ||
| 'expectedContent' => '"{$foo}"', | ||
| ], | ||
| [ | ||
| 'testMarker' => '/* testSimple3 */', | ||
| 'expectedContent' => '"${foo}"', | ||
| ], | ||
| [ | ||
| 'testMarker' => '/* testDIM1 */', | ||
| 'expectedContent' => '"$foo[bar]"', | ||
| ], | ||
| [ | ||
| 'testMarker' => '/* testDIM2 */', | ||
| 'expectedContent' => '"{$foo[\'bar\']}"', | ||
| ], | ||
| [ | ||
| 'testMarker' => '/* testDIM3 */', | ||
| 'expectedContent' => '"${foo[\'bar\']}"', | ||
| ], | ||
| [ | ||
| 'testMarker' => '/* testProperty1 */', | ||
| 'expectedContent' => '"$foo->bar"', | ||
| ], | ||
| [ | ||
| 'testMarker' => '/* testProperty2 */', | ||
| 'expectedContent' => '"{$foo->bar}"', | ||
| ], | ||
| [ | ||
| 'testMarker' => '/* testMethod1 */', | ||
| 'expectedContent' => '"{$foo->bar()}"', | ||
| ], | ||
| [ | ||
| 'testMarker' => '/* testClosure1 */', | ||
| 'expectedContent' => '"{$foo()}"', | ||
| ], | ||
| [ | ||
| 'testMarker' => '/* testChain1 */', | ||
| 'expectedContent' => '"{$foo[\'bar\']->baz()()}"', | ||
| ], | ||
| [ | ||
| 'testMarker' => '/* testVariableVar1 */', | ||
| 'expectedContent' => '"${$bar}"', | ||
| ], | ||
| [ | ||
| 'testMarker' => '/* testVariableVar2 */', | ||
| 'expectedContent' => '"${(foo)}"', | ||
| ], | ||
| [ | ||
| 'testMarker' => '/* testVariableVar3 */', | ||
| 'expectedContent' => '"${foo->bar}"', | ||
| ], | ||
| [ | ||
| 'testMarker' => '/* testNested1 */', | ||
| 'expectedContent' => '"${foo["${bar}"]}"', | ||
| ], | ||
| [ | ||
| 'testMarker' => '/* testNested2 */', | ||
| 'expectedContent' => '"${foo["${bar[\'baz\']}"]}"', | ||
| ], | ||
| [ | ||
| 'testMarker' => '/* testNested3 */', | ||
| 'expectedContent' => '"${foo->{$baz}}"', | ||
| ], | ||
| [ | ||
| 'testMarker' => '/* testNested4 */', | ||
| 'expectedContent' => '"${foo->{${\'a\'}}}"', | ||
| ], | ||
| [ | ||
| 'testMarker' => '/* testNested5 */', | ||
| 'expectedContent' => '"${foo->{"${\'a\'}"}}"', | ||
| ], | ||
| [ | ||
| 'testMarker' => '/* testParseError */', | ||
| 'expectedContent' => '"${foo["${bar | ||
| ', | ||
| ], | ||
| ]; | ||
|
|
||
| }//end dataDoubleQuotedString() | ||
|
|
||
|
|
||
| }//end class |