Skip to content

Commit 1472139

Browse files
alexmerlinalexmerlin
authored
Merge pull request #48 from dotkernel/issue-47
Issue #47: Remove PHP 8.1 and add PHP 8.4 & 8.5 support
2 parents 2556517 + e7d02b6 commit 1472139

11 files changed

Lines changed: 36 additions & 37 deletions

File tree

‎.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

‎.laminas-ci.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"ignore_php_platform_requirements": {
3-
"8.4": true
3+
"8.5": true
44
},
55
"backwardCompatibilityCheck": true
66
}

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Documentation is available at: https://docs.dotkernel.org/dot-cli/.
1111
## Badges
1212

1313
![OSS Lifecycle](https://img.shields.io/osslifecycle/dotkernel/dot-cli)
14-
![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-cli/3.9.0)
14+
![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-cli/3.10.0)
1515

1616
[![GitHub issues](https://img.shields.io/github/issues/dotkernel/dot-cli)](https://github.com/dotkernel/dot-cli/issues)
1717
[![GitHub forks](https://img.shields.io/github/forks/dotkernel/dot-cli)](https://github.com/dotkernel/dot-cli/network)
@@ -24,7 +24,7 @@ Documentation is available at: https://docs.dotkernel.org/dot-cli/.
2424

2525
## Requirements
2626

27-
- **PHP**: 8.2, 8.3 or 8.4
27+
- **PHP**: 8.2, 8.3, 8.4 or 8.5
2828
- **laminas/laminas-servicemanager**: >= 3.11 || >= 4.0,
2929
- **laminas/laminas-cli**: >= 1.4
3030

@@ -91,7 +91,7 @@ Available commands:
9191
As shown in `config/autoload/cli.global.php`, dot-cli includes a demo command `demo:command` that will help you understand the basics of creating a new command.
9292
For more information, see [laminas-cli documentation](https://docs.laminas.dev/laminas-cli/).
9393

94-
## Setting up as cronjob
94+
## Setting up as a cronjob
9595

9696
```text
9797
* * * * * /opt/plesk/php/7.4/bin/php /var/www/vhosts/example.com/httpdocs/bin/cli.php demo:command -q

‎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-cli/3.4.2) |
9-
| <= 2.x | :x: | |
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-cli/3.10.0) |
9+
| <= 2.x | :x: | |
1010

1111

1212
## Reporting Potential Security Issues

‎composer.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
}
2424
},
2525
"require": {
26-
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
26+
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
2727
"laminas/laminas-cli": "^1.4.0",
2828
"laminas/laminas-servicemanager": "^3.11.1 || ^4.0"
2929
},
@@ -35,8 +35,8 @@
3535
"require-dev": {
3636
"laminas/laminas-coding-standard": "^3.0",
3737
"mikey179/vfsstream": "^1.6.7",
38-
"phpstan/phpstan": "^2.1",
39-
"phpstan/phpstan-phpunit": "^2.0",
38+
"phpstan/phpstan": "^2.1.17",
39+
"phpstan/phpstan-phpunit": "^2.0.6",
4040
"phpunit/phpunit": "^10.2"
4141
},
4242
"autoload-dev": {
@@ -52,7 +52,8 @@
5252
],
5353
"cs-check": "phpcs",
5454
"cs-fix": "phpcbf",
55+
"static-analysis": "phpstan analyse --memory-limit 1G",
5556
"test": "phpunit --colors=always",
56-
"static-analysis": "phpstan analyse --memory-limit 1G"
57+
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
5758
}
5859
}

‎docs/book/v3/overview.md‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
# Overview
22

3-
Dotkernel component to build console applications based on [laminas-cli](https://github.com/laminas/laminas-cli).
4-
3+
> [!IMPORTANT]
54
> dot-cli is a wrapper on top of [laminas-cli](https://github.com/laminas/laminas-cli)
65
7-
## Badges
8-
96
![OSS Lifecycle](https://img.shields.io/osslifecycle/dotkernel/dot-cli)
10-
![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-cli/3.9.0)
7+
![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/dot-cli/3.10.0)
118

129
[![GitHub issues](https://img.shields.io/github/issues/dotkernel/dot-cli)](https://github.com/dotkernel/dot-cli/issues)
1310
[![GitHub forks](https://img.shields.io/github/forks/dotkernel/dot-cli)](https://github.com/dotkernel/dot-cli/network)
@@ -16,4 +13,3 @@ Dotkernel component to build console applications based on [laminas-cli](https:/
1613

1714
[![Build Static](https://github.com/dotkernel/dot-cli/actions/workflows/continuous-integration.yml/badge.svg?branch=3.0)](https://github.com/dotkernel/dot-cli/actions/workflows/continuous-integration.yml)
1815
[![codecov](https://codecov.io/gh/dotkernel/dot-cli/graph/badge.svg?token=0DFCK2GUBT)](https://codecov.io/gh/dotkernel/dot-cli)
19-
[![PHPStan](https://github.com/dotkernel/dot-cli/actions/workflows/static-analysis.yml/badge.svg?branch=3.0)](https://github.com/dotkernel/dot-cli/actions/workflows/static-analysis.yml)

‎docs/book/v3/setting-up-as-cronjob.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Setting up as cronjob
1+
# Setting up as a cronjob
22

33
```text
44
* * * * * php /var/www/vhosts/example.com/httpdocs/bin/cli.php demo:command -q

‎docs/book/v3/usage.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Usage
22

33
Use `src/Command/DemoCommand.php` as an example when creating a new command.
4-
Update the name & description in the `AsCommand` attribute as needed.
4+
Update the name and description in the `AsCommand` attribute as needed.
55
Also update the `$defaultName` property and the description set inside the `configure` method to match the `AsCommand` attribute.
66

77
## Running

‎test/Command/DemoCommandTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class DemoCommandTest extends TestCase
2020
public function testWillCreateCommand(): void
2121
{
2222
$command = new DemoCommand();
23-
$this->assertSame(DemoCommand::class, $command::class);
23+
$this->assertContainsOnlyInstancesOf(DemoCommand::class, [$command]);
2424
}
2525

2626
/**

0 commit comments

Comments
 (0)