Merge remote-tracking branch 'origin/1.3.x' into 1.4.x

Author: ondrejmirtes

extension.neon

@@ -40,7 +40,9 @@ parameters:
 		- stubs/ORM/Id/AbstractIdGenerator.stub
 		- stubs/ORM/Mapping/ClassMetadata.stub
 		- stubs/ORM/Mapping/ClassMetadataInfo.stub
+		- stubs/ORM/NonUniqueResultException.stub
 		- stubs/ORM/ORMException.stub
+		- stubs/ORM/UnexpectedResultException.stub
 		- stubs/ORM/Query/Expr.stub
 		- stubs/ORM/Query.stub
 		- stubs/ORM/Query/Expr/Comparison.stub

stubs/ORM/AbstractQuery.stub

@@ -3,6 +3,7 @@
 namespace Doctrine\ORM;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\NonUniqueResultException;
 
 /**
  * @template-covariant TKey The type of column used in indexBy
@@ -22,6 +23,8 @@ abstract class AbstractQuery
 
 	/**
 	* @return bool|float|int|string|null
+	*
+	* @throws NonUniqueResultException
 	*/
 	public function getSingleScalarResult();
 

stubs/ORM/NonUniqueResultException.stub

@@ -0,0 +1,7 @@
+<?php
+
+namespace Doctrine\ORM;
+
+class NonUniqueResultException extends UnexpectedResultException
+{
+}

stubs/ORM/UnexpectedResultException.stub

@@ -0,0 +1,9 @@
+<?php
+
+namespace Doctrine\ORM;
+
+use Doctrine\ORM\Exception\ORMException;
+
+class UnexpectedResultException extends ORMException
+{
+}