diff --git a/.github/workflows/validate-composer.yml b/.github/workflows/validate-composer.yml index cb8f78c..7fdba98 100644 --- a/.github/workflows/validate-composer.yml +++ b/.github/workflows/validate-composer.yml @@ -17,35 +17,39 @@ jobs: - "7.*" - "8.*" - "9.*" + - "10.*" php-version: - - "7.1" - "7.2" - "7.3" - "7.4" - "8.0" - "8.1" exclude: - # See - https://laravel.com/docs/8.x/releases#support-policy + # See - https://laravel.com/docs/9.x/releases#support-policy # See - https://github.com/laravel/framework/issues/40339 # Laravel 5.5 supports PHP 7.1 - 7.4 - {laravel-version: "5.5.*", php-version: "8.0"} # Laravel 5.5.* does not support PHP 8.0+ - {laravel-version: "5.5.*", php-version: "8.1"} # Laravel 5.5.* does not support PHP 8.0+ + - {laravel-version: "5.5.*", php-version: "8.2"} # Laravel 5.5.* does not support PHP 8.0+ # Laravel 6 supports PHP 7.2 - 8.0 - - {laravel-version: "6.*", php-version: "7.1"} # Laravel 6 requires 7.2+ - {laravel-version: "6.*", php-version: "8.1"} # Laravel 6 does not support PHP 8.1+ + - {laravel-version: "6.*", php-version: "8.2"} # Laravel 6 does not support PHP 8.1+ # Laravel 7 supports PHP 7.2 - 8.0 - - {laravel-version: "7.*", php-version: "7.1"} # Laravel 7 requires 7.2+ - {laravel-version: "7.*", php-version: "8.1"} # Laravel 7 does not support PHP 8.1+ + - {laravel-version: "7.*", php-version: "8.2"} # Laravel 7 does not support PHP 8.1+ # Laravel 8 supports PHP 7.3 - 8.1 - - {laravel-version: "8.*", php-version: "7.1"} # Laravel 8 requires 7.3+ - {laravel-version: "8.*", php-version: "7.2"} # Laravel 8 requires 7.3+ - # Laravel 9 supports PHP 7.3 - 8.1 - - {laravel-version: "9.*", php-version: "7.1"} # Laravel 9 requires 8.0+ + # Laravel 9 supports PHP 8.0 - 8.1 - {laravel-version: "9.*", php-version: "7.2"} # Laravel 9 requires 8.0+ - {laravel-version: "9.*", php-version: "7.3"} # Laravel 9 requires 8.0+ - {laravel-version: "9.*", php-version: "7.4"} # Laravel 9 requires 8.0+ + # Laravel 10 supports PHP 8.1 - 8.2 + - {laravel-version: "10.*", php-version: "7.2"} # Laravel 10 requires 8.1+ + - {laravel-version: "10.*", php-version: "7.3"} # Laravel 10 requires 8.1+ + - {laravel-version: "10.*", php-version: "7.4"} # Laravel 10 requires 8.1+ + - {laravel-version: "10.*", php-version: "8.0"} # Laravel 10 requires 8.1+ steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: "Install PHP" uses: shivammathur/setup-php@v2 with: diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index d18a3ba..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,462 +0,0 @@ -# Changelog - -All notable changes to this project will be documented in this file, in reverse chronological order by release. - -# THE CHANGELOG HAS MOVED - -Please see [the releases page](https://github.com/scoutapp/scout-apm-laravel/releases) for release 2.3.0 onwards. - -## 2.2.0 - 2022-03-08 - -### Added - -- Nothing. - -### Changed - -- [#84](https://github.com/scoutapp/scout-apm-laravel/pull/84) Updated to require `scout-apm-php` ^8.0 (Laravel 9 support) - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - -## 2.1.0 - 2022-01-19 - -### Added - -- Nothing. - -### Changed - -- [#81](https://github.com/scoutapp/scout-apm-laravel/pull/81) Updated to require `scout-apm-php` ^7.0 - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - -## 2.0.0 - 2021-02-23 - -### Added - -- Nothing. - -### Changed - -- [#74](https://github.com/scoutapp/scout-apm-laravel/pull/74) Updated to `scout-apm-php` ^6.0 - - `scout-apm-laravel` is now a meta package only, which defines which versions of Laravel we support. You should - still use this package directly if you use Laravel to ensure you are running a compatible Laravel version. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - -## 1.8.0 - 2020-12-16 - -### Added - -- Nothing. - -### Changed - -- [#69](https://github.com/scoutapp/scout-apm-laravel/pull/69) Updated to `scout-apm-php` ^5.3.0 - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - -## 1.7.0 - 2020-11-10 - -### Added - -- [#68](https://github.com/scoutapp/scout-apm-laravel/pull/68) Documentation on Composer v2 + PHP 7.1-7.3 support -- [#67](https://github.com/scoutapp/scout-apm-laravel/pull/67) Documentation for log level in `README.md` - -### Changed - -- Nothing. - -### Deprecated - -- [#68](https://github.com/scoutapp/scout-apm-laravel/pull/68) Require `scoutapp/scout-apm-php:^5.1`. - - Note, if you use any of the `Span::INSTRUMENT_*` constants, these are deprecated, you should now use the - new `SpanReference::INSTRUMENT_*` constants. We plan to remove the `Span::INSTRUMENT_*` constants with the release - of `scout-apm-php:6.0.0`. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - -## 1.6.0 - 2020-09-11 - -### Added - -- [#64](https://github.com/scoutapp/scout-apm-laravel/pull/64) Added support for Laravel ^8.0 - -### Changed - -- [#63](https://github.com/scoutapp/scout-apm-laravel/pull/63) Require `scoutapp/scout-apm-php:^5.0.0`. - - *NOTE* there [are upstream BC breaks](https://github.com/scoutapp/scout-apm-php/releases/tag/v5.0.0) - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - -## 1.5.0 - 2020-05-28 - -### Added - -- Nothing. - -### Changed - -- [#59](https://github.com/scoutapp/scout-apm-laravel/pull/59) Updated to use scout-apm-php:^4.4 to solve ramsey/uuid v4 issues - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - -## 1.4.0 - 2020-05-27 - -### Added - -- [#56](https://github.com/scoutapp/scout-apm-laravel/pull/56) Added support for ramsey/uuid ^4.0 - -### Changed - -- [#57](https://github.com/scoutapp/scout-apm-laravel/pull/57) Switched to using GitHub Actions instead of Travis - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - -## 1.3.0 - 2020-03-17 - -### Added - -- [#51](https://github.com/scoutapp/scout-apm-laravel/pull/51) Added support for Laravel 7.x series - -### Changed - -- [#52](https://github.com/scoutapp/scout-apm-laravel/pull/52) Require minimum ^4.2 for scout-apm-php to upgrade to core-agent 1.2.8 - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - -## 1.2.3 - 2020-01-09 - -### Added - -- Nothing. - -### Changed - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- [#46](https://github.com/scoutapp/scout-apm-laravel/pull/46) Fixed bug with interaction with blade directives from third party plugins - -## 1.2.2 - 2020-01-09 - -### Added - -- [#44](https://github.com/scoutapp/scout-apm-laravel/pull/44) Added configuration to disable Laravel Queues instrumentation, `disabled_instruments=["laravel_queues"]` - -### Changed - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - -## 1.2.1 - 2019-12-31 - -### Added - -- [#42](https://github.com/scoutapp/scout-apm-laravel/pull/42) Configure Laravel framework name and version automatically - -### Changed - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - -## 1.2.0 - 2019-12-19 - -### Added - -- [#36](https://github.com/scoutapp/scout-apm-laravel/pull/36), [#40](https://github.com/scoutapp/scout-apm-laravel/pull/40) Added support for Laravel Queues -- [#39](https://github.com/scoutapp/scout-apm-laravel/pull/39) Uncaught exceptions now cause the `error` tag to be added to the request - -### Changed - -- [#38](https://github.com/scoutapp/scout-apm-laravel/pull/38) **[BC]** Renamed Scout APM's config file to `scout_apm.php` - if you use this, you will need to rename yours too (#38) - - This was done to avoid a conflict with [Laravel Scout](https://laravel.com/docs/6.x/scout) configuration. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - -## 1.1.0 - 2019-12-09 - -### Added - -- Nothing. - -### Changed - -- [#32](https://github.com/scoutapp/scout-apm-laravel/pull/32) Support for PHP 7.4 -- [#34](https://github.com/scoutapp/scout-apm-laravel/pull/34) Use Laravel's Config Repository for Scout configuration, so that config can now be cached - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - -## 1.0.0 - 2019-12-04 - -### Added - -- Nothing. - -### Changed - -- Required `scoutapp/scout-apm-php` at `^2.0` -- Use Laravel's Cache, if configured, for the agent to cache metadata -- Removed duplicate `[Scout]` text from log messages - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - -## 0.2.3 - 2019-10-07 - -### Added - -- Nothing. - -### Changed - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- [#21](https://github.com/scoutapp/scout-apm-laravel/pull/21) Type mismatch in JsonResponse Middlewares - -## 0.2.2 - 2019-09-26 - -### Added - -- Nothing. - -### Changed - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- CoreAgent now only connects during web requests, not other situations -- Updates to underlying scout-apm-php v0.2.2 - -## 0.2.1 - 2019-09-25 - -### Added - -- Lots of changes to make the agent more ergonomic -- Updates to underlying scout-apm-php v0.2.1 - -### Changed - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - -## 0.2.0 - 2019-08-23 - -### Added - -- [#4](https://github.com/scoutapp/scout-apm-laravel/pull/4) View instrumentation for Blade, PHP, and File engines -- [#6](https://github.com/scoutapp/scout-apm-laravel/pull/6) Licensed as MIT - -### Changed - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - -## 0.1.1 - 2019-08-23 - -### Added - -- Initial Release. See documentation at https://docs.scoutapm.com - -### Changed - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. diff --git a/README.md b/README.md index 15114e8..e52796f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Detailed performance metrics and transaction traces are collected once the scout ## Requirements -* PHP Version: PHP 7.2+ (PHP 8.1+ recommended) +* PHP Version: PHP 7.2+ (PHP 8.2+ recommended) * Laravel Version: 5.5+ ## Quick Start @@ -22,23 +22,6 @@ Then use Laravel's `artisan vendor:publish` to ensure configuration can be cache php artisan vendor:publish --provider="Scoutapm\Laravel\Providers\ScoutApmServiceProvider" ``` -#### Composer 2 and PHP 7.1-7.3 support - -If you are using PHP 7.1, 7.2, or 7.3, *and* you have started using Composer v2, please read this. -`scoutapp/scout-apm-php` depends on a package called `ocramius/package-versions`. However, this package only provides -support for the new Composer 2 series in version 1.8 or above, which requires PHP 7.4 as a minimum. If you are using -PHP 7.1-7.3, and you would like to use Composer 2, you have the following options: - - - Upgrade to PHP 7.4 (this is the recommended approach!) - - Don't use Composer 2 (stick to Composer 1) - - Require the polyfill `composer/package-versions-deprecated` (provides support for Composer 2 in PHP 7.1-7.3) - -If you opt to use the polyfill, you would install both packages, for example: - -```bash -composer require scoutapp/scout-apm-laravel composer/package-versions-deprecated -``` - ### Configuration In your `.env` file, make sure you set a few configuration variables: diff --git a/composer.json b/composer.json index e10552e..e0a1524 100644 --- a/composer.json +++ b/composer.json @@ -12,16 +12,20 @@ "development" ], "require": { - "illuminate/contracts": "^5.5.0|^6.0|^7.0|^8.0|^9.0", - "illuminate/http": "^5.5.0|^6.0|^7.0|^8.0|^9.0", - "illuminate/routing": "^5.5.0|^6.0|^7.0|^8.0|^9.0", - "illuminate/support": "^5.5.0|^6.0|^7.0|^8.0|^9.0", - "illuminate/view": "^5.5.0|^6.0|^7.0|^8.0|^9.0", + "illuminate/contracts": "^5.5.0|^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/http": "^5.5.0|^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/routing": "^5.5.0|^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/support": "^5.5.0|^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/view": "^5.5.0|^6.0|^7.0|^8.0|^9.0|^10.0", "scoutapp/scout-apm-php": "^8.0" }, "config": { "preferred-install": "dist", "optimize-autoloader": true, - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "php-http/discovery": true, + "kylekatarnls/update-helper": true + } } }