[GH-530] Singular form of generated methods should end with 'y' when property ends with 'ies'

Details

Type: Improvement
Status: In Progress
Priority: Major
Resolution: Unresolved
Affects Version/s: 2.3
Fix Version/s: None
Component/s: Tools
Security Level: All
Labels:
None

Description

Archive:
  type: entity
  fields:
    id:
      id: true
      type: integer
      unsigned: false
      nullable: false
      generator:
        strategy: IDENTITY
  oneToMany:
    entries:
      targetEntity: Entry
      mappedBy: archive

This generates these methods:

public function addEntrie(\Entry $entries) { ... }
public function removeEntrie(\Entry $entries) { ... }

Because in the EntityGenerator only the plural 's' is removed. It would be nice if an ending of 'ies' could be replaced by 'y'. So that we get these methods

public function addEntry(\Entry $entries) { ... }
public function removeEntry(\Entry $entries) { ... }

My fork already has the changes https://github.com/naitsirch/doctrine-orm2/commit/a3adfccb4927d61da7debae46ed0fff61e4212f8
I have opened a pull request here https://github.com/doctrine/doctrine2/pull/530

Issue Links

duplicates

DDC-2150 EntityGenerator.php - Guessing singular too simple generateEntityStubMethod()

DDC-2160 [GH-520] Fix for Doctrine\ORM\Tools\EntityGenerator not picking the correct singular of some plurals

Activity

Ascending order - Click to sort in descending order

Christian Stoller made changes - 04/Dec/12 9:20 AM

Field	Original Value	New Value
Affects Version/s		2.3 [ 10185 ]
Component/s		Tools [ 10015 ]

Christian Stoller made changes - 04/Dec/12 9:21 AM

Description

This issue is created automatically through a Github pull request on behalf of naitsirch:

Url: https://github.com/doctrine/doctrine2/pull/530

Message:

The singular form is not correctly detected if the property ends with 'ies' like 'entries' which should be transformed to 'entry'.
This change is related to http://www.doctrine-project.org/jira/browse/DDC-1268

In Doctrine 2.3 the 'add' and 'remove' methods in oneToMany associations have another problem (in earlier versions like 2.2 this worked correct). The singular form is not correctly detected if the property ends with 'ies' like 'entries' which should be transformed to 'entry'.
I have this YAML definition:

{code}
Archive:
  type: entity
  fields:
    id:
      id: true
      type: integer
      unsigned: false
      nullable: false
      generator:
        strategy: IDENTITY
  oneToMany:
    entries:
      targetEntity: Entry
      mappedBy: archive
{code}

This generates these methods:

{code}
public function addEntrie(\Entry $entries) { ... }
public function removeEntrie(\Entry $entries) { ... }
{code}

Because in the EntityGenerator only the plural 's' is removed. It would be nice if an ending of 'ies' could be replaced by 'y'. So that we get these methods

{code}
public function addEntry(\Entry $entries) { ... }
public function removeEntry(\Entry $entries) { ... }
{code}

My fork already has the changes https://github.com/naitsirch/doctrine-orm2/commit/a3adfccb4927d61da7debae46ed0fff61e4212f8
I have opened a pull request here https://github.com/doctrine/doctrine2/pull/530

Christian Stoller made changes - 04/Dec/12 9:22 AM

Status

Open [ 1 ]

Awaiting Feedback [ 10000 ]

Marco Pivetta made changes - 04/Dec/12 9:35 AM

Status

Awaiting Feedback [ 10000 ]

In Progress [ 3 ]

Benjamin Eberlei made changes - 06/Jan/13 9:45 AM

Issue Type

Bug [ 1 ]

Improvement [ 4 ]