From 30fd22a2604249c0a8e6b20cb844fb49cea677cc Mon Sep 17 00:00:00 2001
From: Vladislav Veselinov <vladislav@v3labs.com>
Date: Thu, 28 Feb 2013 21:05:41 +0200
Subject: [PATCH] Use inflector for add/remove methods
---
lib/Doctrine/ORM/Tools/EntityGenerator.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php
index 2c6b8977f..082720bf7 100644
--- a/lib/Doctrine/ORM/Tools/EntityGenerator.php
+++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php
@@ -1092,8 +1092,8 @@ public function __construct()
protected function generateEntityStubMethod(ClassMetadataInfo $metadata, $type, $fieldName, $typeHint = null, $defaultValue = null)
{
$methodName = $type . Inflector::classify($fieldName);
- if (in_array($type, array("add", "remove")) && substr($methodName, -1) == "s") {
- $methodName = substr($methodName, 0, -1);
+ if (in_array($type, array("add", "remove"))) {
+ $methodName = Inflector::singularize($methodName);
}
if ($this->hasMethod($methodName, $metadata)) {