Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Install vimeo/psalm with phive #91

Merged
merged 1 commit into from
Nov 28, 2021
Merged

Fix: Install vimeo/psalm with phive #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/integrate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ jobs:
run: "mkdir -p .build/psalm"

- name: "Run vimeo/psalm"
run: "vendor/bin/psalm --config=psalm.xml --diff --shepherd --show-info=false --stats --threads=4"
run: ".phive/psalm --config=psalm.xml --diff --shepherd --show-info=false --stats --threads=4"

tests:
name: "Tests"
Expand Down
1 change: 1 addition & 0 deletions .phive/phars.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="composer-require-checker" version="^3.5.1" installed="3.5.1" location="./.phive/composer-require-checker" copy="true"/>
<phar name="psalm" version="4.4.1" installed="4.4.1" location="./.phive/psalm" copy="true"/>
</phive>
Binary file added .phive/psalm
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ mutation-tests: vendor ## Runs mutation tests with infection/infection
.PHONY: static-code-analysis
static-code-analysis: vendor ## Runs a static code analysis with vimeo/psalm
mkdir -p .build/psalm
vendor/bin/psalm --config=psalm.xml --clear-cache
vendor/bin/psalm --config=psalm.xml --diff --show-info=false --stats --threads=4
.phive/psalm --config=psalm.xml --clear-cache
.phive/psalm --config=psalm.xml --diff --show-info=false --stats --threads=4

.PHONY: static-code-analysis-baseline
static-code-analysis-baseline: vendor ## Generates a baseline for static code analysis with vimeo/psalm
mkdir -p .build/psalm
vendor/bin/psalm --config=psalm.xml --clear-cache
vendor/bin/psalm --config=psalm.xml --set-baseline=psalm-baseline.xml
.phive/psalm --config=psalm.xml --clear-cache
.phive/psalm --config=psalm.xml --set-baseline=psalm-baseline.xml

.PHONY: tests
tests: vendor ## Runs auto-review, unit, integration, and example tests with phpunit/phpunit
Expand Down
4 changes: 1 addition & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
"ergebnis/license": "^1.1.0",
"ergebnis/php-cs-fixer-config": "~2.12.1",
"ergebnis/test-util": "^1.4.0",
"infection/infection": "~0.21.0",
"psalm/plugin-phpunit": "~0.15.1",
"vimeo/psalm": "^4.4.1"
"infection/infection": "~0.21.0"
},
"config": {
"platform": {
Expand Down
Loading