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

Fix sqlWalker::walkSimpleArithmeticExpression phpdoc #11298

Merged
merged 1 commit into from Feb 26, 2024

Conversation

VincentLanglet
Copy link
Contributor

@VincentLanglet VincentLanglet commented Feb 23, 2024

Compatibility with ORM 2 & 3 is not always easy with the different phpdoc/typehint on SQLWalker (and static analysis).

walkSimpleArithmeticExpression phpdoc only accepts SimpleArithmeticExpression on 2.x but in fact support a wilder type Node|string ; and the type was updated on 3.x branch.

I took the typehint from the 3.x branch

public function walkSimpleArithmeticExpression(AST\Node|string $simpleArithmeticExpr): string
to update the phpdoc on 2.x branch.

This also fixes 7 baselines entries

@VincentLanglet VincentLanglet changed the title Fix sql walker phpdoc Fix sqlWalker::walkSimpleArithmeticExpression phpdoc Feb 23, 2024
Copy link
Member

@greg0ire greg0ire left a comment

Choose a reason for hiding this comment

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

Thanks for backporting this 👍

@greg0ire greg0ire added this to the 2.18.2 milestone Feb 26, 2024
@greg0ire greg0ire merged commit 719d007 into doctrine:2.18.x Feb 26, 2024
58 checks passed
@greg0ire
Copy link
Member

Thanks @VincentLanglet !

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.

None yet

3 participants