Skip to content

Commit 3c067b7

Browse files
rubenvanasscherubenvanassche
authored
Merge pull request #202 from spatie/solutions-refactor
Solutions refactor
2 parents 9c60d92 + c0cd559 commit 3c067b7

File tree

80 files changed

+24
-2955
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+24
-2955
lines changed

‎composer.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
"ext-json": "*",
2323
"ext-mbstring": "*",
2424
"illuminate/support": "^10.0|^11.0",
25-
"spatie/flare-client-php": "^1.5",
26-
"spatie/ignition": "^1.14",
25+
"spatie/ignition": "^1.15",
2726
"symfony/console": "^6.2.3|^7.0",
2827
"symfony/var-dumper": "^6.2.3|^7.0"
2928
},

‎phpstan-baseline.neon

-45
Original file line numberDiff line numberDiff line change
@@ -45,51 +45,6 @@ parameters:
4545
count: 1
4646
path: src/Exceptions/InvalidConfig.php
4747

48-
-
49-
message: "#^Class Livewire\\\\LivewireComponentsFinder not found\\.$#"
50-
count: 1
51-
path: src/Solutions/LivewireDiscoverSolution.php
52-
53-
-
54-
message: "#^Parameter \\#1 \\$invalidController of method Spatie\\\\LaravelIgnition\\\\Solutions\\\\SolutionProviders\\\\InvalidRouteActionSolutionProvider\\:\\:findRelatedController\\(\\) expects string, string\\|null given\\.$#"
55-
count: 1
56-
path: src/Solutions/SolutionProviders/InvalidRouteActionSolutionProvider.php
57-
58-
-
59-
message: "#^Unable to resolve the template type TKey in call to function collect$#"
60-
count: 1
61-
path: src/Solutions/SolutionProviders/InvalidRouteActionSolutionProvider.php
62-
63-
-
64-
message: "#^Unable to resolve the template type TValue in call to function collect$#"
65-
count: 1
66-
path: src/Solutions/SolutionProviders/InvalidRouteActionSolutionProvider.php
67-
68-
-
69-
message: "#^Method Spatie\\\\LaravelIgnition\\\\Solutions\\\\SolutionProviders\\\\UnknownValidationSolutionProvider\\:\\:getAvailableMethods\\(\\) return type with generic class Illuminate\\\\Support\\\\Collection does not specify its types\\: TKey, TValue$#"
70-
count: 1
71-
path: src/Solutions/SolutionProviders/UnknownValidationSolutionProvider.php
72-
73-
-
74-
message: "#^Parameter \\#1 \\$callback of method Illuminate\\\\Support\\\\Collection\\<int,ReflectionMethod\\>\\:\\:filter\\(\\) expects \\(callable\\(ReflectionMethod, int\\)\\: bool\\)\\|null, Closure\\(ReflectionMethod\\)\\: \\(0\\|1\\|false\\) given\\.$#"
75-
count: 1
76-
path: src/Solutions/SolutionProviders/UnknownValidationSolutionProvider.php
77-
78-
-
79-
message: "#^Unable to resolve the template type TMakeKey in call to method static method Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\),mixed\\>\\:\\:make\\(\\)$#"
80-
count: 1
81-
path: src/Solutions/SolutionProviders/UnknownValidationSolutionProvider.php
82-
83-
-
84-
message: "#^Unable to resolve the template type TMakeValue in call to method static method Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\),mixed\\>\\:\\:make\\(\\)$#"
85-
count: 1
86-
path: src/Solutions/SolutionProviders/UnknownValidationSolutionProvider.php
87-
88-
-
89-
message: "#^Parameter \\#1 \\$missingView of method Spatie\\\\LaravelIgnition\\\\Solutions\\\\SolutionProviders\\\\ViewNotFoundSolutionProvider\\:\\:findRelatedView\\(\\) expects string, string\\|null given\\.$#"
90-
count: 1
91-
path: src/Solutions/SolutionProviders/ViewNotFoundSolutionProvider.php
92-
9348
-
9449
message: "#^Argument of an invalid type array\\|DateTimeImmutable\\|int\\|string\\|null supplied for foreach, only iterables are supported\\.$#"
9550
count: 1

‎src/Commands/stubs/runnable-solution.stub

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace DummyNamespace;
44

5-
use Spatie\Ignition\Contracts\RunnableSolution;
5+
use Spatie\ErrorSolutions\Contracts\RunnableSolution;
66

