Merge pull request #202 from spatie/solutions-refactor

Solutions refactor
spatie · Jun 12, 2024 · 3c067b7 · 3c067b7
2 parents 9c60d92 + c0cd559
commit 3c067b7
Show file tree

Hide file tree

Showing 80 changed files with 24 additions and 2,955 deletions.
diff --git a/composer.json b/composer.json
@@ -22,8 +22,7 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "illuminate/support": "^10.0|^11.0",
-        "spatie/flare-client-php": "^1.5",
-        "spatie/ignition": "^1.14",
+        "spatie/ignition": "^1.15",
         "symfony/console": "^6.2.3|^7.0",
         "symfony/var-dumper": "^6.2.3|^7.0"
     },

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -45,51 +45,6 @@ parameters:
 			count: 1
 			path: src/Exceptions/InvalidConfig.php
 
-		-
-			message: "#^Class Livewire\\\\LivewireComponentsFinder not found\\.$#"
-			count: 1
-			path: src/Solutions/LivewireDiscoverSolution.php
-
-		-
-			message: "#^Parameter \\#1 \\$invalidController of method Spatie\\\\LaravelIgnition\\\\Solutions\\\\SolutionProviders\\\\InvalidRouteActionSolutionProvider\\:\\:findRelatedController\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/Solutions/SolutionProviders/InvalidRouteActionSolutionProvider.php
-
-		-
-			message: "#^Unable to resolve the template type TKey in call to function collect$#"
-			count: 1
-			path: src/Solutions/SolutionProviders/InvalidRouteActionSolutionProvider.php
-
-		-
-			message: "#^Unable to resolve the template type TValue in call to function collect$#"
-			count: 1
-			path: src/Solutions/SolutionProviders/InvalidRouteActionSolutionProvider.php
-
-		-
-			message: "#^Method Spatie\\\\LaravelIgnition\\\\Solutions\\\\SolutionProviders\\\\UnknownValidationSolutionProvider\\:\\:getAvailableMethods\\(\\) return type with generic class Illuminate\\\\Support\\\\Collection does not specify its types\\: TKey, TValue$#"
-			count: 1
-			path: src/Solutions/SolutionProviders/UnknownValidationSolutionProvider.php
-
-		-
-			message: "#^Parameter \\#1 \\$callback of method Illuminate\\\\Support\\\\Collection\\<int,ReflectionMethod\\>\\:\\:filter\\(\\) expects \\(callable\\(ReflectionMethod, int\\)\\: bool\\)\\|null, Closure\\(ReflectionMethod\\)\\: \\(0\\|1\\|false\\) given\\.$#"
-			count: 1
-			path: src/Solutions/SolutionProviders/UnknownValidationSolutionProvider.php
-
-		-
-			message: "#^Unable to resolve the template type TMakeKey in call to method static method Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\),mixed\\>\\:\\:make\\(\\)$#"
-			count: 1
-			path: src/Solutions/SolutionProviders/UnknownValidationSolutionProvider.php
-
-		-
-			message: "#^Unable to resolve the template type TMakeValue in call to method static method Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\),mixed\\>\\:\\:make\\(\\)$#"
-			count: 1
-			path: src/Solutions/SolutionProviders/UnknownValidationSolutionProvider.php
-
-		-
-			message: "#^Parameter \\#1 \\$missingView of method Spatie\\\\LaravelIgnition\\\\Solutions\\\\SolutionProviders\\\\ViewNotFoundSolutionProvider\\:\\:findRelatedView\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/Solutions/SolutionProviders/ViewNotFoundSolutionProvider.php
-
 		-
 			message: "#^Argument of an invalid type array\\|DateTimeImmutable\\|int\\|string\\|null supplied for foreach, only iterables are supported\\.$#"
 			count: 1

diff --git a/src/Commands/stubs/runnable-solution.stub b/src/Commands/stubs/runnable-solution.stub
@@ -2,7 +2,7 @@
 
 namespace DummyNamespace;
 
