Skip to content
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

Jump to bottom

Collections/UtilityMethodTestCase: sync with phpcs 3.x/PHP 8.0 identifier name tokens change #217

Merged
merged 2 commits into from
Sep 21, 2020
Merged

Collections/UtilityMethodTestCase: sync with phpcs 3.x/PHP 8.0 identifier name tokens change #217

merged 2 commits into from
Sep 21, 2020

Commits on Sep 21, 2020

  1. Collections/various methods: sync with PHPCS 

    Upstream PR 3063 which was merged in PHPCS 3.5.7 effectively "undoes" the PHP 8.0 tokenization for identifier names for PHPCS 3.x, while it also includes backfilling the PHP 8.0 token constants.

In PHPCS 4.x the PHP 8.0 tokenization will be backfilled instead, but that PR has not yet been pulled.

This commit annotates the current change in the `Collections::nameTokens()` method and updates the unit tests for various token collections to handle this correctly as well.

Refs:
* squizlabs/PHP_CodeSniffer#3041
* squizlabs/PHP_CodeSniffer#3063
    @jrfnl
    jrfnl committed Sep 21, 2020
    Configuration menu
    Copy the full SHA
    a5a6ba6 View commit details
    Browse the repository at this point in the history

  2. UtilityMethodTestCase::usesPhp8NameTokens(): account for PHPCS 3.x "u… 

    …ndoing" the PHP 8.0 identifier name tokenization

Upstream PR 3063 which was merged in PHPCS 3.5.7 effectively "undoes" the PHP 8.0 tokenization for identifier names for PHPCS 3.x.

This updates the `UtilityMethodTestCase::usesPhp8NameTokens()` method to take this upstream change into account.
    @jrfnl
    jrfnl committed Sep 21, 2020
    Configuration menu
    Copy the full SHA
    91f2250 View commit details
    Browse the repository at this point in the history