Merge pull request #236 from FabioBatSilva/DDC-1065

[DDC-1065] Error messages
doctrine · Dec 22, 2011 · ec58285 · ec58285
2 parents 06de4e6 + c2cee0d
commit ec58285
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/lib/Doctrine/ORM/EntityManager.php b/lib/Doctrine/ORM/EntityManager.php
@@ -488,7 +488,7 @@ public function close()
     public function persist($entity)
     {
         if ( ! is_object($entity)) {
-            throw new \InvalidArgumentException(gettype($entity));
+            throw ORMInvalidArgumentException::invalidObject('EntityManager#persist()' , $entity);
         }
 
         $this->errorIfClosed();
@@ -507,7 +507,7 @@ public function persist($entity)
     public function remove($entity)
     {
         if ( ! is_object($entity)) {
-            throw new \InvalidArgumentException(gettype($entity));
+            throw ORMInvalidArgumentException::invalidObject('EntityManager#remove()' , $entity);
         }
 
         $this->errorIfClosed();
@@ -524,7 +524,7 @@ public function remove($entity)
     public function refresh($entity)
     {
         if ( ! is_object($entity)) {
-            throw new \InvalidArgumentException(gettype($entity));
+            throw ORMInvalidArgumentException::invalidObject('EntityManager#refresh()' , $entity);
         }
 
         $this->errorIfClosed();
@@ -544,7 +544,7 @@ public function refresh($entity)
     public function detach($entity)
     {
         if ( ! is_object($entity)) {
-            throw new \InvalidArgumentException(gettype($entity));
+            throw ORMInvalidArgumentException::invalidObject('EntityManager#detach()' , $entity);
         }
 
         $this->unitOfWork->detach($entity);
@@ -561,7 +561,7 @@ public function detach($entity)
     public function merge($entity)
     {
         if ( ! is_object($entity)) {
-            throw new \InvalidArgumentException(gettype($entity));
+            throw ORMInvalidArgumentException::invalidObject('EntityManager#merge()' , $entity);
         }
 
         $this->errorIfClosed();

diff --git a/lib/Doctrine/ORM/ORMInvalidArgumentException.php b/lib/Doctrine/ORM/ORMInvalidArgumentException.php
@@ -94,6 +94,12 @@ static public function detachedEntityCannot($entity, $operation)
         throw new self("A detached entity was found during " . $operation . " " . self::objToStr($entity));
     }
 
+    public static function invalidObject($context, $given, $parameterIndex = 1)
+    {
+        return new self($context .' expects parameter ' . $parameterIndex . 
+                    ' to be an entity object, '. gettype($given) . ' given.');
+    }
+
     /**
      * Helper method to show an object as string.
      *

diff --git a/tests/Doctrine/Tests/ORM/EntityManagerTest.php b/tests/Doctrine/Tests/ORM/EntityManagerTest.php
@@ -114,10 +114,10 @@ static public function dataMethodsAffectedByNoObjectArguments()
 
     /**
      * @dataProvider dataMethodsAffectedByNoObjectArguments
-     * @expectedException \InvalidArgumentException
-     * @param string $methodName
      */
     public function testThrowsExceptionOnNonObjectValues($methodName) {
+        $this->setExpectedException('Doctrine\ORM\ORMInvalidArgumentException',
+            'EntityManager#'.$methodName.'() expects parameter 1 to be an entity object, NULL given.');
         $this->_em->$methodName(null);
     }