-use Spatie\Ignition\Contracts\RunnableSolution;
+use Spatie\ErrorSolutions\Contracts\RunnableSolution;
 
 class DummyClass implements RunnableSolution
 {

diff --git a/src/Commands/stubs/solution-provider.stub b/src/Commands/stubs/solution-provider.stub
@@ -2,7 +2,7 @@
 
 namespace DummyNamespace;
 
-use Spatie\Ignition\Contracts\HasSolutionsForThrowable;
+use Spatie\ErrorSolutions\Contracts\HasSolutionsForThrowable;
 use Throwable;
 
 class DummyClass implements HasSolutionsForThrowable

diff --git a/src/Commands/stubs/solution.stub b/src/Commands/stubs/solution.stub
@@ -2,7 +2,7 @@
 
 namespace DummyNamespace;
 
-use Spatie\Ignition\Contracts\Solution;
+use Spatie\ErrorSolutions\Contracts\Solution;
 
 class DummyClass implements Solution
 {

diff --git a/src/Exceptions/CannotExecuteSolutionForNonLocalIp.php b/src/Exceptions/CannotExecuteSolutionForNonLocalIp.php
@@ -2,9 +2,9 @@
 
 namespace Spatie\LaravelIgnition\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 Symfony\Component\HttpKernel\Exception\HttpException;
 
 class CannotExecuteSolutionForNonLocalIp extends HttpException implements ProvidesSolution

diff --git a/src/Exceptions/InvalidConfig.php b/src/Exceptions/InvalidConfig.php
@@ -4,9 +4,9 @@
 
 use Exception;
 use Monolog\Level;
-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 InvalidConfig extends Exception implements ProvidesSolution
 {

diff --git a/src/Exceptions/ViewExceptionWithSolution.php b/src/Exceptions/ViewExceptionWithSolution.php
@@ -2,8 +2,8 @@
 
 namespace Spatie\LaravelIgnition\Exceptions;
 
-use Spatie\Ignition\Contracts\ProvidesSolution;
-use Spatie\Ignition\Contracts\Solution;
+use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
 
 class ViewExceptionWithSolution extends ViewException implements ProvidesSolution
 {

diff --git a/src/Http/Controllers/ExecuteSolutionController.php b/src/Http/Controllers/ExecuteSolutionController.php
@@ -3,7 +3,7 @@
 namespace Spatie\LaravelIgnition\Http\Controllers;
 
 use Illuminate\Foundation\Validation\ValidatesRequests;
-use Spatie\Ignition\Contracts\SolutionProviderRepository;
+use Spatie\ErrorSolutions\Contracts\SolutionProviderRepository;
 use Spatie\LaravelIgnition\Exceptions\CannotExecuteSolutionForNonLocalIp;
 use Spatie\LaravelIgnition\Http\Requests\ExecuteSolutionRequest;
 use Spatie\LaravelIgnition\Support\RunnableSolutionsGuard;

diff --git a/src/Http/Requests/ExecuteSolutionRequest.php b/src/Http/Requests/ExecuteSolutionRequest.php
@@ -3,9 +3,9 @@
 namespace Spatie\LaravelIgnition\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-use Spatie\Ignition\Contracts\RunnableSolution;
-use Spatie\Ignition\Contracts\Solution;
-use Spatie\Ignition\Contracts\SolutionProviderRepository;
+use Spatie\ErrorSolutions\Contracts\RunnableSolution;
+use Spatie\ErrorSolutions\Contracts\Solution;
+use Spatie\ErrorSolutions\Contracts\SolutionProviderRepository;
 
 class ExecuteSolutionRequest extends FormRequest
 {

diff --git a/src/IgnitionServiceProvider.php b/src/IgnitionServiceProvider.php
@@ -14,12 +14,13 @@
 use Laravel\Octane\Events\TickReceived;
 use Monolog\Level;
 use Monolog\Logger;
+use Spatie\ErrorSolutions\Contracts\SolutionProviderRepository as SolutionProviderRepositoryContract;
+use Spatie\ErrorSolutions\SolutionProviderRepository;
 use Spatie\FlareClient\Flare;
 use Spatie\FlareClient\FlareMiddleware\AddSolutions;
 use Spatie\Ignition\Config\FileConfigManager;
 use Spatie\Ignition\Config\IgnitionConfig;
 use Spatie\Ignition\Contracts\ConfigManager;
-use Spatie\Ignition\Contracts\SolutionProviderRepository as SolutionProviderRepositoryContract;
 use Spatie\Ignition\Ignition;
 use Spatie\LaravelIgnition\Commands\SolutionMakeCommand;
 use Spatie\LaravelIgnition\Commands\SolutionProviderMakeCommand;
@@ -34,7 +35,6 @@
 use Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder;
 use Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder;
 use Spatie\LaravelIgnition\Renderers\IgnitionExceptionRenderer;
-use Spatie\LaravelIgnition\Solutions\SolutionProviders\SolutionProviderRepository;
 use Spatie\LaravelIgnition\Support\FlareLogHandler;
 use Spatie\LaravelIgnition\Support\SentReports;
 use Spatie\LaravelIgnition\Views\ViewExceptionMapper;

diff --git a/src/Renderers/ErrorPageRenderer.php b/src/Renderers/ErrorPageRenderer.php
@@ -2,9 +2,9 @@
 
 namespace Spatie\LaravelIgnition\Renderers;
 
+use Spatie\ErrorSolutions\Contracts\SolutionProviderRepository;
 use Spatie\FlareClient\Flare;
 use Spatie\Ignition\Config\IgnitionConfig;
-use Spatie\Ignition\Contracts\SolutionProviderRepository;
 use Spatie\Ignition\Ignition;
 use Spatie\LaravelIgnition\ContextProviders\LaravelContextProviderDetector;
 use Spatie\LaravelIgnition\Solutions\SolutionTransformers\LaravelSolutionTransformer;

diff --git a/src/Solutions/GenerateAppKeySolution.php b/src/Solutions/GenerateAppKeySolution.php
diff --git a/src/Solutions/LivewireDiscoverSolution.php b/src/Solutions/LivewireDiscoverSolution.php