Skip to content

Commit 5ad4037

Browse files
author
Stephan Huber
committed
Merge branch 'release/4.0.0'
2 parents 024f02f + 82c4630 commit 5ad4037

File tree

136 files changed

+1716
-1282
lines changed

Some content is hidden

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

136 files changed

+1716
-1282
lines changed

.github/workflows/tests-8.0.yml

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

.github/workflows/tests-8.1.yml

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

.github/workflows/tests-8.2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99

1010
steps:
1111
- name: Checkout Code
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313
with:
1414
fetch-depth: 1
1515

.github/workflows/tests-7.3.yml renamed to .github/workflows/tests-8.3.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Run phpunit tests on 7.3
1+
name: Run phpunit tests on 8.3
22

33
on: [push]
44

@@ -9,14 +9,14 @@ jobs:
99

1010
steps:
1111
- name: Checkout Code
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313
with:
1414
fetch-depth: 1
1515

1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
19-
php-version: '7.3'
19+
php-version: '8.3'
2020
extensions: intl, zip, zlib
2121
coverage: none
2222
ini-values: memory_limit=1G, phar.readonly=0
@@ -29,6 +29,3 @@ jobs:
2929

3030
- name: Run unit tests
3131
run: ./vendor/bin/phpunit tests --exclude-group docker
32-
33-
34-

.phpcs.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,7 @@
5252
directory.
5353
-->
5454
<rule ref="PSR2"/>
55-
55+
<rule ref="Generic.Files.LineLength">
56+
<severity>0</severity>
57+
</rule>
5658
</ruleset>

composer.json

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,45 @@
33
"description": "A deployment helper cli",
44
"type": "project",
55
"require": {
6-
"php": "^7.3 || ^8.0",
7-
"symfony/console": "^2.8|^3|^4.1",
6+
"php": "^8.2",
7+
"symfony/console": "^5",
88
"psr/log": "^1.0",
9-
"symfony/event-dispatcher": "^2.8|^3|^4.1",
10-
"symfony/http-kernel": "^2.8|^3|^4.1",
11-
"symfony/dependency-injection": "^2.8|^3|^4.1",
12-
"symfony/config": "^2.8|^3|^4.1",
13-
"symfony/yaml": "^2.8|^3|^4.1",
9+
"symfony/event-dispatcher": "^5",
10+
"symfony/http-kernel": "^5",
11+
"symfony/dependency-injection": "^5",
12+
"symfony/config": "^5",
13+
"symfony/yaml": "^5",
1414
"composer/semver": "^1.4||^3.2",
15-
"symfony/process": "^2.8|^3|^4.1",
15+
"symfony/process": "^5",
1616
"symfony/flex": "^1.1",
17-
"symfony/dotenv": "^2.8|^3|^4.1",
17+
"symfony/dotenv": "^5",
1818
"ext-json": "*",
1919
"stecman/symfony-console-completion": "^0.11.0",
20-
"symfony/finder": "^4.1",
20+
"symfony/finder": "^5",
2121
"thibaud-dauce/mattermost-php": "^1.2",
2222
"twig/twig": "^3.0",
2323
"ext-openssl": "*",
2424
"jakeasmith/http_build_url": "^1.0",
2525
"lesstif/php-jira-rest-client": "^1.35",
26-
"graze/parallel-process": "^0.8.1",
26+
"graze/parallel-process": "dev-master",
2727
"ext-posix": "*",
28-
"twig/string-extra": "^3.3",
28+
"twig/string-extra": "^3.7",
2929
"defuse/php-encryption": "^2.3",
30-
"consolidation/self-update": "^2.0",
30+
"consolidation/self-update": "^3.0",
3131
"webmozart/assert": "^1.11"
3232
},
3333
"require-dev": {
3434
"roave/security-advisories": "dev-latest" ,
35-
"symfony/phpunit-bridge": "^2.8|^3|^4.1",
35+
"symfony/phpunit-bridge": "^5",
3636
"phpunit/phpunit": "^9.3",
3737
"php-parallel-lint/php-parallel-lint": "^1.2",
3838
"squizlabs/php_codesniffer": "^3.5",
39-
"phpro/grumphp-shim": "^1",
4039
"dealerdirect/phpcodesniffer-composer-installer": "^1",
4140
"phpstan/phpstan": "^1.0",
4241
"phpstan/phpstan-symfony": "^1.0",
43-
"phpspec/prophecy-phpunit": "^2.0"
42+
"phpspec/prophecy-phpunit": "^2.0",
43+
"phpro/grumphp-shim": "^2",
44+
"jangregor/phpstan-prophecy": "^1.0"
4445
},
4546
"autoload": {
4647
"psr-4": {
@@ -58,6 +59,12 @@
5859
"bin": [
5960
"bin/phab"
6061
],
62+
"repositories": {
63+
"graze/parallel-process": {
64+
"type": "vcs",
65+
"url": "https://github.com/ARY112/parallel-process.git"
66+
}
67+
},
6168
"scripts": {
6269
"auto-scripts": {
6370

@@ -67,7 +74,7 @@
6774
},
6875
"config": {
6976
"platform": {
70-
"php": "7.3.31"
77+
"php": "8.2"
7178
},
7279
"allow-plugins": {
7380
"dealerdirect/phpcodesniffer-composer-installer": true,
@@ -93,7 +100,8 @@
93100
}
94101
},
95102
"symfony": {
96-
"allow-contrib": "false"
103+
"allow-contrib": "false",
104+
"require": "5.4.*"
97105
}
98106
}
99107
}

0 commit comments

Comments
 (0)