wrap doctrine exceptions in EntitySpecificationRepositoryTrait

Author: peter-gribanov

src/Repository/EntitySpecificationRepositoryTrait.php

@@ -56,8 +56,8 @@ public function match($specification, ?ResultModifier $modifier = null)
      * @param Filter|QueryModifier $specification
      * @param ResultModifier|null  $modifier
      *
-     * @throw Exception\NonUniqueException  If more than one result is found
-     * @throw Exception\NoResultException   If no results found
+     * @throw Exception\NonUniqueException If more than one result is found
+     * @throw Exception\NoResultException  If no results found
      *
      * @return mixed
      */
@@ -80,7 +80,7 @@ public function matchSingleResult($specification, ?ResultModifier $modifier = nu
      * @param Filter|QueryModifier $specification
      * @param ResultModifier|null  $modifier
      *
-     * @throw Exception\NonUniqueException  If more than one result is found
+     * @throw Exception\NonUniqueException If more than one result is found
      *
      * @return mixed|null
      */
@@ -99,8 +99,8 @@ public function matchOneOrNullResult($specification, ?ResultModifier $modifier =
      * @param Filter|QueryModifier $specification
      * @param ResultModifier|null  $modifier
      *
-     * @throw Exception\NonUniqueException  If more than one result is found
-     * @throw Exception\NoResultException   If no results found
+     * @throw Exception\NonUniqueException If more than one result is found
+     * @throw Exception\NoResultException  If no results found
      *
      * @return mixed
      */
@@ -112,6 +112,8 @@ public function matchSingleScalarResult($specification, ?ResultModifier $modifie
             return $query->getSingleScalarResult();
         } catch (DoctrineNonUniqueResultException $e) {
             throw new NonUniqueResultException($e->getMessage(), $e->getCode(), $e);
+        } catch (DoctrineNoResultException $e) {
+            throw new NoResultException($e->getMessage(), $e->getCode(), $e);
         }
     }
 
@@ -121,16 +123,19 @@ public function matchSingleScalarResult($specification, ?ResultModifier $modifie
      * @param Filter|QueryModifier $specification
      * @param ResultModifier|null  $modifier
      *
-     * @throw Exception\NonUniqueException  If more than one result is found
-     * @throw Exception\NoResultException   If no results found
+     * @throw Exception\NoResultException If no results found
      *
      * @return mixed
      */
     public function matchScalarResult($specification, ?ResultModifier $modifier = null)
     {
         $query = $this->getQuery($specification, $modifier);
 
-        return $query->getScalarResult();
+        try {
+            return $query->getScalarResult();
+        } catch (DoctrineNoResultException $e) {
+            throw new NoResultException($e->getMessage(), $e->getCode(), $e);
+        }
     }
 
     /**