Skip to content

Commit cb74ddd

Browse files
authored
Merge pull request #62 from understand/feature/laravel-10
Added Laravel 10 compatibility
2 parents 473bd64 + 17bc864 commit cb74ddd

File tree

5 files changed

+36
-9
lines changed

5 files changed

+36
-9
lines changed

.github/workflows/run-test.yml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ jobs:
77

88
strategy:
99
matrix:
10-
php: [8.1, 8.0, 7.4, 7.3, 7.2]
11-
laravel: [9.*, 8.*, 7.*, 6.*, 5.8.*, 5.7.*, 5.6.*, 5.5.*]
10+
php: [8.2, 8.1, 8.0, 7.4, 7.3, 7.2]
11+
laravel: [10.*, 9.*, 8.*, 7.*, 6.*, 5.8.*, 5.7.*, 5.6.*, 5.5.*]
1212

1313
include:
14+
- laravel: 10.*
15+
testbench: 8.*
1416
- laravel: 9.*
1517
testbench: 7.*
1618
- laravel: 8.*
@@ -29,6 +31,14 @@ jobs:
2931
testbench: 3.5.*
3032

3133
exclude:
34+
- php: 7.2
35+
laravel: 10.*
36+
- php: 7.3
37+
laravel: 10.*
38+
- php: 7.4
39+
laravel: 10.*
40+
- php: 8.0
41+
laravel: 10.*
3242
- php: 7.2
3343
laravel: 9.*
3444
- php: 7.3
@@ -37,22 +47,34 @@ jobs:
3747
laravel: 9.*
3848
- php: 7.2
3949
laravel: 8.*
50+
- php: 8.2
51+
laravel: 7.*
4052
- php: 8.1
4153
laravel: 7.*
54+
- php: 8.2
55+
laravel: 6.*
4256
- php: 8.1
4357
laravel: 6.*
58+
- php: 8.2
59+
laravel: 5.8.*
4460
- php: 8.1
4561
laravel: 5.8.*
4662
- php: 8.0
4763
laravel: 5.8.*
64+
- php: 8.2
65+
laravel: 5.7.*
4866
- php: 8.1
4967
laravel: 5.7.*
5068
- php: 8.0
5169
laravel: 5.7.*
70+
- php: 8.2
71+
laravel: 5.6.*
5272
- php: 8.1
5373
laravel: 5.6.*
5474
- php: 8.0
5575
laravel: 5.6.*
76+
- php: 8.2
77+
laravel: 5.5.*
5678
- php: 8.1
5779
laravel: 5.5.*
5880
- php: 8.0

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Laravel 5, 6, 7 and 8 integration for Understand.io
1+
## Laravel 5, 6, 7, 8, 9 and 10 integration for Understand.io
22

33
[![Latest Version on Packagist](https://img.shields.io/packagist/v/understand/understand-laravel5.svg?style=flat-square)](https://packagist.org/packages/understand/understand-laravel5)
44
[![Quality Score](https://img.shields.io/scrutinizer/g/understand/understand-laravel5.svg?style=flat-square)](https://scrutinizer-ci.com/g/understand/understand-laravel5)

composer.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "understand/understand-laravel",
3-
"description": "Laravel 5, 6, 7, 8 and 9 service provider for Understand.io",
3+
"description": "Laravel 5, 6, 7, 8, 9 and 10 service provider for Understand.io",
44
"keywords": ["laravel", "understand.io", "understand", "logs"],
55
"license": "MIT",
66
"authors": [
@@ -10,9 +10,9 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^5.5 || ^7.0 || ^8.0 || ^8.1",
13+
"php": "^5.5 || ^7.0 || ^8.0 || ^8.1 || ^8.2",
1414
"ext-curl": "*",
15-
"illuminate/support": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
15+
"illuminate/support": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0"
1616
},
1717
"require-dev": {
1818
"phpunit/phpunit": "^6.0 || ^7.0 || ^8.0 || ^9.0",
@@ -25,9 +25,14 @@
2525
"Understand\\UnderstandLaravel5\\": "src"
2626
}
2727
},
28+
"config": {
29+
"allow-plugins": {
30+
"kylekatarnls/update-helper": true
31+
}
32+
},
2833
"extra": {
2934
"component": "package",
30-
"frameworks": ["Laravel 5", "Laravel 6", "Laravel 7", "Laravel 8", "Laravel 9"],
35+
"frameworks": ["Laravel 5", "Laravel 6", "Laravel 7", "Laravel 8", "Laravel 9", "Laravel 10"],
3136
"branch-alias": {
3237
"dev-master": "2.0-dev"
3338
},

src/Understand/UnderstandLaravel5/Logger.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class Logger
99
/**
1010
* Version Number
1111
*/
12-
const VERSION = 2.5;
12+
const VERSION = 2.6;
1313

1414
/**
1515
* Field provider

tests/ExceptionEncoderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ protected function assertIncompleteClassStackTrace($exception, $index)
101101
$encoder = new Understand\UnderstandLaravel5\ExceptionEncoder();
102102
$stackTraceArray = $encoder->stackTraceToArray($exception->getTrace());
103103

104-
if (Str::startsWith(phpversion(), ['7.4', '8.0', '8.1'])) {
104+
if (Str::startsWith(phpversion(), ['7.4', '8.0', '8.1', '8.2'])) {
105105
// As of PHP 7.4 Exception::getTrace()
106106
// no longer contains "args" keys by default
107107
$this->assertSame([], $stackTraceArray[$index]['args']);

0 commit comments

Comments
 (0)