Skip to content

Commit

Permalink
Merge pull request #202 from spatie/solutions-refactor
Browse files Browse the repository at this point in the history
Solutions refactor
rubenvanassche authored Jun 12, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 9c60d92 + c0cd559 commit 3c067b7
Showing 80 changed files with 24 additions and 2,955 deletions.
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -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"
},
45 changes: 0 additions & 45 deletions phpstan-baseline.neon
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/Commands/stubs/runnable-solution.stub
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

namespace DummyNamespace;

use Spatie\Ignition\Contracts\RunnableSolution;
use Spatie\ErrorSolutions\Contracts\RunnableSolution;

class DummyClass implements RunnableSolution
{
2 changes: 1 addition & 1 deletion src/Commands/stubs/solution-provider.stub
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

namespace DummyNamespace;

use Spatie\Ignition\Contracts\HasSolutionsForThrowable;
use Spatie\ErrorSolutions\Contracts\HasSolutionsForThrowable;
use Throwable;

class DummyClass implements HasSolutionsForThrowable
2 changes: 1 addition & 1 deletion src/Commands/stubs/solution.stub
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

namespace DummyNamespace;

use Spatie\Ignition\Contracts\Solution;
use Spatie\ErrorSolutions\Contracts\Solution;

class DummyClass implements Solution
{
6 changes: 3 additions & 3 deletions src/Exceptions/CannotExecuteSolutionForNonLocalIp.php
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions src/Exceptions/InvalidConfig.php
Original file line number Diff line number Diff line change
@@ -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
{
4 changes: 2 additions & 2 deletions src/Exceptions/ViewExceptionWithSolution.php
Original file line number Diff line number Diff line change
@@ -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
{
2 changes: 1 addition & 1 deletion src/Http/Controllers/ExecuteSolutionController.php
Original file line number Diff line number Diff line change
@@ -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;
6 changes: 3 additions & 3 deletions src/Http/Requests/ExecuteSolutionRequest.php
Original file line number Diff line number Diff line change
@@ -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
{
4 changes: 2 additions & 2 deletions src/IgnitionServiceProvider.php
Original file line number Diff line number Diff line change
@@ -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;
2 changes: 1 addition & 1 deletion src/Renderers/ErrorPageRenderer.php
Original file line number Diff line number Diff line change
@@ -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;
46 changes: 0 additions & 46 deletions src/Solutions/GenerateAppKeySolution.php

This file was deleted.

53 changes: 0 additions & 53 deletions src/Solutions/LivewireDiscoverSolution.php

This file was deleted.

Loading

0 comments on commit 3c067b7

Please sign in to comment.