[4.x] Implement find or fail on EntryRepository

src/Contracts/Entries/EntryRepository.php

@@ -12,6 +12,8 @@ public function whereInCollection(array $handles);
 
     public function find($id);
 
+    public function findOrFail(string|int $id);
+
     public function findByUri(string $uri);
 
     public function make();

src/Exceptions/EntryNotFoundException.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Statamic\Exceptions;
+
+class EntryNotFoundException extends \Exception
+{
+    protected string|int $id;
+
+    public function setEntry(string|int $id): object
+    {
+        $this->message = "No entry results for id {$id}";
+
+        return $this;
+    }
+}

src/Stache/Repositories/EntryRepository.php

@@ -6,6 +6,7 @@
 use Statamic\Contracts\Entries\EntryRepository as RepositoryContract;
 use Statamic\Contracts\Entries\QueryBuilder;
 use Statamic\Entries\EntryCollection;
+use Statamic\Exceptions\EntryNotFoundException;
 use Statamic\Stache\Query\EntryQueryBuilder;
 use Statamic\Stache\Stache;
 use Statamic\Support\Arr;
@@ -43,6 +44,17 @@ public function find($id): ?Entry
         return $this->query()->where('id', $id)->first();
     }
 
+    public function findOrFail($id): Entry|EntryNotFoundException
+    {
+        $result = $this->query()->where('id', $id)->first();
+
+        if (is_null($result)) {
+            throw (new EntryNotFoundException)->setEntry($id);
+        }
+
+        return $result;
+    }
+
     public function findByUri(string $uri, ?string $site = null): ?Entry
     {
         $site = $site ?? $this->stache->sites()->first();

tests/Stache/Repositories/EntryRepositoryTest.php

@@ -4,6 +4,7 @@
 
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Entries\EntryCollection;
+use Statamic\Exceptions\EntryNotFoundException;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Entry as EntryAPI;
 use Statamic\Stache\Repositories\EntryRepository;
@@ -227,4 +228,25 @@ public function it_can_delete()
         $this->assertNull($item = $this->repo->find('test-blog-entry'));
         $this->assertFileDoesNotExist($path);
     }
+
+    /** @test */
+    public function it_throws_an_error_when_find_or_fail_fails()
+    {
+        $this->expectException(EntryNotFoundException::class);
+
+        $invalidStringId = '00000000-0000-0000-0000-000000000000';
+        $invalidIntId = 123;
+
+        $this->repo->findOrFail($invalidStringId);
+        $this->repo->findOrFail($invalidIntId);
+    }
+
+    /** @test */
+    public function it_finds_an_entry_when_find_or_fail_is_queried()
+    {
+        $entry = $this->repo->findOrFail('alphabetical-bravo');
+
+        $this->assertInstanceOf(Entry::class, $entry);
+        $this->assertEquals('Bravo', $entry->get('title'));
+    }
 }