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

[4.5] fix: merge mistake #8359

Merged
merged 2 commits into from
Dec 22, 2023
Merged

[4.5] fix: merge mistake #8359

merged 2 commits into from
Dec 22, 2023

Conversation

kenjis
Copy link
Member

@kenjis kenjis commented Dec 21, 2023 •
edited
Loading

Description
Follow-up: ed4fce1

  • fix merge mistake in FeatureTestTrait
  • docs: update @param in FileLocatorInterface

Checklist:

  • Securely signed commits
  • [] Component(s) with PHPDoc blocks, only if necessary or adds value
  • [] Unit testing, with >80% coverage
  • [] User guide updated
  • Conforms to style guide

@kenjis kenjis added the 4.5 label Dec 21, 2023
@kenjis
Copy link
Member Author

kenjis commented Dec 22, 2023

PHPStan cannot detect this simple bug, but Psalm detected.

Error: system/Test/FeatureTestTrait.php:373:55: UndefinedVariable: Cannot find referenced variable $method (see https://psalm.dev/024)
https://github.com/codeigniter4/CodeIgniter4/actions/runs/7293752587/job/19877405238?pr=8359

@kenjis kenjis changed the title [4.5] docs: update @param in FileLocatorInterface [4.5] fix: merge mistake Dec 22, 2023
@paulbalandan
Copy link
Member

Not sure what happened but phpstan detects the errors as usual: https://phpstan.org/r/72b876e6-46da-4451-91ad-d1dee59a6829

@kenjis
Copy link
Member Author

kenjis commented Dec 22, 2023

Indeed it does.
It may be a bug in PHPStan due to some other complex condition.

michalsn
michalsn approved these changes Dec 22, 2023
View reviewed changes
Copy link
Member

@michalsn michalsn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tests passed, so I will assume this is good and ready.

@kenjis kenjis merged commit 044f39e into codeigniter4:4.5 Dec 22, 2023
45 checks passed
@kenjis kenjis deleted the docs-FileLocatorInterface branch December 22, 2023 10:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michalsn michalsn michalsn approved these changes

Assignees
No one assigned
Labels
4.5
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@kenjis @paulbalandan @michalsn