Skip to content
This repository has been archived by the owner on Jun 29, 2023. It is now read-only.

Commit

Permalink
Support Laravel 8 (#1)
Browse files Browse the repository at this point in the history
  • Loading branch information
spawnia authored Dec 10, 2020
1 parent 3121a58 commit a25acf8
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 17 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ php:
- 7.2
- 7.3
- 7.4
- 8.0

install:
- composer install --prefer-dist --no-interaction --no-suggest
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

## 2.2.0

### Added

- Support Laravel 8

## 2.1.0

### Changed
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
}
],
"require": {
"php": "^7.2",
"illuminate/contracts": "5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0"
"php": "^7.2 || ^8",
"illuminate/contracts": "5.6.* || 5.7.* || 5.8.* || ^6 || ^7 || ^8"
},
"require-dev": {
"orchestra/database": "3.6.* || 3.7.* || 3.8.* || 3.9.* || ^4.0 || ^5.0",
"orchestra/testbench": "3.6.* || 3.7.* || 3.8.* || 3.9.* || ^4.0 || ^5.0",
"nunomaduro/larastan": "^0.4 || ^0.5"
"orchestra/database": "3.6.* || 3.7.* || 3.8.* || 3.9.* || ^4 || ^5 || ^6",
"orchestra/testbench": "3.6.* || 3.7.* || 3.8.* || 3.9.* || ^4 || ^5 || ^6",
"nunomaduro/larastan": "^0.4 || ^0.5 || ^0.6"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion phpstan.neon
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
includes:
- ./vendor/nunomaduro/larastan/extension.neon
parameters:
level: 5
level: max
paths:
- src
- tests
15 changes: 5 additions & 10 deletions src/LaravelQueryLogServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@

class LaravelQueryLogServiceProvider extends ServiceProvider
{
/**
* Bootstrap any application services.
*
* @throws \Illuminate\Contracts\Container\BindingResolutionException
*/
public function boot(DatabaseManager $databaseManager, LogManager $logManager, ConfigRepository $configRepository): void
{
public function boot(
DatabaseManager $databaseManager,
LogManager $logManager,
ConfigRepository $configRepository
): void {
$this->publishes([
__DIR__.'/query-log.php' => $this->app->make('path.config').'/query-log.php',
], 'query-log-config');
Expand Down Expand Up @@ -55,9 +53,6 @@ protected function createDefaultLogger(): LoggerInterface
);
}

/**
* Register any application services.
*/
public function register(): void
{
$this->mergeConfigFrom(__DIR__.'/query-log.php', 'query-log');
Expand Down
5 changes: 4 additions & 1 deletion tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@

abstract class TestCase extends OrchestraTestCase
{
protected function getPackageProviders($app)
/**
* @return array<int, class-string<\Illuminate\Support\ServiceProvider>>
*/
protected function getPackageProviders($app): array
{
return [
LaravelQueryLogServiceProvider::class,
Expand Down

0 comments on commit a25acf8

Please sign in to comment.