[5.x] Adjust legacy ignition classes (#11073)

Author: jasonvarga

composer.json

@@ -26,7 +26,7 @@
         "rebing/graphql-laravel": "^9.5",
         "rhukster/dom-sanitizer": "^1.0.6",
         "spatie/blink": "^1.3",
-        "spatie/ignition": "^1.12",
+        "spatie/ignition": "^1.15",
         "statamic/stringy": "^3.1.2",
         "stillat/blade-parser": "^1.10.1",
         "symfony/lock": "^6.4",

src/Exceptions/AssetContainerNotFoundException.php

@@ -3,10 +3,10 @@
 namespace Statamic\Exceptions;
 
 use Exception;
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
-use Spatie\LaravelIgnition\Support\StringComparator;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
+use Spatie\ErrorSolutions\Support\Laravel\StringComparator;
 use Statamic\Facades\AssetContainer;
 use Statamic\Statamic;
 

src/Exceptions/BlueprintNotFoundException.php

@@ -3,10 +3,10 @@
 namespace Statamic\Exceptions;
 
 use Exception;
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
-use Spatie\LaravelIgnition\Support\StringComparator;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
+use Spatie\ErrorSolutions\Support\Laravel\StringComparator;
 use Statamic\Facades\Blueprint;
 use Statamic\Statamic;
 

src/Exceptions/CollectionNotFoundException.php

@@ -3,10 +3,10 @@
 namespace Statamic\Exceptions;
 
 use Exception;
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
-use Spatie\LaravelIgnition\Support\StringComparator;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
+use Spatie\ErrorSolutions\Support\Laravel\StringComparator;
 use Statamic\Facades\Collection;
 use Statamic\Statamic;
 

src/Exceptions/ComposerJsonMissingPreUpdateCmdException.php

@@ -3,8 +3,8 @@
 namespace Statamic\Exceptions;
 
 use Exception;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
 use Spatie\ErrorSolutions\Contracts\Solution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
 use Statamic\Ignition\Solutions\EnableComposerUpdateScripts;
 
 class ComposerJsonMissingPreUpdateCmdException extends Exception implements ProvidesSolution

src/Exceptions/DuplicateFieldException.php

@@ -2,9 +2,9 @@
 
 namespace Statamic\Exceptions;
 
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
 use Statamic\Statamic;
 
 class DuplicateFieldException extends \Exception implements ProvidesSolution

src/Exceptions/FieldsetNotFoundException.php

@@ -3,10 +3,10 @@
 namespace Statamic\Exceptions;
 
 use Exception;
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
-use Spatie\LaravelIgnition\Support\StringComparator;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
+use Spatie\ErrorSolutions\Support\Laravel\StringComparator;
 use Statamic\Facades\Fieldset;
 use Statamic\Statamic;
 

src/Exceptions/FieldsetRecursionException.php

@@ -3,9 +3,9 @@
 namespace Statamic\Exceptions;
 
 use Exception;
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
 
 class FieldsetRecursionException extends Exception implements ProvidesSolution
 {

src/Exceptions/FieldtypeNotFoundException.php

@@ -4,10 +4,10 @@
 
 use Exception;
 use Facades\Statamic\Fields\FieldtypeRepository;
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
-use Spatie\LaravelIgnition\Support\StringComparator;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
+use Spatie\ErrorSolutions\Support\Laravel\StringComparator;
 use Statamic\Statamic;
 
 class FieldtypeNotFoundException extends Exception implements ProvidesSolution

src/Exceptions/NavigationNotFoundException.php

@@ -3,10 +3,10 @@
 namespace Statamic\Exceptions;
 
 use Exception;
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
-use Spatie\LaravelIgnition\Support\StringComparator;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
+use Spatie\ErrorSolutions\Support\Laravel\StringComparator;
 use Statamic\Facades\Nav;
 use Statamic\Statamic;
 

src/Exceptions/NotBootedException.php

@@ -3,9 +3,9 @@
 namespace Statamic\Exceptions;
 
 use Exception;
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
 use Statamic\Statamic;
 
 class NotBootedException extends Exception implements ProvidesSolution

src/Exceptions/SiteNotFoundException.php

@@ -3,9 +3,9 @@
 namespace Statamic\Exceptions;
 
 use Exception;
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
 use Statamic\Statamic;
 
 class SiteNotFoundException extends Exception implements ProvidesSolution

src/Exceptions/TaxonomyNotFoundException.php

@@ -3,10 +3,10 @@
 namespace Statamic\Exceptions;
 
 use Exception;
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
-use Spatie\LaravelIgnition\Support\StringComparator;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
+use Spatie\ErrorSolutions\Support\Laravel\StringComparator;
 use Statamic\Facades\Taxonomy;
 use Statamic\Statamic;
 

src/Exceptions/TermsFieldtypeBothOptionsUsedException.php

@@ -3,9 +3,9 @@
 namespace Statamic\Exceptions;
 
 use Exception;
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
 use Statamic\Statamic;
 
 class TermsFieldtypeBothOptionsUsedException extends Exception implements ProvidesSolution

src/Exceptions/TermsFieldtypeTaxonomyOptionUsed.php

@@ -3,9 +3,9 @@
 namespace Statamic\Exceptions;
 
 use Exception;
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
 use Statamic\Statamic;
 
 class TermsFieldtypeTaxonomyOptionUsed extends Exception implements ProvidesSolution

src/Fieldtypes/Assets/UndefinedContainerException.php

@@ -3,9 +3,9 @@
 namespace Statamic\Fieldtypes\Assets;
 
 use LogicException;
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
 use Statamic\Statamic;
 
 class UndefinedContainerException extends LogicException implements ProvidesSolution

src/Fieldtypes/MultipleValuesEncounteredException.php

@@ -3,9 +3,9 @@
 namespace Statamic\Fieldtypes;
 
 use Exception;
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
 
 class MultipleValuesEncounteredException extends Exception implements ProvidesSolution
 {

src/Forms/Exceptions/BlueprintUndefinedException.php

@@ -3,9 +3,9 @@
 namespace Statamic\Forms\Exceptions;
 
 use LogicException;
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
 use Statamic\Forms\Form;
 use Statamic\Statamic;
 

src/Forms/Exceptions/FileContentTypeRequiredException.php

@@ -3,9 +3,9 @@
 namespace Statamic\Forms\Exceptions;
 
 use LogicException;
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
 use Statamic\Statamic;
 
 class FileContentTypeRequiredException extends LogicException implements ProvidesSolution

src/Ignition/SolutionProviders/OAuthDisabled.php

@@ -2,7 +2,7 @@
 
 namespace Statamic\Ignition\SolutionProviders;
 
-use Spatie\Ignition\Contracts\HasSolutionsForThrowable;
+use Spatie\ErrorSolutions\Contracts\HasSolutionsForThrowable;
 use Statamic\Ignition\Solutions\EnableOAuth;
 use Throwable;
 

src/Ignition/SolutionProviders/UsingOldClass.php

@@ -2,7 +2,7 @@
 
 namespace Statamic\Ignition\SolutionProviders;
 
-use Spatie\Ignition\Contracts\HasSolutionsForThrowable;
+use Spatie\ErrorSolutions\Contracts\HasSolutionsForThrowable;
 use Statamic\Ignition\Solutions\UpdateClassReference;
 use Statamic\Statamic;
 use Statamic\Support\Arr;

src/Ignition/Solutions/EnableOAuth.php

@@ -2,7 +2,7 @@
 
 namespace Statamic\Ignition\Solutions;
 
-use Spatie\Ignition\Contracts\Solution;
+use Spatie\ErrorSolutions\Contracts\Solution;
 use Statamic\Statamic;
 
 class EnableOAuth implements Solution

src/Ignition/Solutions/UpdateClassReference.php

@@ -2,7 +2,7 @@
 
 namespace Statamic\Ignition\Solutions;
 
-use Spatie\Ignition\Contracts\Solution;
+use Spatie\ErrorSolutions\Contracts\Solution;
 
 class UpdateClassReference implements Solution
 {

src/Modifiers/ModifierNotFoundException.php

@@ -3,10 +3,10 @@
 namespace Statamic\Modifiers;
 
 use Exception;
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
-use Spatie\LaravelIgnition\Support\StringComparator;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
+use Spatie\ErrorSolutions\Support\Laravel\StringComparator;
 use Statamic\Statamic;
 
 class ModifierNotFoundException extends Exception implements ProvidesSolution

src/Providers/IgnitionServiceProvider.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Support\ServiceProvider;
-use Spatie\Ignition\Contracts\SolutionProviderRepository;
+use Spatie\ErrorSolutions\Contracts\SolutionProviderRepository;
 use Statamic\Ignition\SolutionProviders\OAuthDisabled;
 use Statamic\Ignition\SolutionProviders\UsingOldClass;
 

src/View/Antlers/Language/Runtime/RuntimeParser.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Http\Exceptions\HttpResponseException;
 use ReflectionProperty;
-use Spatie\Ignition\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
 use Spatie\LaravelIgnition\Exceptions\ViewException;
 use Spatie\LaravelIgnition\Exceptions\ViewExceptionWithSolution;
 use Statamic\Contracts\View\Antlers\Parser;

src/Widgets/WidgetNotFoundException.php

@@ -3,10 +3,10 @@
 namespace Statamic\Widgets;
 
 use Exception;
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
-use Spatie\LaravelIgnition\Support\StringComparator;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
+use Spatie\ErrorSolutions\Support\Laravel\StringComparator;
 use Statamic\Statamic;
 
 class WidgetNotFoundException extends Exception implements ProvidesSolution

src/Yaml/ParseException.php

@@ -3,9 +3,9 @@
 namespace Statamic\Yaml;
 
 use ErrorException;
-use Spatie\Ignition\Contracts\BaseSolution;
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
+use Spatie\ErrorSolutions\Contracts\BaseSolution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
 use Statamic\Statamic;
 
 class ParseException extends ErrorException implements ProvidesSolution