diff --git a/.gitignore b/.gitignore index 01d9591..b02ba92 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,6 @@ /lsp/ /tests/Integration/var/cache/ /tests/Integration/var/logs/ +/var/ /vendor-bin/*/vendor/ /vendor/ diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index b7b364d..7d2c05a 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -16,6 +16,7 @@ ->in(__DIR__) ->exclude([ 'dist', + 'var', ]); $header = trim( @@ -28,6 +29,6 @@ )); $config = new FidryConfig($header, 81_000); -$config->setCacheFile(__DIR__.'/dist/.php-cs-fixer.cache'); +$config->setCacheFile(__DIR__.'/var/.php-cs-fixer.cache'); return $config->setFinder($finder); diff --git a/Makefile b/Makefile index a1049a3..0c06099 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ MAKEFLAGS += --no-builtin-rules COMPOSER = $(shell which composer) SRC_TESTS_FILES=$(shell find src/ tests/ -type f) phpunit.xml.dist -COVERAGE_DIR = dist/coverage +COVERAGE_DIR = var/coverage COVERAGE_XML = $(COVERAGE_DIR)/xml COVERAGE_HTML = $(COVERAGE_DIR)/html TARGET_MSI = 100 @@ -69,7 +69,7 @@ php_cs_fixer: $(PHP_CS_FIXER_BIN) $(PHP_CS_FIXER) .PHONY: php_cs_fixer_lint -php_cs_fixer_lint: $(PHP_CS_FIXER_BIN) dist +php_cs_fixer_lint: $(PHP_CS_FIXER_BIN) var $(PHP_CS_FIXER) .PHONY: rector @@ -79,7 +79,7 @@ ifndef SKIP_RECTOR endif .PHONY: rector_lint -rector_lint: $(RECTOR_BIN) dist +rector_lint: $(RECTOR_BIN) var ifndef SKIP_RECTOR $(RECTOR) --dry-run endif @@ -95,23 +95,23 @@ composer_validate: vendor .PHONY: phpunit phpunit: ## Runs PHPUnit -phpunit: $(PHPUNIT_BIN) dist vendor +phpunit: $(PHPUNIT_BIN) var vendor $(PHPUNIT) .PHONY: phpunit_coverage_infection phpunit_coverage_infection: ## Runs PHPUnit with code coverage for Infection -phpunit_coverage_infection: $(PHPUNIT_BIN) dist vendor +phpunit_coverage_infection: $(PHPUNIT_BIN) var vendor $(PHPUNIT_COVERAGE_INFECTION) .PHONY: phpunit_coverage_html phpunit_coverage_html: ## Runs PHPUnit with code coverage with HTML report -phpunit_coverage_html: $(PHPUNIT_BIN) dist vendor +phpunit_coverage_html: $(PHPUNIT_BIN) var vendor $(PHPUNIT_COVERAGE_HTML) @echo "You can check the report by opening the file \"$(COVERAGE_HTML)/index.html\"." .PHONY: infection infection: ## Runs infection -infection: $(INFECTION_BIN) $(COVERAGE_DIR) dist vendor +infection: $(INFECTION_BIN) $(COVERAGE_DIR) var vendor if [ -d $(COVERAGE_DIR)/coverage-xml ]; then $(INFECTION); fi @@ -149,6 +149,6 @@ ifndef SKIP_RECTOR touch -c $@ endif -dist: - mkdir -p dist +var: + mkdir -p var touch $@ diff --git a/infection.json.dist b/infection.json.dist index 5b8e228..3854b02 100644 --- a/infection.json.dist +++ b/infection.json.dist @@ -7,9 +7,9 @@ ] }, "logs": { - "text": "dist/infection.log" + "text": "var/infection.log" }, - "tmpDir": "dist/infection", + "tmpDir": "var/infection", "mutators": { "@default": true, "MBString": false, diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 46f544d..ea221f3 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -10,7 +10,7 @@ displayDetailsOnTestsThatTriggerWarnings="true" displayDetailsOnTestsThatTriggerErrors="true" executionOrder="duration" - cacheResultFile="dist/.phpunit.result.cache"> + cacheResultFile="var/.phpunit.result.cache">