Skip to content

Commit 054e5a0

Browse files
authored
Merge pull request #75 from tyrsson/move-to-phpstan
Move to phpstan, set initial baseline, bump deps Drop PHP8.1 support Cleanup unused mk-doc files Cleanup .gitattributes Cleanup .gitignore
2 parents 4c50759 + 18de135 commit 054e5a0

19 files changed

Lines changed: 3841 additions & 13292 deletions

.gitattributes

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
/.gitattributes export-ignore
44
/.github/ export-ignore
55
/.gitignore export-ignore
6-
/.travis.yml export-ignore
7-
/docs/ export-ignore
8-
/mkdocs.yml export-ignore
96
/phpcs.xml export-ignore
107
/phpunit.xml.dist export-ignore
118
/test/ export-ignore
12-
/Vagrantfile export-ignore
9+
/rector.php export-ignore
10+
/renovate.json export-ignore

.github/workflows/docs-build.yml

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

.gitignore

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
/.phpcs-cache
22
/.phpunit.result.cache
3-
/.vagrant/
3+
/.phpstan-cache
4+
/phpstan.neon
45
/clover.xml
56
/coveralls-upload.json
6-
/docs/html/
7-
/laminas-mkdoc-theme.tgz
8-
/laminas-mkdoc-theme/
97
/phpunit.xml
108
/vendor/

.gitignore copy

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/.phpcs-cache
2+
/.phpstan-cache
3+
/phpstan.neon
4+
/.phpunit.cache
5+
/.phpunit.result.cache
6+
/phpunit.xml
7+
/vendor/
8+
/xdebug_filter.php
9+
/clover.xml

.laminas-ci.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,15 @@
33
"pdo-sqlite",
44
"sqlite3",
55
"sqlsrv"
6+
],
7+
"additional_checks": [
8+
{
9+
"name": "PhpStan",
10+
"job": {
11+
"php": "8.2",
12+
"dependencies": "latest",
13+
"command": "composer require --dev phpstan/phpstan && vendor/bin/phpstan analyse"
14+
}
15+
}
616
]
717
}

.psr-container.php.stub

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

composer.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@
2525
},
2626
"extra": {
2727
"laminas": {
28-
"config-provider": "PhpDb\\Container\\ConfigProvider"
28+
"config-provider": "PhpDb\\ConfigProvider"
2929
}
3030
},
3131
"require": {
32-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
32+
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
3333
"laminas/laminas-servicemanager": "^4.0.0",
3434
"laminas/laminas-stdlib": "^3.20.0"
3535
},
3636
"require-dev": {
3737
"laminas/laminas-coding-standard": "^3.0.1",
3838
"laminas/laminas-eventmanager": "^3.14.0",
39-
"phpunit/phpunit": "^11.5.12",
40-
"psalm/plugin-phpunit": "^0.19.2",
41-
"rector/rector": "^2.0",
42-
"vimeo/psalm": "^6.8.8"
39+
"phpstan/phpstan": "^2.1",
40+
"phpstan/phpstan-phpunit": "^2.0",
41+
"phpunit/phpunit": "^11.5.15",
42+
"rector/rector": "^2.0"
4343
},
4444
"suggest": {
4545
"laminas/laminas-eventmanager": "Laminas\\EventManager component",
@@ -60,14 +60,15 @@
6060
"scripts": {
6161
"check": [
6262
"@cs-check",
63-
"@test"
63+
"@static-analysis"
6464
],
6565
"cs-check": "phpcs",
6666
"cs-fix": "phpcbf",
6767
"test": "phpunit --colors=always --testsuite \"unit test\"",
6868
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
6969
"test-integration": "phpunit --colors=always --testsuite \"integration test\"",
70-
"static-analysis": "psalm --shepherd --stats",
70+
"static-analysis": "vendor/bin/phpstan analyse --memory-limit=256M",
71+
"sa-generate-baseline": "vendor/bin/phpstan analyse --memory-limit=256M --generate-baseline",
7172
"upload-coverage": "coveralls -v"
7273
},
7374
"conflict": {

0 commit comments

Comments
 (0)