Skip to content

Commit a08d7b2

Browse files
alexmerlinalexmerlin
authored
Merge pull request #58 from dotkernel/issue-56
Issue #56: Remove PHP 8.1 and add PHP 8.4 & 8.5 support
2 parents f8165e0 + 8421619 commit a08d7b2

File tree

9 files changed

+83
-48
lines changed

9 files changed

+83
-48
lines changed

‎.github/workflows/codecov.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
- "8.2"
1919
- "8.3"
2020
- "8.4"
21+
- "8.5"
2122

2223
steps:
2324
- name: Checkout

‎.github/workflows/static-analysis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
- "8.2"
1919
- "8.3"
2020
- "8.4"
21+
- "8.5"
2122

2223
steps:
2324
- name: Checkout

‎README.md‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,23 @@
22

33
dot-errorhandler is Dotkernel's PSR-15 compliant error handler.
44

5+
## Version History
6+
7+
| Branch | Release | Service Manager | Log style implementation | PHP Version |
8+
|--------|----------|-------------------|--------------------------|------------------------------------------------------------------------------------------------------------------|
9+
| 4.1 | >= 4.2.0 | Service Manager 4 | PSR-Log | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/4.4.0) |
10+
| 4.1 | < 4.2.0 | Service Manager 4 | Laminas Log style | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/4.1.1) |
11+
| 4.0 | < 4.1.0 | Service Manager 3 | Laminas Log style | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/4.0.1) |
12+
| 3.0 | < 4.0.0 | Service Manager 3 | Laminas Log | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/3.4.1) |
13+
514
## Documentation
615

716
Documentation is available at: https://docs.dotkernel.org/dot-errorhandler/
817

918
## Badges
1019

