Skip to content

Remove phpstan/phpdoc-parser conflict#18812

Merged
kingjia90 merged 1 commit intopimcore:12.xfrom
rvanlaak:patch-2
Dec 1, 2025
Merged

Remove phpstan/phpdoc-parser conflict#18812
kingjia90 merged 1 commit intopimcore:12.xfrom
rvanlaak:patch-2

Conversation

@rvanlaak
Copy link
Copy Markdown
Contributor

@rvanlaak rvanlaak commented Nov 7, 2025

Why was "phpstan/phpdoc-parser": ">=2.0", introduced as confict through this commit? Can that conflict be dropped? It was released November 2024 and blocks all applications from working with this repo https://github.com/phpstan/phpdoc-parser/releases/tag/2.0.0

Seems to relate to #17828 and specifically commit c3beefe

Changes in this pull request

Resolves #

Additional info

Why was `"phpstan/phpdoc-parser": ">=2.0",` introduced as confict through this commit? Can that conflict be dropped? It was released November 2024 and blocks all applications from working with this repo https://github.com/phpstan/phpdoc-parser/releases/tag/2.0.0
@github-actions
Copy link
Copy Markdown

github-actions bot commented Nov 7, 2025

Review Checklist

  • Target branch (11.5 for bug fixes, others 12.x)
  • Tests (if it's testable code, there should be a test for it - get help)
  • Docs (every functionality needs to be documented, see here)
  • Migration incl. install.sql (e.g. if the database schema changes, ...)
  • Upgrade notes (deprecations, important information, migration hints, ...)
  • Label
  • Milestone

@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Nov 7, 2025

@kingjia90 kingjia90 added this to the 12.3.0 milestone Dec 1, 2025
@kingjia90
Copy link
Copy Markdown
Contributor

kingjia90 commented Dec 1, 2025

LGTM
It can be safely dropped,by looking at the release note

phpstan/phpdoc-parser 2.0 will also be included in PHPStan 2.0 that's going to be released on Monday November 11th 2024.

and we don't have any issues since #18034

also the bundle (beside Pimcore ones) requiring it are already supporting the parser v2.
image

@kingjia90 kingjia90 merged commit 80c73ca into pimcore:12.x Dec 1, 2025
14 checks passed
@kingjia90 kingjia90 self-assigned this Dec 1, 2025
@github-actions github-actions bot locked and limited conversation to collaborators Dec 1, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants