Merge pull request #6606 from lcobucci/add-exception-msg

Add message to NonUniqueResultException

lib/Doctrine/ORM/NonUniqueResultException.php

@@ -27,4 +27,10 @@ namespace Doctrine\ORM;
  */
 class NonUniqueResultException extends UnexpectedResultException
 {
+    const DEFAULT_MESSAGE = 'More than one result was found for query although one row or none was expected.';
+
+    public function __construct(string $message = null)
+    {
+        parent::__construct($message ?? self::DEFAULT_MESSAGE);
+    }
 }

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC4024Test.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\ORM\NonUniqueResultException;
+
+/**
+ * @group DDC4024
+ */
+final class DDC4024Test extends \Doctrine\Tests\DoctrineTestCase
+{
+    public function testConstructorShouldUseProvidedMessage() : void
+    {
+        $exception = new NonUniqueResultException('Testing');
+
+        self::assertSame('Testing', $exception->getMessage());
+    }
+
+    public function testADefaultMessageShouldBeUsedWhenNothingWasProvided() : void
+    {
+        $exception = new NonUniqueResultException();
+
+        self::assertSame(NonUniqueResultException::DEFAULT_MESSAGE, $exception->getMessage());
+    }
+}