diff --git a/Makefile b/Makefile index 78f82385a..a9790f6cc 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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 $@ diff --git a/composer.json b/composer.json index ed53e5bbf..03dff9b0d 100644 --- a/composer.json +++ b/composer.json @@ -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" diff --git a/psalm.xml b/psalm.xml index e2c264673..70075c65f 100644 --- a/psalm.xml +++ b/psalm.xml @@ -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" > diff --git a/vendor-bin/infection/composer.json b/vendor-bin/infection/composer.json new file mode 100644 index 000000000..707b7e834 --- /dev/null +++ b/vendor-bin/infection/composer.json @@ -0,0 +1,5 @@ +{ + "require-dev": { + "infection/infection": "^0.15" + } +} \ No newline at end of file