Skip to content

Commit 99fc5e9

Browse files
authored
Merge pull request #85 from dotkernel/issue-82
Issue #82: Remove PHP 8.1 and add PHP 8.4 & 8.5 support
2 parents e54eedf + 4a6d5d5 commit 99fc5e9

54 files changed

Lines changed: 147 additions & 615 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/codecov.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ jobs:
1515
- ubuntu-latest
1616

1717
php:
18-
- "8.1"
1918
- "8.2"
2019
- "8.3"
20+
- "8.4"
21+
- "8.5"
2122

2223
steps:
2324
- name: Checkout

‎.github/workflows/docs-build.yml‎

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
on:
2+
- push
3+
4+
name: Run PHPStan checks
5+
6+
jobs:
7+
mutation:
8+
name: PHPStan ${{ matrix.php }}-${{ matrix.os }}
9+
10+
runs-on: ${{ matrix.os }}
11+
12+
strategy:
13+
matrix:
14+
os:
15+
- ubuntu-latest
16+
17+
php:
18+
- "8.2"
19+
- "8.3"
20+
- "8.4"
21+
- "8.5"
22+
23+
steps:
24+
- name: Checkout
25+
uses: actions/checkout@v4
26+
27+
- name: Install PHP
28+
uses: shivammathur/setup-php@v2
29+
with:
30+
php-version: "${{ matrix.php }}"
31+
coverage: pcov
32+
ini-values: assert.exception=1, zend.assertions=1, error_reporting=-1, log_errors_max_len=0, display_errors=On
33+
tools: composer:v2, cs2pr
34+
35+
- name: Determine composer cache directory
36+
run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV
37+
38+
- name: Cache dependencies installed with composer
39+
uses: actions/cache@v4
40+
with:
41+
path: ${{ env.COMPOSER_CACHE_DIR }}
42+
key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
43+
restore-keys: |
44+
php${{ matrix.php }}-composer-
45+
46+
- name: Install dependencies with composer
47+
run: composer install --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
48+
49+
- name: Run static analysis with PHPStan
50+
run: vendor/bin/phpstan analyse

‎.laminas-ci.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"ignore_php_platform_requirements": {
3+
"8.5": true
4+
}
5+
}

‎README.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# dot-log
22

33
![OSS Lifecycle](https://img.shields.io/osslifecycle/dotkernel/dot-log)
4-
![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-log/4.0.0)
4+
![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-log/4.0.5)
55

66
[![GitHub issues](https://img.shields.io/github/issues/dotkernel/dot-log)](https://github.com/dotkernel/dot-log/issues)
77
[![GitHub forks](https://img.shields.io/github/forks/dotkernel/dot-log)](https://github.com/dotkernel/dot-log/network)
@@ -10,8 +10,7 @@
1010

1111
[![Build Static](https://github.com/dotkernel/dot-log/actions/workflows/continuous-integration.yml/badge.svg?branch=4.0)](https://github.com/dotkernel/dot-log/actions/workflows/continuous-integration.yml)
1212
[![codecov](https://codecov.io/gh/dotkernel/dot-log/graph/badge.svg?token=JX19KTBRCZ)](https://codecov.io/gh/dotkernel/dot-log)
13-
14-
[![SymfonyInsight](https://insight.symfony.com/projects/287e81e8-b4fb-4452-bd8f-4f12c0ab1f76/big.svg)](https://insight.symfony.com/projects/287e81e8-b4fb-4452-bd8f-4f12c0ab1f76)
13+
[![PHPStan](https://github.com/dotkernel/dot-log/actions/workflows/static-analysis.yml/badge.svg?branch=4.0)](https://github.com/dotkernel/dot-log/actions/workflows/static-analysis.yml)
1514

1615
## Adding The Config Provider
1716

@@ -75,7 +74,7 @@ Examples:
7574
* `log/dk-{Y}-{m}-{d}.log` will write every day to a different file (eg: `log/dk-2021-01-01.log`)
7675
* `log/dk-{Y}-{W}.log` will write every week to a different file (eg: `log/dk-2021-10.log`)
7776

78-
The full list of format specifiers is available [here](https://www.php.net/manual/en/datetime.format.php).
77+
The full list of format specifiers is available [on php.net in the `DateTimeInterface::format` documentation](https://www.php.net/manual/en/datetime.format.php).
7978

8079
## Filtering log messages
8180

‎SECURITY.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
## Supported Versions
44

55

6-
| Version | Supported | PHP Version |
7-
|---------|--------------------|----------------------------------------------------------------------------------------------------|
8-
| 3.x | :white_check_mark: | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-log/3.4.7) |
9-
| <= 2.x | :x: | |
6+
| Version | Supported | PHP Version |
7+
|---------|--------------------|---------------------------------------------------------------------------------------------------------|
8+
| 4.x | :white_check_mark: | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-log/4.0.5) |
9+
| <= 3.x | :x: | |
1010

1111

1212
## Reporting Potential Security Issues

‎composer.json‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "dotkernel/dot-log",
33
"type": "library",
4-
"description": "DotKernel log component extending and customizing laminas-log",
4+
"description": "Dotkernel log component extending and customizing laminas-log",
55
"license": "MIT",
66
"homepage": "https://github.com/dotkernel/dot-log",
77
"keywords": [
@@ -14,19 +14,20 @@
1414
],
1515
"authors": [
1616
{
17-
"name": "DotKernel Team",
17+
"name": "Dotkernel Team",
1818
"email": "team@dotkernel.com"
1919
}
2020
],
2121
"require": {
22-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
22+
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
2323
"laminas/laminas-servicemanager": "^3.22",
2424
"laminas/laminas-validator": "^2.64"
2525
},
2626
"require-dev": {
27-
"phpunit/phpunit": "^10.2",
28-
"laminas/laminas-coding-standard": "^2.5",
29-
"vimeo/psalm": "^5.13"
27+
"laminas/laminas-coding-standard": "^3.0",
28+
"phpstan/phpstan": "^2.1.17",
29+
"phpstan/phpstan-phpunit": "^2.0.6",
30+
"phpunit/phpunit": "^10.2"
3031
},
3132
"autoload": {
3233
"psr-4": {
@@ -48,12 +49,12 @@
4849
"scripts": {
4950
"check": [
5051
"@cs-check",
51-
"@test"
52+
"@test",
53+
"@static-analysis"
5254
],
5355
"cs-check": "phpcs",
5456
"cs-fix": "phpcbf",
55-
"test": "phpunit --colors=always",
56-
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
57-
"static-analysis": "psalm --shepherd --stats"
57+
"static-analysis": "phpstan analyse --memory-limit 1G",
58+
"test": "phpunit --colors=always"
5859
}
5960
}

‎docs/book/index.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/book/v3/adding-config-provider.md‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎docs/book/v3/configuring-writer.md‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)