BCFile::getDeclarationName(): sync with upstream #494
Merged
Conversation
This file contains hidden or 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
Follow up on 451 Upstream PR squizlabs/PHP_CodeSniffer 3797, which will be included in PHPCS 3.8.0, fixes a tokenizer issue which affected the `File::getDeclarationName()` and, by extension, the `BackCompat::getDeclarationName()` method. The function name for functions named `self`, `parent` or `static` and declared to return by reference, could previously not be retrieved. The PHPCSUtils native version of the method `ObjectDeclarations::getName()` already handled things correctly. This commit adds back the BC-layer for the `getDeclarationName()` method and polyfills the fix from PHPCS 3.8.0 to backport it for PHPCS < 3.8.0. As the methods will now handle these functions in the same way, this commit also moves the related tests from the `GetNameDiffTest` to the `GetDeclarationNameTest`.
jrfnl deleted the backcompat/bcfile-getdeclarationname-sync-with-upstream branch Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
Follow up on #451
Upstream PR squizlabs/PHP_CodeSniffer#3797, which will be included in PHPCS 3.8.0, fixes a tokenizer issue which affected the
File::getDeclarationName()and, by extension, theBackCompat::getDeclarationName()method.The function name for functions named
self,parentorstaticand declared to return by reference, could previously not be retrieved.The PHPCSUtils native version of the method
ObjectDeclarations::getName()already handled things correctly.This commit adds back the BC-layer for the
getDeclarationName()method and polyfills the fix from PHPCS 3.8.0 to backport it for PHPCS < 3.8.0.As the methods will now handle these functions in the same way, this commit also moves the related tests from the
GetNameDiffTestto theGetDeclarationNameTest.