Skip to content

Tests/Tokenizer: improve switch keyword tests #812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 27, 2025
Merged

Tests/Tokenizer: improve switch keyword tests #812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7954ce3
Tests/Tokenizer: improve stability of the switch keyword tests
rodrigoprimo Feb 12, 2025
0244678
Tests/Tokenizer: add three more test cases to the switch keyword tests
rodrigoprimo Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,20 @@ switch ($value) {
default :
echo 'other';
break;
/* testSwitchNormalSyntaxScopeCloser */
}

// Test for https://github.com/squizlabs/PHP_CodeSniffer/issues/497
/* testSwitchAlternativeSyntax */
switch ($value):
switch ($value) :
/* testSwitchAlternativeSyntaxEnsureTestWillNotPickUpWrongColon */
case 1:
echo 'one';
break;
default:
echo 'other';
break;
/* testSwitchAlternativeSyntaxEnd */
/* testSwitchAlternativeSyntaxScopeCloser */
endswitch;

// Test for https://github.com/squizlabs/PHP_CodeSniffer/issues/543
Expand All @@ -30,4 +31,30 @@ switch((function () {
})()) /* testSwitchClosureWithinConditionScopeOpener */ {
case 1:
return 'test';
/* testSwitchClosureWithinConditionScopeCloser */
}

/* testSwitchClosureWithReturnTypeWithinCondition */
switch((function (): string {
return 'bar';
})()) /* testSwitchClosureWithReturnTypeWithinConditionScopeOpener */ :
/* testSwitchClosureWithReturnTypeWithinConditionEnsureTestWillNotPickUpWrongColon */
case 1:
return 'test';
/* testSwitchClosureWithReturnTypeWithinConditionScopeCloser */
endswitch;

/* testSwitchArrowFunctionWithinCondition */
switch((fn() => $obj->{$foo . $bar})()) /* testSwitchArrowFunctionWithinConditionScopeOpener */ {
case 1:
return 'test';
/* testSwitchArrowFunctionWithinConditionScopeCloser */
}

/* testSwitchArrowFunctionWithReturnTypeWithinCondition */
switch((fn(): string => $condition ? 'foo' : 'bar')()) /* testSwitchArrowFunctionWithReturnTypeWithinConditionScopeOpener */ :
/* testSwitchArrowFunctionWithReturnTypeWithinConditionEnsureTestWillNotPickUpWrongColon */
case 1:
return 'test';
/* testSwitchArrowFunctionWithReturnTypeWithinConditionScopeCloser */
endswitch;
44 changes: 37 additions & 7 deletions tests/Core/Tokenizers/Tokenizer/RecurseScopeMapSwitchTokenScopeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,31 +97,61 @@ public function testSwitchScope($testMarker, $expectedTokens, $testOpenerMarker=
public static function dataSwitchScope()
{
return [
'switch normal syntax' => [
'testMarker' => '/* testSwitchNormalSyntax */',
'expectedTokens' => [
'switch normal syntax' => [
'testMarker' => '/* testSwitchNormalSyntax */',
'expectedTokens' => [
'scope_opener' => T_OPEN_CURLY_BRACKET,
'scope_closer' => T_CLOSE_CURLY_BRACKET,
],
'testOpenerMarker' => null,
'testCloserMarker' => '/* testSwitchNormalSyntaxScopeCloser */',
],
'switch alternative syntax' => [
'switch alternative syntax' => [
'testMarker' => '/* testSwitchAlternativeSyntax */',
'expectedTokens' => [
'scope_opener' => T_COLON,
'scope_closer' => T_ENDSWITCH,
],
'testOpenerMarker' => null,
'testCloserMarker' => '/* testSwitchAlternativeSyntaxEnd */',
'testCloserMarker' => '/* testSwitchAlternativeSyntaxScopeCloser */',
],
'switch with closure in the condition' => [
'switch with closure in the condition' => [
'testMarker' => '/* testSwitchClosureWithinCondition */',
'expectedTokens' => [
'scope_opener' => T_OPEN_CURLY_BRACKET,
'scope_closer' => T_CLOSE_CURLY_BRACKET,
],
'testOpenerMarker' => '/* testSwitchClosureWithinConditionScopeOpener */',
'testCloserMarker' => '/* testSwitchClosureWithinConditionScopeOpener */',
'testCloserMarker' => '/* testSwitchClosureWithinConditionScopeCloser */',
],
'switch alternative syntax with closure containing return type in the condition' => [
'testMarker' => '/* testSwitchClosureWithReturnTypeWithinCondition */',
'expectedTokens' => [
'scope_opener' => T_COLON,
'scope_closer' => T_ENDSWITCH,
],
'testOpenerMarker' => '/* testSwitchClosureWithReturnTypeWithinConditionScopeOpener */',
'testCloserMarker' => '/* testSwitchClosureWithReturnTypeWithinConditionScopeCloser */',
],
'switch with arrow function in the condition' => [
'testMarker' => '/* testSwitchArrowFunctionWithinCondition */',
'expectedTokens' => [
'scope_opener' => T_OPEN_CURLY_BRACKET,
'scope_closer' => T_CLOSE_CURLY_BRACKET,
],
'testOpenerMarker' => '/* testSwitchArrowFunctionWithinConditionScopeOpener */',
'testCloserMarker' => '/* testSwitchArrowFunctionWithinConditionScopeCloser */',
],
'switch alternative syntax with arrow function containing return type in the condition' => [
'testMarker' => '/* testSwitchArrowFunctionWithReturnTypeWithinCondition */',
'expectedTokens' => [
'scope_opener' => T_COLON,
'scope_closer' => T_ENDSWITCH,
],
'testOpenerMarker' => '/* testSwitchArrowFunctionWithReturnTypeWithinConditionScopeOpener */',
'testCloserMarker' => '/* testSwitchArrowFunctionWithReturnTypeWithinConditionScopeCloser */',
],

];

}//end dataSwitchScope()
Expand Down