Don't singularize TO_MANY field's variable names if target entity name is plural

[chalasr]

According to this stackoverflow question, the Doctrine\ORM\Tools\EntityGenerator singularises the variables & methods names for add and remove setters and their parameters, for T0_MANY associations.

Example for a target entity called Dnis.

The expected result would be to have the getDnis(), addDnis(Dnis $dnis) and removeDnis(Dnis $dnis) methods generated.

But we would have getDnis(), addDni(Dnis $dni) and removeDni(Dnis $dni), that gives names that are not corresponding with the real target entity name.

I just added a small check that avoids calling Inflector::singularize($variableName|$methodName) for add+remove if the target entity name ends by s.
I also updated the test with the example I given.

I don't see any side effects for now, let me know if this breaks something, or if I can make improvements.
Thank's

[LuisMejiaF]

+1
Thanks for working on this @chalasr.

[tjaari]

👍 For fix this recurrent issue.

[Ex3v]

Bump, we need this!

[Ocramius]

This is adding exceptions to exceptions to exceptions, and also assuming that terminal s means plural.

Just customize the entity code as you want it after codegen.

Closing as won't fix.

[Ex3v]

@Ocramius and we get doubled getters and setters after running generate:entities again.
👍

[Ocramius]

@Ex3v why would you run generate:entities again? It's a one-time run tool.

[Ex3v]

@Ocramius if I add new fields to model's xml, I want my popo to be updated and in sync with it.

[Ocramius]

@Ex3v that's not how this tool's supposed use-case. Ref: symfony/symfony-docs#5070

[chalasr]

Opened this almost a year ago. Correcting generated code for such edge cases is not a big deal. Let's move forward.