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 handling of multiple rulesets #162

Merged
merged 1 commit into from May 29, 2020

Conversation

alcaeus
Copy link
Member

@alcaeus alcaeus commented May 28, 2020

This fixes an issue where applying a custom inflection of a word that was on the "uninflected" list of another ruleset was not being applied. This allows people to override newly uninflected words such as "travel", "homework", "research", and potentially more.

@alcaeus alcaeus added the Bug label May 28, 2020
@alcaeus alcaeus added this to the 1.4.3 milestone May 28, 2020
@alcaeus alcaeus requested a review from greg0ire May 28, 2020 12:39
@alcaeus alcaeus self-assigned this May 28, 2020
@greg0ire
Copy link
Member

Are the Travis failures new?

@alcaeus
Copy link
Member Author

alcaeus commented May 28, 2020

Yeah, will work on them later today before finishing up. Should’ve tested everything locally 😅

@alcaeus alcaeus force-pushed the fix-multiple-rule-application branch from 11f132b to 26b4e12 Compare May 28, 2020 18:48
@alcaeus
Copy link
Member Author

alcaeus commented May 28, 2020

Fixed tests. The removed test is obsolete and is covered with the new test. The test I updated failed due to the mocks needing updating - turns out it's easier to not update them but use actual rules.

Copy link
Member

@SenseException SenseException left a comment

Choose a reason for hiding this comment

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

It's hard to tell if the change of behaviour in RulesetInflector::inflect() does also have some other impact than fixing the bug, but I didn't find a case where this can be a negative influence.

@greg0ire greg0ire merged commit 4650c8b into doctrine:1.4.x May 29, 2020
@greg0ire
Copy link
Member

Thanks @alcaeus !

@alcaeus alcaeus deleted the fix-multiple-rule-application branch May 29, 2020 15:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants