Skip to content

Commit b19ebfd

Browse files
authored
Merge pull request #711 from Ocramius/feature/dependency-cleanup
Dependency upgrades and general cleanup
2 parents 21e2b4a + 410e0e1 commit b19ebfd

File tree

106 files changed

+725
-794
lines changed

Some content is hidden

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

106 files changed

+725
-794
lines changed

.github/workflows/coding-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
dependencies:
1616
- "locked"
1717
php-version:
18-
- "7.4"
18+
- "8.0"
1919
operating-system:
2020
- "ubuntu-latest"
2121

.github/workflows/demo-scripts.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
dependencies:
1616
- "locked"
1717
php-version:
18-
- "7.4"
1918
- "8.0"
2019
operating-system:
2120
- "ubuntu-latest"

.github/workflows/mutation-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
run: "composer install --no-interaction --no-progress --no-suggest"
5454

5555
- name: "Infection"
56-
run: "./vendor/bin/infection --test-framework-options='--testsuite=unit'"
56+
run: "./vendor/bin/roave-infection-static-analysis-plugin --test-framework-options='--testsuite=unit'"
5757
env:
5858
INFECTION_BADGE_API_KEY: ${{ secrets.INFECTION_BADGE_API_KEY }}
5959
STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

.github/workflows/phpunit.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
- "highest"
1818
- "locked"
1919
php-version:
20-
- "7.4"
2120
- "8.0"
2221
operating-system:
2322
- "ubuntu-latest"

composer.json

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,23 @@
1919
}
2020
],
2121
"require": {
22-
"php": "~7.4.1 || ~8.0.0",
23-
"laminas/laminas-code": "^4.3.0",
22+
"php": "~8.0.0",
2423
"composer-runtime-api": "^2.1.0",
24+
"laminas/laminas-code": "^4.4.2",
2525
"webimpress/safe-writer": "^2.2.0"
2626
},
2727
"conflict": {
28-
"zendframework/zend-stdlib": "<3.2.1",
29-
"laminas/laminas-stdlib": "<3.2.1",
30-
"doctrine/annotations": "<1.6.1",
31-
"thecodingmachine/safe": "<1.3.3"
28+
"thecodingmachine/safe": "<1.3.3"
3229
},
3330
"require-dev": {
34-
"ext-phar": "*",
35-
"phpunit/phpunit": "^9.5.4",
36-
"squizlabs/php_codesniffer": "^3.6.0",
37-
"slevomat/coding-standard": "^6.3.10",
38-
"doctrine/coding-standard": "^8.2.1",
39-
"nikic/php-parser": "^4.10.5",
40-
"phpbench/phpbench": "^0.17.1 || 1.0.0-alpha2",
41-
"infection/infection": "^0.21.5",
42-
"vimeo/psalm": "^4.4.1",
43-
"codelicia/xulieta": "^0.1.6"
31+
"ext-phar": "*",
32+
"codelicia/xulieta": "^0.1.6",
33+
"doctrine/coding-standard": "^9.0.0",
34+
"phpbench/phpbench": "^1.0.3",
35+
"phpunit/phpunit": "^9.5.6",
36+
"roave/infection-static-analysis-plugin": "^1.8",
37+
"squizlabs/php_codesniffer": "^3.6.0",
38+
"vimeo/psalm": "^4.8.1"
4439
},
4540
"suggest": {
4641
"ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects",
@@ -61,9 +56,7 @@
6156
"Laminas\\Server\\": "tests/Stubbed/Laminas/Server"
6257
}
6358
},
64-
"extra": {
65-
"branch-alias": {
66-
"dev-master": "3.0.x-dev"
67-
}
59+
"config": {
60+
"sort-packages": true
6861
}
6962
}

0 commit comments

Comments
 (0)