From b8ef3af982a5a92cdf34e48f5b9c97de712523aa Mon Sep 17 00:00:00 2001 From: flack Date: Mon, 28 Apr 2014 11:20:43 +0200 Subject: [PATCH] Small grammar fix The exception was reading ``` A detached entity was found during {removed|persisted} [entityName] ``` I changed the verbs to infinitive now. Alternatively, the text in ``ORMInvalidArgumentException::detachedEntityCannot`` could also be changed to read ``` Detached entity [entityName] cannot be {removed|persisted} ``` --- lib/Doctrine/ORM/UnitOfWork.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 61a3c7ecc..49180eb50 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -1655,7 +1655,7 @@ class UnitOfWork implements PropertyChangedListener case self::STATE_DETACHED: // Can actually not happen right now since we assume STATE_NEW. - throw ORMInvalidArgumentException::detachedEntityCannot($entity, "persisted"); + throw ORMInvalidArgumentException::detachedEntityCannot($entity, "persist"); default: throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity)); @@ -1726,7 +1726,7 @@ class UnitOfWork implements PropertyChangedListener break; case self::STATE_DETACHED: - throw ORMInvalidArgumentException::detachedEntityCannot($entity, "removed"); + throw ORMInvalidArgumentException::detachedEntityCannot($entity, "remove"); default: throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity)); }