[5.x] Improve error handling in entries fieldtype (#11754)

duncanmcclean · web-flow · commit 05156f224dda · 2025-04-30T09:16:41.000-04:00
diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
@@ -179,7 +179,11 @@ protected function getFirstCollectionFromRequest($request)
             $collections = $this->getConfiguredCollections();
         }
 
-        return Collection::findByHandle(Arr::first($collections));
+        $collection = Collection::findByHandle($collectionHandle = Arr::first($collections));
+
+        throw_if(! $collection, new CollectionNotFoundException($collectionHandle));
+
+        return $collection;
     }
 
     public function getSortColumn($request)

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,11 @@ protected function getFirstCollectionFromRequest($request)`
`179`	`179`	`$collections = $this->getConfiguredCollections();`
`180`	`180`	`}`
`181`	`181`
`182`		`- return Collection::findByHandle(Arr::first($collections));`
	`182`	`+ $collection = Collection::findByHandle($collectionHandle = Arr::first($collections));`
	`183`	`+`
	`184`	`+ throw_if(! $collection, new CollectionNotFoundException($collectionHandle));`
	`185`	`+`
	`186`	`+ return $collection;`
`183`	`187`	`}`
`184`	`188`
`185`	`189`	`public function getSortColumn($request)`