Skip to content

Commit 92d59cc

Browse files
authored
Merge branch '1.x' into dependabot/github_actions/ramsey/composer-install-3
2 parents 423a49e + ed956ea commit 92d59cc

File tree

7 files changed

+22
-11
lines changed

7 files changed

+22
-11
lines changed

.github/dependabot.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,7 @@ updates:
55
schedule:
66
interval: weekly
77
open-pull-requests-limit: 103
8+
- package-ecosystem: "composer"
9+
directory: "/"
10+
schedule:
11+
interval: weekly

.github/workflows/static-analysis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@v2
29+
uses: actions/checkout@v4
3030
- name: Setup PHP
3131
uses: shivammathur/setup-php@v2
3232
with:

.github/workflows/tests.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,17 @@ jobs:
1818
strategy:
1919
matrix:
2020
php:
21+
- '8.3'
2122
- '8.2'
2223
- '8.1'
2324
- '8.0'
2425
- '7.4'
2526
symfony: ['']
2627
experimental: [false]
2728
include:
29+
- symfony: '^6.4'
30+
os: 'ubuntu-latest'
31+
php: '8.2'
2832
- symfony: '^5.4'
2933
os: 'ubuntu-latest'
3034
php: '7.4'
@@ -40,7 +44,7 @@ jobs:
4044

4145
steps:
4246
- name: Checkout
43-
uses: actions/checkout@v2
47+
uses: actions/checkout@v4
4448
with:
4549
fetch-depth: 2 # needed by codecov sometimes
4650
- name: Setup PHP

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
77
## Unreleased
88
* ...
99

10+
## 1.2.2 [2024-03-17]
11+
* Add Symfony 7 support (#14)
12+
1013
## 1.2.1 [2023-08-23]
1114
* Adds support for SIGQUIT signal (needed to support php-fpm-alpine docker images which overrides STOPSIGNAL ([Official Dockerfile](https://github.com/docker-library/php/blob/master/8.2/alpine3.18/fpm/Dockerfile#L259)))
1215

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@
3232
"require": {
3333
"php": "^7.4 | ^8.0",
3434
"ext-pcntl": "*",
35-
"symfony/console": "^4.4 | ^5.4 | ^6.0"
35+
"symfony/console": "^4.4 | ^5.4 | ^6.0 | ^7.0"
3636
},
3737
"require-dev": {
38-
"facile-it/facile-coding-standard": "^0.5.2",
38+
"facile-it/facile-coding-standard": "^1.2",
3939
"jangregor/phpstan-prophecy": "^1.0.0",
4040
"phpstan/extension-installer": "^1.1",
4141
"phpstan/phpstan": "^1.10",
4242
"phpstan/phpstan-phpunit": "^1.3",
4343
"phpunit/phpunit": "^9.6.6",
4444
"phpspec/prophecy-phpunit": "^2.0",
45-
"symfony/phpunit-bridge": "^5.2",
46-
"vimeo/psalm": "^4.6"
45+
"symfony/phpunit-bridge": "^6.4 || ^7.0",
46+
"vimeo/psalm": "^4.6 || ^5.0"
4747
}
4848
}

tests/Stub/StubTerminableCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ protected function commandBody(InputInterface $input, OutputInterface $output):
4141
$output->writeln('No sleep');
4242
}
4343

44-
return 1; //force exit from bash
44+
return 1; // force exit from bash
4545
}
4646

4747
/**

tests/Unit/AbstractTerminableCommandTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ protected function tearDown(): void
2929

3030
public function testSetSleepDuration(): void
3131
{
32-
$stubCommand = new class('dummy:command') extends AbstractTerminableCommand {
32+
$stubCommand = new class ('dummy:command') extends AbstractTerminableCommand {
3333
protected function commandBody(InputInterface $input, OutputInterface $output): int
3434
{
3535
$this->setSleepDuration(100);
@@ -60,7 +60,7 @@ protected function commandBody(InputInterface $input, OutputInterface $output):
6060

6161
public function testSetSleepDurationWithNegativeValue(): void
6262
{
63-
$stubCommand = new class('dummy:command') extends AbstractTerminableCommand {
63+
$stubCommand = new class ('dummy:command') extends AbstractTerminableCommand {
6464
protected function commandBody(InputInterface $input, OutputInterface $output): int
6565
{
6666
$this->setSleepDuration(-1);
@@ -83,7 +83,7 @@ protected function commandBody(InputInterface $input, OutputInterface $output):
8383
*/
8484
public function testReceiveSignalDuringCommandBody(int $signal): void
8585
{
86-
$stubCommand = new class($signal) extends AbstractTerminableCommand {
86+
$stubCommand = new class ($signal) extends AbstractTerminableCommand {
8787
/** @var int */
8888
private $signal;
8989

@@ -117,7 +117,7 @@ protected function commandBody(InputInterface $input, OutputInterface $output):
117117
*/
118118
public function testReceiveSignalBeforeCommandBody(int $signal): void
119119
{
120-
$stubCommand = new class('dummy:command') extends AbstractTerminableCommand {
120+
$stubCommand = new class ('dummy:command') extends AbstractTerminableCommand {
121121
protected function commandBody(InputInterface $input, OutputInterface $output): int
122122
{
123123
return 0;

0 commit comments

Comments
 (0)