-
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/php-8-nullsafe-operator' of https://github.com/…
- Loading branch information
Showing
8 changed files
with
230 additions
and
19 deletions.
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
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,29 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * Null safe operator. | ||
| */ | ||
|
|
||
| /* testObjectOperator */ | ||
| echo $obj->foo; | ||
|
|
||
| /* testNullsafeObjectOperator */ | ||
| echo $obj?->foo; | ||
|
|
||
| /* testNullsafeObjectOperatorWriteContext */ | ||
| // Intentional parse error, but not the concern of the tokenizer. | ||
| $foo?->bar->baz = 'baz'; | ||
|
|
||
| /* testTernaryThen */ | ||
| echo $obj ? $obj->prop : $other->prop; | ||
|
|
||
| /* testParseErrorWhitespaceNotAllowed */ | ||
| echo $obj ? | ||
| -> foo; | ||
|
|
||
| /* testParseErrorCommentNotAllowed */ | ||
| echo $obj ?/*comment*/-> foo; | ||
|
|
||
| /* testLiveCoding */ | ||
| // Intentional parse error. This has to be the last test in the file. | ||
| echo $obj? |
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,140 @@ | ||
| <?php | ||
| /** | ||
| * Tests the backfill for the PHP >= 8.0 nullsafe object operator. | ||
| * | ||
| * @author Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl> | ||
| * @copyright 2020 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; | ||
| use PHP_CodeSniffer\Util\Tokens; | ||
|
|
||
| class NullsafeObjectOperatorTest extends AbstractMethodUnitTest | ||
| { | ||
|
|
||
| /** | ||
| * Tokens to search for. | ||
| * | ||
| * @var array | ||
| */ | ||
| protected $find = [ | ||
| T_NULLSAFE_OBJECT_OPERATOR, | ||
| T_OBJECT_OPERATOR, | ||
| T_INLINE_THEN, | ||
| ]; | ||
|
|
||
|
|
||
| /** | ||
| * Test that a normal object operator is still tokenized as such. | ||
| * | ||
| * @covers PHP_CodeSniffer\Tokenizers\PHP::tokenize | ||
| * | ||
| * @return void | ||
| */ | ||
| public function testObjectOperator() | ||
| { | ||
| $tokens = self::$phpcsFile->getTokens(); | ||
|
|
||
| $operator = $this->getTargetToken('/* testObjectOperator */', $this->find); | ||
| $this->assertSame(T_OBJECT_OPERATOR, $tokens[$operator]['code'], 'Failed asserting code is object operator'); | ||
| $this->assertSame('T_OBJECT_OPERATOR', $tokens[$operator]['type'], 'Failed asserting type is object operator'); | ||
|
|
||
| }//end testObjectOperator() | ||
|
|
||
|
|
||
| /** | ||
| * Test that a nullsafe object operator is tokenized as such. | ||
| * | ||
| * @param string $testMarker The comment which prefaces the target token in the test file. | ||
| * | ||
| * @dataProvider dataNullsafeObjectOperator | ||
| * @covers PHP_CodeSniffer\Tokenizers\PHP::tokenize | ||
| * | ||
| * @return void | ||
| */ | ||
| public function testNullsafeObjectOperator($testMarker) | ||
| { | ||
| $tokens = self::$phpcsFile->getTokens(); | ||
|
|
||
| $operator = $this->getTargetToken($testMarker, $this->find); | ||
| $this->assertSame(T_NULLSAFE_OBJECT_OPERATOR, $tokens[$operator]['code'], 'Failed asserting code is nullsafe object operator'); | ||
| $this->assertSame('T_NULLSAFE_OBJECT_OPERATOR', $tokens[$operator]['type'], 'Failed asserting type is nullsafe object operator'); | ||
|
|
||
| }//end testNullsafeObjectOperator() | ||
|
|
||
|
|
||
| /** | ||
| * Data provider. | ||
| * | ||
| * @see testNullsafeObjectOperator() | ||
| * | ||
| * @return array | ||
| */ | ||
| public function dataNullsafeObjectOperator() | ||
| { | ||
| return [ | ||
| ['/* testNullsafeObjectOperator */'], | ||
| ['/* testNullsafeObjectOperatorWriteContext */'], | ||
| ]; | ||
|
|
||
| }//end dataNullsafeObjectOperator() | ||
|
|
||
|
|
||
| /** | ||
| * Test that a question mark not followed by an object operator is tokenized as T_TERNARY_THEN. | ||
| * | ||
| * @param string $testMarker The comment which prefaces the target token in the test file. | ||
| * @param bool $testObjectOperator Whether to test for the next non-empty token being tokenized | ||
| * as an object operator. | ||
| * | ||
| * @dataProvider dataTernaryThen | ||
| * @covers PHP_CodeSniffer\Tokenizers\PHP::tokenize | ||
| * | ||
| * @return void | ||
| */ | ||
| public function testTernaryThen($testMarker, $testObjectOperator=false) | ||
| { | ||
| $tokens = self::$phpcsFile->getTokens(); | ||
|
|
||
| $operator = $this->getTargetToken($testMarker, $this->find); | ||
| $this->assertSame(T_INLINE_THEN, $tokens[$operator]['code'], 'Failed asserting code is inline then'); | ||
| $this->assertSame('T_INLINE_THEN', $tokens[$operator]['type'], 'Failed asserting type is inline then'); | ||
|
|
||
| if ($testObjectOperator === true) { | ||
| $next = self::$phpcsFile->findNext(Tokens::$emptyTokens, ($operator + 1), null, true); | ||
| $this->assertSame(T_OBJECT_OPERATOR, $tokens[$next]['code'], 'Failed asserting code is object operator'); | ||
| $this->assertSame('T_OBJECT_OPERATOR', $tokens[$next]['type'], 'Failed asserting type is object operator'); | ||
| } | ||
|
|
||
| }//end testTernaryThen() | ||
|
|
||
|
|
||
| /** | ||
| * Data provider. | ||
| * | ||
| * @see testTernaryThen() | ||
| * | ||
| * @return array | ||
| */ | ||
| public function dataTernaryThen() | ||
| { | ||
| return [ | ||
| ['/* testTernaryThen */'], | ||
| [ | ||
| '/* testParseErrorWhitespaceNotAllowed */', | ||
| true, | ||
| ], | ||
| [ | ||
| '/* testParseErrorCommentNotAllowed */', | ||
| true, | ||
| ], | ||
| ['/* testLiveCoding */'], | ||
| ]; | ||
|
|
||
| }//end dataTernaryThen() | ||
|
|
||
|
|
||
| }//end class |
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