diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 05d299cf..bc4465a6 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,10 +9,10 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest] - php: [8.0, 8.1, 8.2] - laravel: [9.*, 8.*] + php: [8.1, 8.2] + laravel: [10.*] stability: [prefer-lowest, prefer-stable] + os: [ubuntu-latest, windows-latest] name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/composer.json b/composer.json index 2b889366..ef098d70 100644 --- a/composer.json +++ b/composer.json @@ -17,28 +17,27 @@ "homepage": "https://flareapp.io/ignition", "license": "MIT", "require": { - "php": "^8.0", + "php": "^8.1", "ext-curl": "*", "ext-json": "*", "ext-mbstring": "*", - "monolog/monolog": "^2.3", - "spatie/ignition": "^1.4.1", - "spatie/flare-client-php": "^1.0.1", - "symfony/console": "^5.0|^6.0", - "symfony/var-dumper": "^5.0|^6.0", - "illuminate/support": "^8.77|^9.27" + "monolog/monolog": "^3.0", + "spatie/ignition": "dev-l10", + "spatie/flare-client-php": "dev-l10", + "symfony/console": "^6.0", + "symfony/var-dumper": "^6.0", + "illuminate/support": "^10.0" }, "require-dev": { "filp/whoops": "^2.14", - "livewire/livewire": "^2.8|dev-develop", + "livewire/livewire": "dev-develop", "mockery/mockery": "^1.4", - "nunomaduro/larastan": "^1.0", - "orchestra/testbench": "^6.23|^7.0", + "nunomaduro/larastan": "^3.0", + "orchestra/testbench": "^8.0", "pestphp/pest": "^1.20", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0", - "phpstan/phpstan-phpunit": "^1.0", - "spatie/laravel-ray": "^1.27" + "phpstan/phpstan-phpunit": "^1.0" }, "config": { "sort-packages": true, diff --git a/src/Exceptions/InvalidConfig.php b/src/Exceptions/InvalidConfig.php index 82d8a4d5..bb1bc688 100644 --- a/src/Exceptions/InvalidConfig.php +++ b/src/Exceptions/InvalidConfig.php @@ -3,7 +3,7 @@ namespace Spatie\LaravelIgnition\Exceptions; use Exception; -use Monolog\Logger; +use Monolog\Level; use Spatie\Ignition\Contracts\BaseSolution; use Spatie\Ignition\Contracts\ProvidesSolution; use Spatie\Ignition\Contracts\Solution; @@ -19,7 +19,7 @@ public function getSolution(): Solution { $validLogLevels = array_map( fn (string $level) => strtolower($level), - array_keys(Logger::getLevels()) + array_keys(Level::VALUES) ); $validLogLevelsString = implode(',', $validLogLevels); diff --git a/src/IgnitionServiceProvider.php b/src/IgnitionServiceProvider.php index 60819fbd..0f8dae11 100644 --- a/src/IgnitionServiceProvider.php +++ b/src/IgnitionServiceProvider.php @@ -11,6 +11,7 @@ use Laravel\Octane\Events\RequestTerminated; use Laravel\Octane\Events\TaskReceived; use Laravel\Octane\Events\TickReceived; +use Monolog\Level; use Monolog\Logger; use Spatie\FlareClient\Flare; use Spatie\FlareClient\FlareMiddleware\AddSolutions; @@ -275,7 +276,7 @@ protected function configureQueue(): void protected function getLogLevel(string $logLevelString): int { - $logLevel = Logger::getLevels()[strtoupper($logLevelString)] ?? null; + $logLevel = Level::VALUES[strtoupper($logLevelString)] ?? null; if (! $logLevel) { throw InvalidConfig::invalidLogLevel($logLevelString); diff --git a/src/Support/FlareLogHandler.php b/src/Support/FlareLogHandler.php index 2797c849..e98c722a 100644 --- a/src/Support/FlareLogHandler.php +++ b/src/Support/FlareLogHandler.php @@ -4,6 +4,7 @@ use InvalidArgumentException; use Monolog\Handler\AbstractProcessingHandler; +use Monolog\Level; use Monolog\Logger; use Spatie\FlareClient\Flare; use Spatie\FlareClient\Report; @@ -15,9 +16,9 @@ class FlareLogHandler extends AbstractProcessingHandler protected SentReports $sentReports; - protected int $minimumReportLogLevel = Logger::ERROR; + protected int $minimumReportLogLevel = Level::Error; - public function __construct(Flare $flare, SentReports $sentReports, $level = Logger::DEBUG, $bubble = true) + public function __construct(Flare $flare, SentReports $sentReports, $level = Level::Debug, $bubble = true) { $this->flare = $flare; @@ -28,7 +29,7 @@ public function __construct(Flare $flare, SentReports $sentReports, $level = Log public function setMinimumReportLogLevel(int $level): void { - if (! in_array($level, Logger::getLevels())) { + if (! in_array($level, Level::VALUES)) { throw new InvalidArgumentException('The given minimum log level is not supported.'); } @@ -54,7 +55,7 @@ protected function write(array $record): void if ($this->hasValidLogLevel($record)) { $this->flare->reportMessage( $record['message'], - 'Log ' . Logger::getLevelName($record['level']), + 'Log ' . Logger::toMonologLevel($record['level'])->getName(), function (Report $flareReport) use ($record) { foreach ($record['context'] as $key => $value) { $flareReport->context($key, $value);