[5.x] Add findOrFail to remaining repositories

src/Assets/AssetRepository.php

@@ -5,6 +5,7 @@
 use Statamic\Contracts\Assets\Asset;
 use Statamic\Contracts\Assets\AssetRepository as Contract;
 use Statamic\Contracts\Assets\QueryBuilder;
+use Statamic\Exceptions\AssetNotFoundException;
 use Statamic\Facades\AssetContainer;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
@@ -60,6 +61,17 @@ public function findByUrl(string $url)
         return $container->asset($path);
     }
 
+    public function findOrFail(string $id): Asset
+    {
+        $asset = $this->find($id);
+
+        if (! $asset) {
+            throw new AssetNotFoundException($id);
+        }
+
+        return $asset;
+    }
+
     protected function resolveContainerFromUrl($url)
     {
         return AssetContainer::all()->sortByDesc(function ($container) {

src/Auth/Eloquent/UserRepository.php

@@ -6,6 +6,7 @@
 use Statamic\Auth\UserCollection;
 use Statamic\Auth\UserRepository as BaseRepository;
 use Statamic\Contracts\Auth\User as UserContract;
+use Statamic\Exceptions\UserNotFoundException;
 use Statamic\Facades\Blink;
 
 class UserRepository extends BaseRepository
@@ -48,6 +49,17 @@ public function findByEmail(string $email): ?UserContract
         return $this->make()->model($model);
     }
 
+    public function findOrFail($id): UserContract
+    {
+        $user = $this->find($id);
+
+        if (! $user) {
+            throw new UserNotFoundException($id);
+        }
+
+        return $user;
+    }
+
     public function model($method, ...$args)
     {
         $model = $this->config['model'];

src/Contracts/Assets/AssetContainerRepository.php

@@ -12,5 +12,7 @@ public function find($id): ?AssetContainer;
 
     public function findByHandle(string $handle): ?AssetContainer;
 
+    public function findOrFail(string $handle): AssetContainer;
+
     public function make(?string $handle = null): AssetContainer;
 }

src/Contracts/Assets/AssetRepository.php

@@ -18,6 +18,8 @@ public function findById(string $id);
 
     public function findByPath(string $path);
 
+    public function findOrFail(string $asset);
+
     public function make();
 
     public function query();

src/Contracts/Auth/UserRepository.php

@@ -17,6 +17,8 @@ public function findByEmail(string $email): ?User;
 
     public function findByOAuthId(Provider $provider, string $id): ?User;
 
+    public function findOrFail($id): User;
+
     public function current(): ?User;
 
     public function fromUser($user): ?User;

src/Contracts/Entries/CollectionRepository.php

@@ -14,6 +14,8 @@ public function findByHandle($handle): ?Collection;
 
     public function findByMount($mount): ?Collection;
 
+    public function findOrFail($id): Collection;
+
     public function make(?string $handle = null): Collection;
 
     public function handles(): IlluminateCollection;

src/Contracts/Globals/GlobalRepository.php

@@ -12,5 +12,7 @@ public function find($id): ?GlobalSet;
 
     public function findByHandle($handle): ?GlobalSet;
 
+    public function findOrFail($id): GlobalSet;
+
     public function save($global);
 }

src/Contracts/Globals/GlobalVariablesRepository.php

@@ -10,6 +10,8 @@ public function all(): VariablesCollection;
 
     public function find($id): ?Variables;
 
+    public function findOrFail($id): Variables;
+
     public function whereSet($handle): VariablesCollection;
 
     public function save($variable);

src/Contracts/Structures/NavigationRepository.php

@@ -12,6 +12,8 @@ public function find($id): ?Nav;
 
     public function findByHandle($handle): ?Nav;
 
+    public function findOrFail($id): Nav;
+
     public function save(Nav $nav);
 
     public function make(?string $handle = null): Nav;

src/Contracts/Taxonomies/TaxonomyRepository.php

@@ -14,6 +14,8 @@ public function findByHandle($handle): ?Taxonomy;
 
     public function findByUri(string $uri): ?Taxonomy;
 
+    public function findOrFail($id): Taxonomy;
+
     public function make(?string $handle = null): Taxonomy;
 
     public function handles(): Collection;

src/Contracts/Taxonomies/TermRepository.php

@@ -14,6 +14,8 @@ public function find($id);
 
     public function findByUri(string $uri);
 
+    public function findOrFail($id);
+
     public function make(?string $slug = null);
 
     public function query();

src/Exceptions/AssetNotFoundException.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Statamic\Exceptions;
+
+class AssetNotFoundException extends \Exception
+{
+    protected $asset;
+
+    public function __construct($asset)
+    {
+        parent::__construct("Asset [{$asset}] not found");
+
+        $this->asset = $asset;
+    }
+}

src/Exceptions/FormNotFoundException.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Statamic\Exceptions;
+
+class FormNotFoundException extends \Exception
+{
+    protected $form;
+
+    public function __construct($form)
+    {
+        parent::__construct("Form [{$form}] not found");
+
+        $this->form = $form;
+    }
+}

src/Exceptions/GlobalSetNotFoundException.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Statamic\Exceptions;
+
+class GlobalSetNotFoundException extends \Exception
+{
+    protected $global;
+
+    public function __construct($global)
+    {
+        parent::__construct("Global Set [{$global}] not found");
+
+        $this->global = $global;
+    }
+}

src/Exceptions/GlobalVariablesNotFoundException.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Statamic\Exceptions;
+
+class GlobalVariablesNotFoundException extends \Exception
+{
+    protected $variables;
+
+    public function __construct($variables)
+    {
+        parent::__construct("Global Variables [{$variables}] not found");
+
+        $this->variables = $variables;
+    }
+}

src/Exceptions/TermNotFoundException.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Statamic\Exceptions;
+
+use Exception;
+
+class TermNotFoundException extends Exception
+{
+    protected $term;
+
+    public function __construct($term)
+    {
+        parent::__construct("Term [{$term}] not found");
+
+        $this->term = $term;
+    }
+}

src/Exceptions/UserNotFoundException.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Statamic\Exceptions;
+
+class UserNotFoundException extends \Exception
+{
+    protected $user;
+
+    public function __construct($user)
+    {
+        parent::__construct("User [{$user}] not found");
+
+        $this->user = $user;
+    }
+}

src/Facades/Asset.php

@@ -16,6 +16,7 @@
  * @method static AssetContract|null findByUrl(string $url)
  * @method static AssetContract|null findById(string $id)
  * @method static AssetContract|null findByPath(string $path)
+ * @method static AssetContract findOrFail(string $asset)
  * @method static AssetContract make()
  * @method static QueryBuilder query()
  * @method static void save($asset)

src/Facades/AssetContainer.php

@@ -9,6 +9,7 @@
  * @method static \Illuminate\Support\Collection all()
  * @method static null|\Statamic\Contracts\Assets\AssetContainer find($id)
  * @method static null|\Statamic\Contracts\Assets\AssetContainer findByHandle(string $handle)
+ * @method static \Statamic\Contracts\Assets\AssetContainer findOrFail($id)
  * @method static \Statamic\Contracts\Assets\AssetContainer make(string $handle = null)
  *
  * @see \Statamic\Assets\AssetRepository

src/Facades/Blueprint.php

@@ -9,6 +9,7 @@
  * @method static self setDirectory(string $directory)
  * @method static self setFallbackDirectory(string $directory)
  * @method static null|\Statamic\Fields\Blueprint find($handle)
+ * @method static \Statamic\Fields\Blueprint findOrFail($handle)
  * @method static void save(Blueprint $blueprint)
  * @method static void delete(Blueprint $blueprint)
  * @method static \Statamic\Fields\Blueprint make($handle = null)

src/Facades/Collection.php

@@ -10,6 +10,7 @@
  * @method static null|\Statamic\Entries\Collection find($id)
  * @method static null|\Statamic\Entries\Collection findByHandle($handle)
  * @method static null|\Statamic\Entries\Collection findByMount($mount)
+ * @method static \Statamic\Contracts\Entries\Collection findOrFail($id)
  * @method static \Statamic\Entries\Collection make(string $handle = null)
  * @method static \Illuminate\Support\Collection handles()
  * @method static bool handleExists(string $handle)

src/Facades/Fieldset.php

@@ -8,6 +8,7 @@
 /**
  * @method static self setDirectory($directory)
  * @method static null|\Statamic\Fields\Fieldset find(string $handle)
+ * @method static \Statamic\Fields\Fieldset findOrFail(string $handle)
  * @method static bool exists(string $handle)
  * @method static \Statamic\Fields\Fieldset make($handle = null)
  * @method static \Illuminate\Support\Collection all()

src/Facades/Form.php

@@ -7,6 +7,7 @@
 
 /**
  * @method static \Statamic\Contracts\Forms\Form find($handle)
+ * @method static \Statamic\Contracts\Forms\Form findOrFail($handle)
  * @method static \Illuminate\Support\Collection all()
  * @method static \Statamic\Contracts\Forms\Form make($handle = null)
  *

src/Facades/GlobalSet.php

@@ -9,6 +9,7 @@
  * @method static \Statamic\Globals\GlobalCollection all()
  * @method static null|\Statamic\Globals\GlobalCollection find($id)
  * @method static null|\Statamic\Globals\GlobalCollection findByHandle($handle)
+ * @method static \Statamic\Globals\GlobalCollection findOrFail($id)
  * @method static void save($global);
  *
  * @see \Statamic\Globals\GlobalCollection

src/Facades/GlobalVariables.php

@@ -8,6 +8,7 @@
 /**
  * @method static \Statamic\Globals\VariablesCollection all()
  * @method static null|\Statamic\Globals\Variables find($id)
+ * @method static \Statamic\Globals\Variables findOrFail($id)
  * @method static \Statamic\Globals\VariablesCollection whereSet($set)
  * @method static void save($variable);
  *

src/Facades/User.php

@@ -12,6 +12,7 @@
  * @method static null|\Statamic\Contracts\Auth\User find($id)
  * @method static null|\Statamic\Contracts\Auth\User findByEmail(string $email)
  * @method static null|\Statamic\Contracts\Auth\User findByOAuthId(Provider $provider, string $id)
+ * @method static \Statamic\Contracts\Auth\User findOrFail($id)
  * @method static null|\Statamic\Contracts\Auth\User current()
  * @method static null|\Statamic\Contracts\Auth\User fromUser($user)
  * @method static void save(User $user);

src/Fields/BlueprintRepository.php

@@ -3,6 +3,7 @@
 namespace Statamic\Fields;
 
 use Closure;
+use Statamic\Exceptions\BlueprintNotFoundException;
 use Statamic\Facades\Blink;
 use Statamic\Facades\File;
 use Statamic\Facades\Path;
@@ -51,6 +52,17 @@ public function find($blueprint): ?Blueprint
         });
     }
 
+    public function findOrFail($id): Blueprint
+    {
+        $blueprint = $this->find($id);
+
+        if (! $blueprint) {
+            throw new BlueprintNotFoundException($id);
+        }
+
+        return $blueprint;
+    }
+
     public function findStandardBlueprintPath($handle)
     {
         if (Str::startsWith($handle, 'vendor.')) {

src/Fields/FieldsetRepository.php

@@ -3,6 +3,7 @@
 namespace Statamic\Fields;
 
 use Illuminate\Support\Collection;
+use Statamic\Exceptions\FieldsetNotFoundException;
 use Statamic\Facades\File;
 use Statamic\Facades\Path;
 use Statamic\Facades\YAML;
@@ -52,6 +53,17 @@ public function find(string $handle): ?Fieldset
         return $fieldset;
     }
 
+    public function findOrFail($id): Fieldset
+    {
+        $blueprint = $this->find($id);
+
+        if (! $blueprint) {
+            throw new FieldsetNotFoundException($id);
+        }
+
+        return $blueprint;
+    }
+
     private function standardFieldsetPath(string $handle)
     {
         $handle = str_replace('/', '.', $handle);

src/Forms/FormRepository.php

@@ -6,6 +6,7 @@
 use Statamic\Contracts\Forms\Form as FormContract;
 use Statamic\Contracts\Forms\FormRepository as Contract;
 use Statamic\Contracts\Forms\Submission as SubmissionContract;
+use Statamic\Exceptions\FormNotFoundException;
 use Statamic\Facades\File;
 use Statamic\Facades\Folder;
 use Statamic\Forms\Exporters\ExporterRepository;
@@ -31,6 +32,17 @@ public function find($handle)
         return $form->hydrate();
     }
 
+    public function findOrFail($handle): FormContract
+    {
+        $form = $this->find($handle);
+
+        if (! $form) {
+            throw new FormNotFoundException($handle);
+        }
+
+        return $form;
+    }
+
     /**
      * Get all forms.
      *