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

Move Infection to vendor-bin/ #480

Merged
merged 2 commits into from
Sep 24, 2020
Merged

Move Infection to vendor-bin/ #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
810f3a5
Use a relative path for psalm xsd
villfa Sep 23, 2020
eeada27
Move Infection to vendor-bin/
villfa Sep 23, 2020
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
9 changes: 7 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,10 @@ tc: bin/phpunit
phpdbg -qrr -d zend.enable_gc=0 bin/phpunit --coverage-html=dist/coverage --coverage-text

.PHONY: tm
INFECTION=vendor-bin/infection/vendor/bin/infection
tm: ## Runs Infection
tm: $(TU_BOX_DEPS)
$(PHPNOGC) bin/infection --only-covered
tm: $(TU_BOX_DEPS) $(INFECTION)
$(PHPNOGC) $(INFECTION) --only-covered

.PHONY: e2e
e2e: ## Runs all the end-to-end tests
Expand Down Expand Up @@ -326,6 +327,10 @@ $(CODE_SNIFFER_FIX): vendor/bamarni
composer bin doctrine-cs install
touch $@

$(INFECTION): vendor/bamarni
composer bin infection install
touch $@

fixtures/composer-dump/dir001/composer.lock: fixtures/composer-dump/dir001/composer.json
composer install --working-dir fixtures/composer-dump/dir001
touch $@
Expand Down
1 change: 0 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.3",
"infection/infection": "^0.15",
"mikey179/vfsstream": "^1.6",
"phpunit/phpunit": "^8.1",
"symfony/phpunit-bridge": "^4.2 || ^5.0"
Expand Down
2 changes: 1 addition & 1 deletion psalm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
totallyTyped="false"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config file:///Users/tfidry/Project/Humbug/box/vendor-bin/psalm/vendor/vimeo/psalm/config.xsd"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor-bin/psalm/vendor/vimeo/psalm/config.xsd"
>
<projectFiles>
<directory name="src" />
Expand Down
5 changes: 5 additions & 0 deletions vendor-bin/infection/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"require-dev": {
"infection/infection": "^0.15"
}
}