Skip to content

Commit

Permalink
Merge pull request #63 from weierophinney/feature/psalm
Browse files Browse the repository at this point in the history
Switch from PHPStan to Psalm
  • Loading branch information
Ocramius authored Jan 4, 2022
2 parents 2b2075e + 8b2ed15 commit 407b486
Show file tree
Hide file tree
Showing 31 changed files with 1,405 additions and 482 deletions.
7 changes: 6 additions & 1 deletion .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"additional_composer_arguments": [
"--no-scripts",
"--no-plugins"
],
"ignore_php_platform_requirements": {
"8.1": true
"8.0": false,
"8.1": false
}
}
5 changes: 5 additions & 0 deletions .laminas-ci/pre-run.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash

# Due to the fact that we are disabling plugins when installing/updating/downgrading composer dependencies
# we have to manually enable the coding standard here.
composer enable-codestandard
31 changes: 17 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,19 @@
"jsoumelidis/zend-sf-di-config": "^0.5",
"laminas/laminas-coding-standard": "~2.3.0",
"laminas/laminas-development-mode": "^3.3.0",
"laminas/laminas-pimple-config": "^1.1.1",
"laminas/laminas-pimple-config": "^1.4",
"laminas/laminas-servicemanager": "^3.6.4",
"mezzio/mezzio-fastroute": "^3.2.0",
"mezzio/mezzio-laminasrouter": "^3.1.0",
"mezzio/mezzio-laminasviewrenderer": "^2.3.0",
"mezzio/mezzio-platesrenderer": "^2.3.0",
"mezzio/mezzio-tooling": "^2.0",
"mezzio/mezzio-tooling": "^2.1",
"mezzio/mezzio-twigrenderer": "^2.7.0",
"mikey179/vfsstream": "^1.6.8",
"phpspec/prophecy": "^1.10.3",
"phpspec/prophecy-phpunit": "^2.0",
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-strict-rules": "^0.12",
"phpunit/phpunit": "^9.5.5",
"roave/security-advisories": "dev-master"
"mikey179/vfsstream": "^1.6.10",
"phpunit/phpunit": "^9.5.11",
"psalm/plugin-phpunit": "^0.16.1",
"roave/security-advisories": "dev-master",
"vimeo/psalm": "^4.17"
},
"autoload": {
"psr-4": {
Expand All @@ -98,13 +96,18 @@
"mezzio": "laminas --ansi",
"check": [
"@cs-check",
"@test",
"@analyze"
"@test"
],
"analyze": "phpstan analyze -l 3 -c ./phpstan.installer.neon ./src ./config",
"clear-config-cache": "php bin/clear-config-cache.php",
"cs-check": "phpcs -s",
"cs-fix": "phpcbf",
"enable-codestandard": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin::run",
"cs-check": [
"@enable-codestandard",
"phpcs -s"
],
"cs-fix": [
"@enable-codestandard",
"phpcbf"
],
"serve": "php -S 0.0.0.0:8080 -t public/",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
Expand Down
Loading

0 comments on commit 407b486

Please sign in to comment.