Skip to content

Allow PHPUnit 12 #364

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

Merged
merged 2 commits into from
May 20, 2025
Merged

Conversation

Jean85
Copy link
Contributor

@Jean85 Jean85 commented Feb 7, 2025

This pull request

  • Allow this package to work with PHPUnit 12

This is a tentative PR to see if we can just widen the constraint, or if we need to do more work.

@Jean85 Jean85 requested a review from Jan0707 as a code owner February 7, 2025 09:14
@Jean85 Jean85 force-pushed the phpunit-12-support branch from dc413f5 to 0a6b630 Compare February 7, 2025 09:16
@@ -16,7 +16,7 @@
"conflict": {
"phpspec/prophecy": "<1.17.0 || >=2.0.0",
"phpspec/prophecy-phpunit": "<2.3.0 || >=3.0.0",
"phpunit/phpunit": "<9.1.0 || >=12.0.0"
"phpunit/phpunit": "<9.1.0 || >=13.0.0"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Jean85 added a commit to facile-it/paraunit that referenced this pull request Feb 7, 2025
@Jean85
Copy link
Contributor Author

Jean85 commented Feb 7, 2025

Static analysis is failing due to prophecy-phpunit not being ready yet, so I also opened phpspec/prophecy-phpunit#67

Tests are running only on PHPUnit 9 though :( we should change that

@Jean85 Jean85 force-pushed the phpunit-12-support branch from 0a6b630 to eaf5cf4 Compare May 14, 2025 10:36
@alexander-schranz
Copy link
Collaborator

looks like we need to wait for the phpspec/prophecy-phpunit release tag. /cc @stof anything planned?

@Jean85
Copy link
Contributor Author

Jean85 commented May 19, 2025

@alexander-schranz since it's a require-dev, I took the liberty of adding a workaround for this. Are you ok with merging it in this way?

@Jean85 Jean85 force-pushed the phpunit-12-support branch from 959ec39 to 6b8dd07 Compare May 19, 2025 11:44
@Jean85 Jean85 requested a review from alexander-schranz May 19, 2025 11:44
@Jean85 Jean85 force-pushed the phpunit-12-support branch from 6b8dd07 to 5f940fa Compare May 19, 2025 12:33
@alexander-schranz
Copy link
Collaborator

alexander-schranz commented May 20, 2025

@Jean85 I'm fine to merge it but not tag it would before tagging revert the master and specially reactivate composer strict linting, when phpunity-prophecy is tagged. Can you open a PR with reverting that parts?

@alexander-schranz alexander-schranz merged commit d37c233 into Jan0707:master May 20, 2025
13 checks passed
@Jean85 Jean85 deleted the phpunit-12-support branch May 20, 2025 06:36
@Jean85 Jean85 restored the phpunit-12-support branch May 20, 2025 06:36
@Jean85
Copy link
Contributor Author

Jean85 commented May 20, 2025

@alexander-schranz done in #386

@alexander-schranz
Copy link
Collaborator

alexander-schranz commented May 20, 2025

@Jean85 thank you! @stof feel free to ping me when prophecy-phpunit is released.

@@ -18,13 +18,13 @@
"ergebnis/license": "^2.6.0",
"ergebnis/php-cs-fixer-config": "^6.46.0",
"phpspec/prophecy": "^1.7.0",
"phpspec/prophecy-phpunit": "^2.3",
"phpspec/prophecy-phpunit": "^2.3 || dev-master#d3c2804 as 2.4.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

A simpler workaround would have been ^2.3@dev, as phpstan-prophecy has the proper branch alias for its master branch (and the commit hash lock is a very bad idea due to how this actually works in composer)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants