From 7461cf77033e941dd9d12eb1c1238f6d79eec4f3 Mon Sep 17 00:00:00 2001 From: mauricius Date: Tue, 28 Mar 2023 09:25:47 +0200 Subject: [PATCH 1/3] Added Laravel 10 compatibility --- .github/workflows/run-test.yml | 14 ++++++++++++-- README.md | 2 +- composer.json | 8 ++++---- src/Understand/UnderstandLaravel5/Logger.php | 2 +- tests/ExceptionEncoderTest.php | 2 +- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml index 643641b..a315b68 100644 --- a/.github/workflows/run-test.yml +++ b/.github/workflows/run-test.yml @@ -7,10 +7,12 @@ jobs: strategy: matrix: - php: [8.1, 8.0, 7.4, 7.3, 7.2] - laravel: [9.*, 8.*, 7.*, 6.*, 5.8.*, 5.7.*, 5.6.*, 5.5.*] + php: [8.2, 8.1, 8.0, 7.4, 7.3, 7.2] + laravel: [10.*, 9.*, 8.*, 7.*, 6.*, 5.8.*, 5.7.*, 5.6.*, 5.5.*] include: + - laravel: 10.* + testbench: 8.* - laravel: 9.* testbench: 7.* - laravel: 8.* @@ -29,6 +31,14 @@ jobs: testbench: 3.5.* exclude: + - php: 7.2 + laravel: 10.* + - php: 7.3 + laravel: 10.* + - php: 7.4 + laravel: 10.* + - php: 8.0 + laravel: 10.* - php: 7.2 laravel: 9.* - php: 7.3 diff --git a/README.md b/README.md index 571a9d0..9ca2462 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## Laravel 5, 6, 7 and 8 integration for Understand.io +## Laravel 5, 6, 7, 8, 9 and 10 integration for Understand.io [![Latest Version on Packagist](https://img.shields.io/packagist/v/understand/understand-laravel5.svg?style=flat-square)](https://packagist.org/packages/understand/understand-laravel5) [![Quality Score](https://img.shields.io/scrutinizer/g/understand/understand-laravel5.svg?style=flat-square)](https://scrutinizer-ci.com/g/understand/understand-laravel5) diff --git a/composer.json b/composer.json index 5983c9a..849718c 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "understand/understand-laravel", - "description": "Laravel 5, 6, 7, 8 and 9 service provider for Understand.io", + "description": "Laravel 5, 6, 7, 8, 9 and 10 service provider for Understand.io", "keywords": ["laravel", "understand.io", "understand", "logs"], "license": "MIT", "authors": [ @@ -10,9 +10,9 @@ } ], "require": { - "php": "^5.5 || ^7.0 || ^8.0 || ^8.1", + "php": "^5.5 || ^7.0 || ^8.0 || ^8.1 || ^8.2", "ext-curl": "*", - "illuminate/support": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" + "illuminate/support": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0" }, "require-dev": { "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0 || ^9.0", @@ -27,7 +27,7 @@ }, "extra": { "component": "package", - "frameworks": ["Laravel 5", "Laravel 6", "Laravel 7", "Laravel 8", "Laravel 9"], + "frameworks": ["Laravel 5", "Laravel 6", "Laravel 7", "Laravel 8", "Laravel 9", "Laravel 10"], "branch-alias": { "dev-master": "2.0-dev" }, diff --git a/src/Understand/UnderstandLaravel5/Logger.php b/src/Understand/UnderstandLaravel5/Logger.php index d97f48f..90b0718 100644 --- a/src/Understand/UnderstandLaravel5/Logger.php +++ b/src/Understand/UnderstandLaravel5/Logger.php @@ -9,7 +9,7 @@ class Logger /** * Version Number */ - const VERSION = 2.5; + const VERSION = 2.6; /** * Field provider diff --git a/tests/ExceptionEncoderTest.php b/tests/ExceptionEncoderTest.php index 5751164..2a2b8fb 100644 --- a/tests/ExceptionEncoderTest.php +++ b/tests/ExceptionEncoderTest.php @@ -101,7 +101,7 @@ protected function assertIncompleteClassStackTrace($exception, $index) $encoder = new Understand\UnderstandLaravel5\ExceptionEncoder(); $stackTraceArray = $encoder->stackTraceToArray($exception->getTrace()); - if (Str::startsWith(phpversion(), ['7.4', '8.0', '8.1'])) { + if (Str::startsWith(phpversion(), ['7.4', '8.0', '8.1', '8.2'])) { // As of PHP 7.4 Exception::getTrace() // no longer contains "args" keys by default $this->assertSame([], $stackTraceArray[$index]['args']); From fed95fce6e631d513652c6b4cc163e1476a92374 Mon Sep 17 00:00:00 2001 From: mauricius Date: Tue, 28 Mar 2023 09:35:49 +0200 Subject: [PATCH 2/3] Exclude some tests --- .github/workflows/run-test.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml index a315b68..afe0854 100644 --- a/.github/workflows/run-test.yml +++ b/.github/workflows/run-test.yml @@ -47,22 +47,34 @@ jobs: laravel: 9.* - php: 7.2 laravel: 8.* + - php: 8.2 + laravel: 7.* - php: 8.1 laravel: 7.* + - php: 8.2 + laravel: 6.* - php: 8.1 laravel: 6.* + - php: 8.2 + laravel: 5.8.* - php: 8.1 laravel: 5.8.* - php: 8.0 laravel: 5.8.* + - php: 8.2 + laravel: 5.7.* - php: 8.1 laravel: 5.7.* - php: 8.0 laravel: 5.7.* + - php: 8.2 + laravel: 5.6.* - php: 8.1 laravel: 5.6.* - php: 8.0 laravel: 5.6.* + - php: 8.2 + laravel: 5.5.* - php: 8.1 laravel: 5.5.* - php: 8.0 From 17bc86488cbbf3dc52506b7e003b1b7494dc1998 Mon Sep 17 00:00:00 2001 From: mauricius Date: Tue, 28 Mar 2023 09:35:56 +0200 Subject: [PATCH 3/3] Allow plugin --- composer.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/composer.json b/composer.json index 849718c..91a6bef 100644 --- a/composer.json +++ b/composer.json @@ -25,6 +25,11 @@ "Understand\\UnderstandLaravel5\\": "src" } }, + "config": { + "allow-plugins": { + "kylekatarnls/update-helper": true + } + }, "extra": { "component": "package", "frameworks": ["Laravel 5", "Laravel 6", "Laravel 7", "Laravel 8", "Laravel 9", "Laravel 10"],