1120
![OSS Lifecycle](https://img.shields.io/osslifecycle/dotkernel/dot-errorhandler)
12-
![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/4.3.0)
21+
![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/4.4.0)
1322

1423
[![GitHub issues](https://img.shields.io/github/issues/dotkernel/dot-errorhandler)](https://github.com/dotkernel/dot-errorhandler/issues)
1524
[![GitHub forks](https://img.shields.io/github/forks/dotkernel/dot-errorhandler)](https://github.com/dotkernel/dot-errorhandler/network)
@@ -45,18 +54,16 @@ In `config/autoload/error-handling.global.php`:
4554

4655
use Dot\ErrorHandler\ErrorHandlerInterface;
4756
use Dot\ErrorHandler\LogErrorHandler;
48-
use Dot\ErrorHandler\ErrorHandler;
4957

5058
return [
5159
'dependencies' => [
5260
'aliases' => [
5361
ErrorHandlerInterface::class => LogErrorHandler::class,
54-
]
55-
62+
],
5663
],
5764
'dot-errorhandler' => [
5865
'loggerEnabled' => true,
59-
'logger' => 'dot-log.default_logger'
66+
'logger' => 'dot-log.default_logger',
6067
]
6168
];
6269
```
@@ -71,26 +78,26 @@ When configuring the error handler in your application, you can choose between t
7178
> Both `LogErrorHandler` and `ErrorHandler` have factories declared in the package's `ConfigProvider`.
7279
> If you need a custom ErrorHandler, it must have a factory declared in the config, as in the below example:
7380
81+
Example:
82+
7483
```php
7584
<?php
7685

77-
use Dot\ErrorHandler\ErrorHandlerInterface;
78-
use Custom\MyErrorHandler;
79-
use Custom\MyErrorHandlerFactory;
86+
declare(strict_types=1);
8087

8188
return [
82-
'dependencies' => [
89+
'dependencies' => [
8390
'factories' => [
84-
MyErrorHandler::class => MyCustomHandlerFactory::class,
91+
\App\CustomErrorHandler::class => \App\CustomHandlerFactory::class,
8592
],
8693
'aliases' => [
87-
ErrorHandlerInterface::class => MyErrorHandler::class,
88-
]
94+
\Dot\ErrorHandler\ErrorHandlerInterface::class => \App\CustomErrorHandler::class,
95+
],
8996
],
9097
'dot-errorhandler' => [
9198
'loggerEnabled' => true,
92-
'logger' => 'dot-log.default_logger',
93-
]
99+
'logger' => 'dot-log.default_logger',
100+
],
94101
];
95102
```
96103

‎SECURITY.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
| Version | Supported | PHP Version |
66
|---------|--------------------|------------------------------------------------------------------------------------------------------------------|
7-
| 4.x | :white_check_mark: | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/4.0.0) |
8-
| 3.x | :white_check_mark: | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/3.3.2) |
7+
| 4.x | :white_check_mark: | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/4.4.0) |
8+
| 3.x | :white_check_mark: | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/3.4.1) |
99
| <= 2.x | :x: | |
1010

1111
## Reporting Potential Security Issues

‎composer.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
}
2323
},
2424
"require": {
25-
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
25+
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
2626
"dotkernel/dot-log": "^5.0",
27-
"laminas/laminas-diactoros": "^3.5",
28-
"laminas/laminas-stdlib": "^3.20",
29-
"laminas/laminas-stratigility": "^3.13",
30-
"mezzio/mezzio": "^3.20.1",
27+
"laminas/laminas-diactoros": "^3.8.0",
28+
"laminas/laminas-stdlib": "^3.21",
29+
"laminas/laminas-stratigility": "^4.3.0",
30+
"mezzio/mezzio": "^3.24",
3131
"psr/http-message": "^1.0 || ^2.0",
3232
"psr/http-server-middleware": "^1.0.2"
3333
},

‎docs/book/v3/configuration.md‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ In **config/autoload/error-handling.global.php**:
99
```php
1010
<?php
1111

12+
declare(strict_types=1);
13+
1214
use Dot\ErrorHandler\ErrorHandlerInterface;
1315
use Dot\ErrorHandler\LogErrorHandler;
14-
use Dot\ErrorHandler\ErrorHandler;
1516

1617
return [
17-
'dependencies' => [
18+
'dependencies' => [
1819
'aliases' => [
1920
ErrorHandlerInterface::class => LogErrorHandler::class,
20-
]
21-
21+
],
2222
],
2323
'dot-errorhandler' => [
2424
'loggerEnabled' => true,
25-
'logger' => 'dot-log.default_logger'
25+
'logger' => 'dot-log.default_logger',
2626
]
2727
];
2828
```
@@ -40,23 +40,21 @@ When configuring the error handler in your application, you can choose between t
4040
```php
4141
<?php
4242

43-
use Dot\ErrorHandler\ErrorHandlerInterface;
44-
use Custom\MyErrorHandler;
45-
use Custom\MyErrorHandlerFactory;
43+
declare(strict_types=1);
4644

4745
return [
48-
'dependencies' => [
46+
'dependencies' => [
4947
'factories' => [
50-
MyErrorHandler::class => MyCustomHandlerFactory::class,
48+
\App\CustomErrorHandler::class => \App\CustomHandlerFactory::class,
5149
],
5250
'aliases' => [
53-
ErrorHandlerInterface::class => MyErrorHandler::class,
51+
\Dot\ErrorHandler\ErrorHandlerInterface::class => \App\CustomErrorHandler::class,
5452
],
5553
],
5654
'dot-errorhandler' => [
5755
'loggerEnabled' => true,
58-
'logger' => 'dot-log.default_logger',
59-
]
56+
'logger' => 'dot-log.default_logger',
57+
],
6058
];
6159
```
6260

‎docs/book/v3/overview.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,27 @@
22

33
`dot-errorhandler` is Dotkernel's logging error handler, providing two options:
44

5+
## Version History
6+
7+
| Branch | Release | Service Manager | Log style implementation | PHP Version |
8+
|--------|----------|-------------------|--------------------------|------------------------------------------------------------------------------------------------------------------|
9+
| 4.0 | < 4.1.0 | Service Manager 3 | Laminas Log style | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/4.0.1) |
10+
| 3.0 | < 4.0.0 | Service Manager 3 | Laminas Log | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/3.4.1) |
11+
12+
## Badges
13+
14+
![OSS Lifecycle](https://img.shields.io/osslifecycle/dotkernel/dot-errorhandler)
15+
![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/4.0.1)
16+
17+
[![GitHub issues](https://img.shields.io/github/issues/dotkernel/dot-errorhandler)](https://github.com/dotkernel/dot-errorhandler/issues)
18+
[![GitHub forks](https://img.shields.io/github/forks/dotkernel/dot-errorhandler)](https://github.com/dotkernel/dot-errorhandler/network)
19+
[![GitHub stars](https://img.shields.io/github/stars/dotkernel/dot-errorhandler)](https://github.com/dotkernel/dot-errorhandler/stargazers)
20+
[![GitHub license](https://img.shields.io/github/license/dotkernel/dot-errorhandler)](https://github.com/dotkernel/dot-errorhandler/blob/4.0/LICENSE)
21+
22+
[![Build Static](https://github.com/dotkernel/dot-errorhandler/actions/workflows/continuous-integration.yml/badge.svg?branch=4.0)](https://github.com/dotkernel/dot-errorhandler/actions/workflows/continuous-integration.yml)
23+
[![codecov](https://codecov.io/gh/dotkernel/dot-errorhandler/branch/4.0/graph/badge.svg?token=0KIJARS5RS)](https://codecov.io/gh/dotkernel/dot-errorhandler)
24+
[![PHPStan](https://github.com/dotkernel/dot-errorhandler/actions/workflows/static-analysis.yml/badge.svg?branch=4.0)](https://github.com/dotkernel/dot-errorhandler/actions/workflows/static-analysis.yml)
25+
526
## Features
627

728
This package provides two features:

‎docs/book/v4/configuration.md‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ In **config/autoload/error-handling.global.php**:
99
```php
1010
<?php
1111

12+
declare(strict_types=1);
13+
1214
use Dot\ErrorHandler\ErrorHandlerInterface;
1315
use Dot\ErrorHandler\LogErrorHandler;
14-
use Dot\ErrorHandler\ErrorHandler;
1516

1617
return [
17-
'dependencies' => [
18+
'dependencies' => [
1819
'aliases' => [
1920
ErrorHandlerInterface::class => LogErrorHandler::class,
20-
]
21-
21+
],
2222
],
2323
'dot-errorhandler' => [
2424
'loggerEnabled' => true,
25-
'logger' => 'dot-log.default_logger'
25+
'logger' => 'dot-log.default_logger',
2626
]
2727
];
2828
```
@@ -40,23 +40,21 @@ When configuring the error handler in your application, you can choose between t
4040
```php
4141
<?php
4242

43-
use Dot\ErrorHandler\ErrorHandlerInterface;
44-
use Custom\MyErrorHandler;
45-
use Custom\MyErrorHandlerFactory;
43+
declare(strict_types=1);
4644

4745
return [
48-
'dependencies' => [
46+
'dependencies' => [
4947
'factories' => [
50-
MyErrorHandler::class => MyCustomHandlerFactory::class,
48+
\App\CustomErrorHandler::class => \App\CustomHandlerFactory::class,
5149
],
5250
'aliases' => [
53-
ErrorHandlerInterface::class => MyErrorHandler::class,
51+
\Dot\ErrorHandler\ErrorHandlerInterface::class => \App\CustomErrorHandler::class,
5452
],
5553
],
5654
'dot-errorhandler' => [
5755
'loggerEnabled' => true,
58-
'logger' => 'dot-log.default_logger',
59-
]
56+
'logger' => 'dot-log.default_logger',
57+
],
6058
];
6159
```
6260

‎docs/book/v4/overview.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,19 @@
22

33
`dot-errorhandler` is Dotkernel's logging error handler, providing two options:
44

5+
## Version History
6+
7+
| Branch | Release | Service Manager | Log style implementation | PHP Version |
8+
|--------|----------|-------------------|--------------------------|------------------------------------------------------------------------------------------------------------------|
9+
| 4.1 | >= 4.2.0 | Service Manager 4 | PSR-Log | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/4.4.0) |
10+
| 4.1 | < 4.2.0 | Service Manager 4 | Laminas Log style | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/4.1.1) |
11+
| 4.0 | < 4.1.0 | Service Manager 3 | Laminas Log style | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/4.0.1) |
12+
| 3.0 | < 4.0.0 | Service Manager 3 | Laminas Log | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/3.4.1) |
13+
514
## Badges
615

716
![OSS Lifecycle](https://img.shields.io/osslifecycle/dotkernel/dot-errorhandler)
8-
![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/4.3.0)
17+
![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-errorhandler/4.4.0)
918

1019
[![GitHub issues](https://img.shields.io/github/issues/dotkernel/dot-errorhandler)](https://github.com/dotkernel/dot-errorhandler/issues)
1120
[![GitHub forks](https://img.shields.io/github/forks/dotkernel/dot-errorhandler)](https://github.com/dotkernel/dot-errorhandler/network)

0 commit comments

Comments
 (0)