From 8952176c73c74500a90cce7400bec60869c8913f Mon Sep 17 00:00:00 2001
From: Alfredo Costa <alfredocosta@live.com>
Date: Tue, 1 Dec 2015 11:43:55 -0200
Subject: [PATCH 1/2] Add message to NonUniqueResultException

---
 lib/Doctrine/ORM/NonUniqueResultException.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/Doctrine/ORM/NonUniqueResultException.php b/lib/Doctrine/ORM/NonUniqueResultException.php
index 55b713000..78a58dd49 100644
--- a/lib/Doctrine/ORM/NonUniqueResultException.php
+++ b/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);
+    }
 }

From c2167664fc782fcbb1a47c7f38ba01c5daba3afc Mon Sep 17 00:00:00 2001
From: Jean Carlo Machado <contato@jeancarlomachado.com.br>
Date: Sun, 21 Feb 2016 13:01:19 -0300
Subject: [PATCH 2/2] add test of NonUniqueResultException message presence

---
 .../ORM/Functional/Ticket/DDC4024Test.php     | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC4024Test.php

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC4024Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC4024Test.php
new file mode 100644
index 000000000..fa1208292
--- /dev/null
+++ b/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());
+    }
+}