Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
/lsp/
/tests/Integration/var/cache/
/tests/Integration/var/logs/
/var/
/vendor-bin/*/vendor/
/vendor/
3 changes: 2 additions & 1 deletion .php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
->in(__DIR__)
->exclude([
'dist',
'var',
]);

$header = trim(
Expand All @@ -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);
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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


Expand Down Expand Up @@ -149,6 +149,6 @@ ifndef SKIP_RECTOR
touch -c $@
endif

dist:
mkdir -p dist
var:
mkdir -p var
touch $@
4 changes: 2 additions & 2 deletions infection.json.dist
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
]
},
"logs": {
"text": "dist/infection.log"
"text": "var/infection.log"
},
"tmpDir": "dist/infection",
"tmpDir": "var/infection",
"mutators": {
"@default": true,
"MBString": false,
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
displayDetailsOnTestsThatTriggerWarnings="true"
displayDetailsOnTestsThatTriggerErrors="true"
executionOrder="duration"
cacheResultFile="dist/.phpunit.result.cache">
cacheResultFile="var/.phpunit.result.cache">
<php>
<ini name="error_reporting" value="-1"/>
<env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0"/>
Expand Down