77
class DummyClass implements RunnableSolution
88
{

‎src/Commands/stubs/solution-provider.stub

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace DummyNamespace;
44

5-
use Spatie\Ignition\Contracts\HasSolutionsForThrowable;
5+
use Spatie\ErrorSolutions\Contracts\HasSolutionsForThrowable;
66
use Throwable;
77

88
class DummyClass implements HasSolutionsForThrowable

‎src/Commands/stubs/solution.stub

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace DummyNamespace;
44

5-
use Spatie\Ignition\Contracts\Solution;
5+
use Spatie\ErrorSolutions\Contracts\Solution;
66

77
class DummyClass implements Solution
88
{

‎src/Exceptions/CannotExecuteSolutionForNonLocalIp.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace Spatie\LaravelIgnition\Exceptions;
44

5-
use Spatie\Ignition\Contracts\BaseSolution;
6-
use Spatie\Ignition\Contracts\ProvidesSolution;
7-
use Spatie\Ignition\Contracts\Solution;
5+
use Spatie\ErrorSolutions\Contracts\BaseSolution;
6+
use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
7+
use Spatie\ErrorSolutions\Contracts\Solution;
88
use Symfony\Component\HttpKernel\Exception\HttpException;
99

1010
class CannotExecuteSolutionForNonLocalIp extends HttpException implements ProvidesSolution

‎src/Exceptions/InvalidConfig.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
use Exception;
66
use Monolog\Level;
7-
use Spatie\Ignition\Contracts\BaseSolution;
8-
use Spatie\Ignition\Contracts\ProvidesSolution;
9-
use Spatie\Ignition\Contracts\Solution;
7+
use Spatie\ErrorSolutions\Contracts\BaseSolution;
8+
use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
9+
use Spatie\ErrorSolutions\Contracts\Solution;
1010

1111
class InvalidConfig extends Exception implements ProvidesSolution
1212
{

‎src/Exceptions/ViewExceptionWithSolution.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace Spatie\LaravelIgnition\Exceptions;
44

5-
use Spatie\Ignition\Contracts\ProvidesSolution;
6-
use Spatie\Ignition\Contracts\Solution;
5+
use Spatie\ErrorSolutions\Contracts\ProvidesSolution;
6+
use Spatie\ErrorSolutions\Contracts\Solution;
77

88
class ViewExceptionWithSolution extends ViewException implements ProvidesSolution
99
{

‎src/Http/Controllers/ExecuteSolutionController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace Spatie\LaravelIgnition\Http\Controllers;
44

55
use Illuminate\Foundation\Validation\ValidatesRequests;
6-
use Spatie\Ignition\Contracts\SolutionProviderRepository;
6+
use Spatie\ErrorSolutions\Contracts\SolutionProviderRepository;
77
use Spatie\LaravelIgnition\Exceptions\CannotExecuteSolutionForNonLocalIp;
88
use Spatie\LaravelIgnition\Http\Requests\ExecuteSolutionRequest;
99
use Spatie\LaravelIgnition\Support\RunnableSolutionsGuard;

‎src/Http/Requests/ExecuteSolutionRequest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace Spatie\LaravelIgnition\Http\Requests;
44

55
use Illuminate\Foundation\Http\FormRequest;
6-
use Spatie\Ignition\Contracts\RunnableSolution;
7-
use Spatie\Ignition\Contracts\Solution;
8-
use Spatie\Ignition\Contracts\SolutionProviderRepository;
6+
use Spatie\ErrorSolutions\Contracts\RunnableSolution;
7+
use Spatie\ErrorSolutions\Contracts\Solution;
8+
use Spatie\ErrorSolutions\Contracts\SolutionProviderRepository;
99

1010
class ExecuteSolutionRequest extends FormRequest
1111
{

‎src/IgnitionServiceProvider.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414
use Laravel\Octane\Events\TickReceived;
1515
use Monolog\Level;
1616
use Monolog\Logger;
17+
use Spatie\ErrorSolutions\Contracts\SolutionProviderRepository as SolutionProviderRepositoryContract;
18+
use Spatie\ErrorSolutions\SolutionProviderRepository;
1719
use Spatie\FlareClient\Flare;
1820
use Spatie\FlareClient\FlareMiddleware\AddSolutions;
1921
use Spatie\Ignition\Config\FileConfigManager;
2022
use Spatie\Ignition\Config\IgnitionConfig;
2123
use Spatie\Ignition\Contracts\ConfigManager;
22-
use Spatie\Ignition\Contracts\SolutionProviderRepository as SolutionProviderRepositoryContract;
2324
use Spatie\Ignition\Ignition;
2425
use Spatie\LaravelIgnition\Commands\SolutionMakeCommand;
2526
use Spatie\LaravelIgnition\Commands\SolutionProviderMakeCommand;
@@ -34,7 +35,6 @@
3435
use Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder;
3536
use Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder;
3637
use Spatie\LaravelIgnition\Renderers\IgnitionExceptionRenderer;
37-
use Spatie\LaravelIgnition\Solutions\SolutionProviders\SolutionProviderRepository;
3838
use Spatie\LaravelIgnition\Support\FlareLogHandler;
3939
use Spatie\LaravelIgnition\Support\SentReports;
4040
use Spatie\LaravelIgnition\Views\ViewExceptionMapper;

‎src/Renderers/ErrorPageRenderer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace Spatie\LaravelIgnition\Renderers;
44

5+
use Spatie\ErrorSolutions\Contracts\SolutionProviderRepository;
56
use Spatie\FlareClient\Flare;
67
use Spatie\Ignition\Config\IgnitionConfig;
7-
use Spatie\Ignition\Contracts\SolutionProviderRepository;
88
use Spatie\Ignition\Ignition;
99
use Spatie\LaravelIgnition\ContextProviders\LaravelContextProviderDetector;
1010
use Spatie\LaravelIgnition\Solutions\SolutionTransformers\LaravelSolutionTransformer;

‎src/Solutions/GenerateAppKeySolution.php

-46
This file was deleted.

‎src/Solutions/LivewireDiscoverSolution.php

-53
This file was deleted.

0 commit comments

Comments
 (0)