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.

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

Tokenize yield keyword as T_YIELD on PHP 5.4, and yield from as T_YIELD_FROM on PHP < 7.0 #1524

Merged
merged 2 commits into from
Jul 20, 2017

Conversation

michalbundyra
Copy link
Contributor

@michalbundyra michalbundyra commented Jun 21, 2017

Resolves #1513

With these changes PR #1492 is not gonna fail.

@michalbundyra
Copy link
Contributor Author

@ktomk I've updated my PR to tokenize correctly T_YIELD_FROM on PHP < 7.0.

@michalbundyra michalbundyra changed the title Tokenize yield keyword as T_YIELD on PHP 5.4 Tokenize yield keyword as T_YIELD on PHP 5.4, and yield from as T_YIELD_FROM on PHP < 7.0 Jul 15, 2017
@gsherwood gsherwood added this to the 3.1.0 milestone Jul 16, 2017
@gsherwood gsherwood merged commit 784c564 into squizlabs:master Jul 20, 2017
gsherwood added a commit that referenced this pull request Jul 20, 2017
@gsherwood
Copy link
Member

Thanks a lot for doing this. Looks like it is working well.

@michalbundyra michalbundyra deleted the feature/yield-php5.4 branch July 24, 2017 10:25
jrfnl added a commit to PHPCSStandards/PHPCSUtils that referenced this pull request May 17, 2024
…h PHPCS < 3.1.0

Prior to PHPCS 3.1.0, the `yield` keyword tokenization was not backfilled for PHP 5.4 and the `yield from` tokenization was not backfilled for PHP < 7.0.

This commit adds a work-around to the utility method to handle this situation correctly.

Includes unit tests covering the issue.

Refs:
* squizlabs/PHP_CodeSniffer#1513
* squizlabs/PHP_CodeSniffer#1524
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants