Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop Laravel 5.x support #581

Merged
merged 9 commits into from Oct 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 0 additions & 40 deletions .github/workflows/ci.yaml
Expand Up @@ -21,14 +21,6 @@ jobs:
php: [ "8.1", "8.0", "7.4", "7.3", "7.2" ]
packages:
# All versions below should be test on PHP ^7.1 (Sentry SDK requirement)
- { laravel: 5.1.*, testbench: 3.1.*, phpunit: 5.7.* }
- { laravel: 5.2.*, testbench: 3.2.*, phpunit: 5.7.* }
- { laravel: 5.3.*, testbench: 3.3.*, phpunit: 5.7.* }
- { laravel: 5.4.*, testbench: 3.4.*, phpunit: 5.7.* }
- { laravel: 5.5.*, testbench: 3.5.*, phpunit: 6.5.* }
- { laravel: 5.6.*, testbench: 3.6.*, phpunit: 7.5.* }
- { laravel: 5.7.*, testbench: 3.7.*, phpunit: 7.5.* }
- { laravel: 5.8.*, testbench: 3.8.*, phpunit: 7.5.* }
- { laravel: ^6.0, testbench: 4.7.*, phpunit: 8.4.* }
- { laravel: ^7.0, testbench: 5.1.*, phpunit: 8.4.* }

Expand All @@ -48,43 +40,11 @@ jobs:
- php: "7.2"
packages: { laravel: ^8.0, testbench: ^6.0, phpunit: 9.3.* }

- php: "8.0"
packages: { laravel: 5.1.*, testbench: 3.1.*, phpunit: 5.7.* }
- php: "8.0"
packages: { laravel: 5.2.*, testbench: 3.2.*, phpunit: 5.7.* }
- php: "8.0"
packages: { laravel: 5.3.*, testbench: 3.3.*, phpunit: 5.7.* }
- php: "8.0"
packages: { laravel: 5.4.*, testbench: 3.4.*, phpunit: 5.7.* }
- php: "8.0"
packages: { laravel: 5.5.*, testbench: 3.5.*, phpunit: 6.5.* }
- php: "8.0"
packages: { laravel: 5.6.*, testbench: 3.6.*, phpunit: 7.5.* }
- php: "8.0"
packages: { laravel: 5.7.*, testbench: 3.7.*, phpunit: 7.5.* }
- php: "8.0"
packages: { laravel: 5.8.*, testbench: 3.8.*, phpunit: 7.5.* }
- php: "8.0"
packages: { laravel: ^6.0, testbench: 4.7.*, phpunit: 8.4.* }
- php: "8.0"
packages: { laravel: ^7.0, testbench: 5.1.*, phpunit: 8.4.* }

- php: "8.1"
packages: { laravel: 5.1.*, testbench: 3.1.*, phpunit: 5.7.* }
- php: "8.1"
packages: { laravel: 5.2.*, testbench: 3.2.*, phpunit: 5.7.* }
- php: "8.1"
packages: { laravel: 5.3.*, testbench: 3.3.*, phpunit: 5.7.* }
- php: "8.1"
packages: { laravel: 5.4.*, testbench: 3.4.*, phpunit: 5.7.* }
- php: "8.1"
packages: { laravel: 5.5.*, testbench: 3.5.*, phpunit: 6.5.* }
- php: "8.1"
packages: { laravel: 5.6.*, testbench: 3.6.*, phpunit: 7.5.* }
- php: "8.1"
packages: { laravel: 5.7.*, testbench: 3.7.*, phpunit: 7.5.* }
- php: "8.1"
packages: { laravel: 5.8.*, testbench: 3.8.*, phpunit: 7.5.* }
- php: "8.1"
packages: { laravel: ^6.0, testbench: 4.7.*, phpunit: 8.4.* }
- php: "8.1"
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -3,6 +3,8 @@
## Unreleased

- Drop support for Laravel Lumen (#579)
- Drop support for Laravel 5.x (#581)
- Fix not setting the correct SDK ID and version when running the `sentry:test` command (#582)

## 2.14.0

Expand Down
15 changes: 10 additions & 5 deletions README.md
Expand Up @@ -78,16 +78,21 @@ try {

## Laravel Version Compatibility

- Laravel Lumen is supported until `2.14.x`
- Laravel `<= 4.2.x` is supported until `0.8.x`
- Laravel `<= 5.7.x` on PHP `<= 7.0` is supported until `0.11.x`
- Laravel `>= 5.x.x` on PHP `>= 7.1` is supported in all versions
The Laravel versions listed below are all currently supported:

- Laravel `>= 6.x.x` on PHP `>= 7.2` is supported starting from `1.2.0`
- Laravel `>= 7.x.x` on PHP `>= 7.2` is supported starting from `1.7.0`
- Laravel `>= 8.x.x` on PHP `>= 7.3` is supported starting from `1.9.0`
- Laravel `>= 9.x.x` on PHP `>= 8.0` is supported starting from `2.11.0`

Please note that of version `>= 2.0.0` we require PHP Version `>= 7.2` because we are using our new [PHP SDK](https://github.com/getsentry/sentry-php) underneath.
Please note that starting with version `>= 2.0.0` we require PHP Version `>= 7.2` because we are using our new [PHP SDK](https://github.com/getsentry/sentry-php) underneath.

The Laravel and Lumen version listed below were supported in previous versions:

- Laravel `<= 4.2.x` is supported until `0.8.x`
- Laravel `<= 5.7.x` on PHP `<= 7.0` is supported until `0.11.x`
- Laravel `>= 5.x.x` on PHP `>= 7.1` is supported until `2.14.x`
- Laravel Lumen is supported until `2.14.x`

## Contributing to the SDK

Expand Down
8 changes: 4 additions & 4 deletions composer.json
Expand Up @@ -22,7 +22,7 @@
],
"require": {
"php": "^7.2 | ^8.0",
"illuminate/support": "5.0 - 5.8 | ^6.0 | ^7.0 | ^8.0 | ^9.0",
"illuminate/support": "^6.0 | ^7.0 | ^8.0 | ^9.0",
"sentry/sentry": "^3.9",
"sentry/sdk": "^3.1",
"symfony/psr-http-message-bridge": "^1.0 | ^2.0",
Expand All @@ -37,9 +37,9 @@
}
},
"require-dev": {
"phpunit/phpunit": "^5.7 | ^6.5 | ^7.5 | ^8.4 | ^9.3",
"laravel/framework": "5.0 - 5.8 | ^6.0 | ^7.0 | ^8.0 | ^9.0",
"orchestra/testbench": "3.1 - 3.8 | ^4.7 | ^5.1 | ^6.0 | ^7.0",
"phpunit/phpunit": "^8.4 | ^9.3",
"laravel/framework": "^6.0 | ^7.0 | ^8.0 | ^9.0",
"orchestra/testbench": "^4.7 | ^5.1 | ^6.0 | ^7.0",
"friendsofphp/php-cs-fixer": "^3.11",
"mockery/mockery": "^1.3"
},
Expand Down
7 changes: 0 additions & 7 deletions src/Sentry/Laravel/Console/PublishCommand.php
Expand Up @@ -10,13 +10,6 @@

class PublishCommand extends Command
{
/**
* Laravel 5.0.x: The name and signature of the console command.
*
* @var string
*/
protected $name = 'sentry:publish';

/**
* The name and signature of the console command.
*
Expand Down
13 changes: 6 additions & 7 deletions src/Sentry/Laravel/Console/TestCommand.php
Expand Up @@ -7,21 +7,16 @@
use Illuminate\Support\Str;
use Psr\Log\AbstractLogger;
use Sentry\ClientBuilder;
use Sentry\Laravel\Version;
use Sentry\State\Hub;
use Sentry\State\HubInterface;
use Sentry\Tracing\SpanContext;
use Sentry\Tracing\TransactionContext;
use Sentry\Tracing\TransactionSource;
use Throwable;

class TestCommand extends Command
{
/**
* Laravel 5.0.x: The name and signature of the console command.
*
* @var string
*/
protected $name = 'sentry:test';

/**
* The name and signature of the console command.
*
Expand Down Expand Up @@ -99,6 +94,10 @@ public function handle(): int
return 1;
}

// Set the Laravel SDK identifier and version
$clientBuilder->setSdkIdentifier(Version::SDK_IDENTIFIER);
$clientBuilder->setSdkVersion(Version::SDK_VERSION);

// We set a logger so we can surface errors thrown internally by the SDK
$clientBuilder->setLogger(new class($this) extends AbstractLogger {
private $command;
Expand Down