From b8ef3af982a5a92cdf34e48f5b9c97de712523aa Mon Sep 17 00:00:00 2001 From: flack Date: Mon, 28 Apr 2014 11:20:43 +0200 Subject: [PATCH 1/2] 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)); } From 0ade3aa62a8f86f23fad9260abcb00ea2c2fcf40 Mon Sep 17 00:00:00 2001 From: Andreas Flack Date: Mon, 28 Apr 2014 14:50:48 +0200 Subject: [PATCH 2/2] Improve phrasing on exception message instead of trying to fix callers --- lib/Doctrine/ORM/ORMInvalidArgumentException.php | 4 ++-- lib/Doctrine/ORM/UnitOfWork.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/ORM/ORMInvalidArgumentException.php b/lib/Doctrine/ORM/ORMInvalidArgumentException.php index cb5037679..adb0cd529 100644 --- a/lib/Doctrine/ORM/ORMInvalidArgumentException.php +++ b/lib/Doctrine/ORM/ORMInvalidArgumentException.php @@ -65,7 +65,7 @@ class ORMInvalidArgumentException extends \InvalidArgumentException static public function entityWithoutIdentity($className, $entity) { return new self( - "The given entity of type '" . $className . "' (".self::objToStr($entity).") has no identity/no " . + "The given entity of type '" . $className . "' (".self::objToStr($entity).") has no identity/no " . "id values set. It cannot be added to the identity map." ); } @@ -154,7 +154,7 @@ class ORMInvalidArgumentException extends \InvalidArgumentException */ static public function detachedEntityCannot($entity, $operation) { - return new self("A detached entity was found during " . $operation . " " . self::objToStr($entity)); + return new self("Detached entity " . self::objToStr($entity) . " cannot be " . $operation); } /** diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 49180eb50..61a3c7ecc 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, "persist"); + throw ORMInvalidArgumentException::detachedEntityCannot($entity, "persisted"); 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, "remove"); + throw ORMInvalidArgumentException::detachedEntityCannot($entity, "removed"); default: throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity)); }