Merge pull request #671 from spatie/solutions-refactor

Solutions refactor
spatie · Jun 12, 2024 · e3a68e1 · e3a68e1
2 parents 68ec0d3 + d0f5a1d
commit e3a68e1
Show file tree

Hide file tree

Showing 24 changed files with 11 additions and 1,109 deletions.
diff --git a/composer.json b/composer.json
@@ -20,10 +20,10 @@
         "php": "^8.0",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "spatie/backtrace": "^1.5.3",
-        "spatie/flare-client-php": "^1.4.0",
+        "spatie/flare-client-php": "^1.7",
         "symfony/console": "^5.4|^6.0|^7.0",
-        "symfony/var-dumper": "^5.4|^6.0|^7.0"
+        "symfony/var-dumper": "^5.4|^6.0|^7.0",
+        "spatie/error-solutions": "^1.0"
     },
     "require-dev" : {
         "illuminate/cache" : "^9.52|^10.0|^11.0",

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,10 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^PHPDoc tag @param for parameter \\$solutionProvider with type class\\-string\\<Spatie\\\\Ignition\\\\Contracts\\\\HasSolutionsForThrowable\\>\\|Spatie\\\\Ignition\\\\Contracts\\\\HasSolutionsForThrowable is not subtype of native type string\\.$#"
-			count: 1
-			path: src/Contracts/SolutionProviderRepository.php
-
 		-
 			message: "#^Method Spatie\\\\Ignition\\\\ErrorPage\\\\Renderer\\:\\:renderAsString\\(\\) has parameter \\$date with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -24,43 +19,3 @@ parameters:
 			message: "#^Parameter \\#1 \\$callback of function set_exception_handler expects \\(callable\\(Throwable\\)\\: void\\)\\|null, array\\{\\$this\\(Spatie\\\\Ignition\\\\Ignition\\), 'handleException'\\} given\\.$#"
 			count: 1
 			path: src/Ignition.php
-
-		-
-			message: "#^Method Spatie\\\\Ignition\\\\Solutions\\\\OpenAi\\\\DummyCache\\:\\:setMultiple\\(\\) has parameter \\$values with no value type specified in iterable type iterable\\.$#"
-			count: 1
-			path: src/Solutions/OpenAi/DummyCache.php
-
-		-
-			message: "#^Cannot call method get\\(\\) on Psr\\\\SimpleCache\\\\CacheInterface\\|null\\.$#"
-			count: 1
-			path: src/Solutions/OpenAi/OpenAiSolution.php
-
-		-
-			message: "#^Cannot call method getSnippetAsString\\(\\) on Spatie\\\\Backtrace\\\\Frame\\|null\\.$#"
-			count: 1
-			path: src/Solutions/OpenAi/OpenAiSolution.php
-
-		-
-			message: "#^Cannot call method set\\(\\) on Psr\\\\SimpleCache\\\\CacheInterface\\|null\\.$#"
-			count: 1
-			path: src/Solutions/OpenAi/OpenAiSolution.php
-
-		-
-			message: "#^Parameter \\#1 \\$rawText of class Spatie\\\\Ignition\\\\Solutions\\\\OpenAi\\\\OpenAiSolutionResponse constructor expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/Solutions/OpenAi/OpenAiSolution.php
-
-		-
-			message: "#^Parameter \\$line of class Spatie\\\\Ignition\\\\Solutions\\\\OpenAi\\\\OpenAiPromptViewModel constructor expects string, int given\\.$#"
-			count: 1
-			path: src/Solutions/OpenAi/OpenAiSolution.php
-
-		-
-			message: "#^Property Spatie\\\\Ignition\\\\Solutions\\\\OpenAi\\\\OpenAiSolution\\:\\:\\$openAiSolutionResponse \\(Spatie\\\\Ignition\\\\Solutions\\\\OpenAi\\\\OpenAiSolutionResponse\\) does not accept Spatie\\\\Ignition\\\\Solutions\\\\OpenAi\\\\OpenAiSolutionResponse\\|null\\.$#"
-			count: 1
-			path: src/Solutions/OpenAi/OpenAiSolution.php
-
-		-
-			message: "#^Method Spatie\\\\Ignition\\\\Solutions\\\\OpenAi\\\\OpenAiSolutionResponse\\:\\:links\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Solutions/OpenAi/OpenAiSolutionResponse.php
diff --git a/src/Contracts/BaseSolution.php b/src/Contracts/BaseSolution.php
diff --git a/src/Contracts/HasSolutionsForThrowable.php b/src/Contracts/HasSolutionsForThrowable.php
diff --git a/src/Contracts/ProvidesSolution.php b/src/Contracts/ProvidesSolution.php
diff --git a/src/Contracts/RunnableSolution.php b/src/Contracts/RunnableSolution.php
diff --git a/src/Contracts/Solution.php b/src/Contracts/Solution.php
diff --git a/src/Contracts/SolutionProviderRepository.php b/src/Contracts/SolutionProviderRepository.php
diff --git a/src/ErrorPage/ErrorPageViewModel.php b/src/ErrorPage/ErrorPageViewModel.php
@@ -2,11 +2,11 @@
 
 namespace Spatie\Ignition\ErrorPage;
 
+use Spatie\ErrorSolutions\Contracts\Solution;
+use Spatie\ErrorSolutions\Solutions\SolutionTransformer;
 use Spatie\FlareClient\Report;
 use Spatie\FlareClient\Truncation\ReportTrimmer;
 use Spatie\Ignition\Config\IgnitionConfig;
-use Spatie\Ignition\Contracts\Solution;
-use Spatie\Ignition\Solutions\SolutionTransformer;
 use Throwable;
 
 class ErrorPageViewModel

diff --git a/src/Ignition.php b/src/Ignition.php
@@ -4,6 +4,12 @@
 
 use ArrayObject;
 use ErrorException;
+use Spatie\ErrorSolutions\Contracts\HasSolutionsForThrowable;
+use Spatie\ErrorSolutions\Contracts\SolutionProviderRepository as SolutionProviderRepositoryContract;
+use Spatie\ErrorSolutions\SolutionProviderRepository;
+use Spatie\ErrorSolutions\SolutionProviders\BadMethodCallSolutionProvider;
+use Spatie\ErrorSolutions\SolutionProviders\MergeConflictSolutionProvider;
+use Spatie\ErrorSolutions\SolutionProviders\UndefinedPropertySolutionProvider;
 use Spatie\FlareClient\Context\BaseContextProviderDetector;
 use Spatie\FlareClient\Context\ContextProviderDetector;
 use Spatie\FlareClient\Enums\MessageLevels;
@@ -13,14 +19,8 @@
 use Spatie\FlareClient\FlareMiddleware\FlareMiddleware;
 use Spatie\FlareClient\Report;
 use Spatie\Ignition\Config\IgnitionConfig;
-use Spatie\Ignition\Contracts\HasSolutionsForThrowable;
-use Spatie\Ignition\Contracts\SolutionProviderRepository as SolutionProviderRepositoryContract;
 use Spatie\Ignition\ErrorPage\ErrorPageViewModel;
 use Spatie\Ignition\ErrorPage\Renderer;
-use Spatie\Ignition\Solutions\SolutionProviders\BadMethodCallSolutionProvider;
-use Spatie\Ignition\Solutions\SolutionProviders\MergeConflictSolutionProvider;
-use Spatie\Ignition\Solutions\SolutionProviders\SolutionProviderRepository;
-use Spatie\Ignition\Solutions\SolutionProviders\UndefinedPropertySolutionProvider;
 use Throwable;
 
 class Ignition

diff --git a/src/Solutions/OpenAi/DummyCache.php b/src/Solutions/OpenAi/DummyCache.php
diff --git a/src/Solutions/OpenAi/OpenAiPromptViewModel.php b/src/Solutions/OpenAi/OpenAiPromptViewModel.php