Skip to content

Commit e927ae0

Browse files
authored
Merge pull request #33 from laminas/renovate/major-laminas
Update dependency laminas/laminas-coding-standard to v2
2 parents e302c43 + 1b27d59 commit e927ae0

51 files changed

Lines changed: 1637 additions & 1805 deletions

Some content is hidden

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

.coveralls.yml

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

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
/clover.xml
2-
/coveralls-upload.json
31
/docs/html/
42
/laminas-mkdoc-theme.tgz
53
/laminas-mkdoc-theme/
64
/phpunit.xml
75
/vendor/
6+
.phpcs-cache

.laminas-ci.json

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

composer.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,25 @@
1818
"config": {
1919
"sort-packages": true,
2020
"platform": {
21-
"php": "7.3.99"
21+
"php": "7.4.99"
22+
},
23+
"allow-plugins": {
24+
"dealerdirect/phpcodesniffer-composer-installer": true
2225
}
2326
},
2427
"conflict": {
2528
"laminas/laminas-servicemanager": "<3.0",
2629
"zendframework/zend-permissions-acl": "*"
2730
},
2831
"require": {
29-
"php": "^7.3 || ~8.0.0 || ~8.1.0"
32+
"php": "^7.4 || ~8.0.0 || ~8.1.0"
3033
},
3134
"require-dev": {
32-
"laminas/laminas-coding-standard": "~1.0.0",
33-
"laminas/laminas-servicemanager": "^3.0.3",
35+
"laminas/laminas-coding-standard": "~2.3.0",
36+
"laminas/laminas-servicemanager": "^3.15.1",
3437
"phpunit/phpunit": "^9.5.0",
3538
"psalm/plugin-phpunit": "^0.17.0",
36-
"vimeo/psalm": "^4.7"
39+
"vimeo/psalm": "^4.24.0"
3740
},
3841
"suggest": {
3942
"laminas/laminas-servicemanager": "To support Laminas\\Permissions\\Acl\\Assertion\\AssertionManager plugin manager usage"

0 commit comments

Comments
 (0)