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

Update master from 5.x #10597

Merged
merged 15 commits into from
Jan 29, 2024
Merged

Update master from 5.x #10597

merged 15 commits into from
Jan 29, 2024

Conversation

weirdan
Copy link
Collaborator

@weirdan weirdan commented Jan 27, 2024

No description provided.

edsrzf and others added 15 commits January 19, 2024 16:59
Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](actions/cache@v3...v4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Unit test improvements for php-parser 5
This change is for forward-compatibility with nikic/php-parser 5.0,
where `InterpolatedStringPart` (née `EncapsedStringPart`) is no longer an expression.
Thus we can't pass it to `NodeTypeProvider::getType()` anymore. Since that call
returns `null` anyway, we can swap the condition order. Everything still
works and Psalm type-checking is happy.

This also might be a tiny performance improvement since it lets the
common, cheap instanceof check come before a method call, but I haven't actually
benchmarked it.
Filtering is not necessary. Clients using LSP should filter the results themselves.
That's what it says in the documentation.

This reverts commit d6faff2.
@weirdan weirdan added the release:internal The PR will be included in 'Internal changes' section of the release notes label Jan 27, 2024
@weirdan weirdan requested review from orklah and danog January 27, 2024 11:40
@danog
Copy link
Collaborator

danog commented Jan 27, 2024

Uhm, you sure you didn't make a mistake here with the destination branch?

@weirdan weirdan changed the base branch from 5.x to master January 27, 2024 14:32
@weirdan
Copy link
Collaborator Author

weirdan commented Jan 27, 2024

I most definitely did. Fixed.

@weirdan weirdan merged commit 9520223 into vimeo:master Jan 29, 2024
39 of 40 checks passed
@weirdan weirdan deleted the update-master branch January 29, 2024 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release:internal The PR will be included in 'Internal changes' section of the release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants