Repo: maintenance update (makefile, editorconfig, codeception, codestyle, coveralls)

f3l1x · f3l1x · commit 7ca99daac4df · 2021-01-11T22:04:00.000+01:00
diff --git a/.editorconfig b/.editorconfig
@@ -11,6 +11,6 @@ indent_style = tab
 indent_size = tab
 tab_width = 4
 
-[{*.json,*.yml,*.md}]
+[{*.json,*.yaml,*.yml,*.md}]
 indent_style = space
 indent_size = 2
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -283,9 +283,7 @@ jobs:
 
       - name: "Coveralls.io"
         env:
-          CI_NAME: github
-          CI: true
-          COVERALLS_REPO_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.1.0/php-coveralls.phar
-          php php-coveralls.phar --verbose --config tests/.coveralls.yml
+          composer global require php-coveralls/php-coveralls
+          php-coveralls --coverage_clover=tests/_output/coverage.xml --json_path=coveralls-upload.json -v
diff --git a/Makefile b/Makefile
@@ -1,30 +1,31 @@
-.PHONY: qa lint cs csf phpstan tests coverage
+.PHONY: install qa cs csf phpstan tests coverage-clover coverage-html
 
-all:
-	@awk 'BEGIN {FS = ":.*##"; printf "Usage:\n  make \033[36m<target>\033[0m\n\nTargets:\n"}'
-	@grep -h -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[36m%-20s\033[0m %s\n", $$1, $$2}'
+install:
+	composer update
 
-# QA
+qa: phpstan cs
 
-qa: lint phpstan cs ## Check code quality - coding style and static analysis
-
-lint: ## Check PHP files syntax
-	vendor/bin/linter src tests
-
-cs: ## Check PHP files coding style
+cs:
+ifdef GITHUB_ACTION
+	vendor/bin/codesniffer -q --report=checkstyle src tests  | cs2pr
+else
 	vendor/bin/codesniffer src tests
+endif
 
-csf: ## Fix PHP files coding style
+csf:
 	vendor/bin/codefixer src tests
 
-phpstan: ## Analyse code with PHPStan
+phpstan:
 	vendor/bin/phpstan analyse -l max -c phpstan.neon src
 
-# Tests
-
-tests: ## Run all tests
+tests:
 	vendor/bin/codecept build
 	vendor/bin/codecept run --debug
 
-coverage: ## Generate code coverage in XML format
-	phpdbg -qrr vendor/bin/phpunit tests --colors=always -c tests/coverage.xml
+coverage-clover:
+	vendor/bin/codecept build
+	phpdbg -qrr vendor/bin/codecept run --coverage-xml
+
+coverage-html:
+	vendor/bin/codecept build
+	phpdbg -qrr vendor/bin/codecept run --coverage-html
diff --git a/codeception.yml b/codeception.yml
@@ -1,10 +1,17 @@
 actor: Tester
 
 paths:
+    # where the tests stored
     tests: tests
-    log: tests/_log
+
+    # directory for fixture data
     data: tests/_data
-    support: tests/_helpers
+
+    # directory for support code
+    support: tests/_support
+
+    # directory for output
+    output: tests/_output
 
 bootstrap: _bootstrap.php
 
@@ -14,4 +21,4 @@ settings:
 coverage:
     enabled: true
     include:
-        - src/*
+        - src/**
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,9 +1,13 @@
 includes:
+	- vendor/phpstan/phpstan-deprecation-rules/rules.neon
+	- vendor/phpstan/phpstan-nette/extension.neon
+	- vendor/phpstan/phpstan-nette/rules.neon
+	- vendor/phpstan/phpstan-strict-rules/rules.neon
 	- extension.neon
 
 parameters:
 	excludes_analyse:
-		- %rootDir%/../../../tests/_*
+		- %currentWorkingDirectory%/tests/_*
 
 	ignoreErrors:
 		- '#^Only booleans are allowed in a negated boolean, string\|null given.#'
diff --git a/ruleset.xml b/ruleset.xml
@@ -19,6 +19,7 @@
     </rule>
 
     <!-- Exclude folders -->
-	<exclude-pattern>/tests/tmp</exclude-pattern>
-	<exclude-pattern>/tests/_helpers</exclude-pattern>
+	<exclude-pattern>/tests/_output</exclude-pattern>
+	<exclude-pattern>/tests/_support</exclude-pattern>
+	<exclude-pattern>/tests/_temp</exclude-pattern>
 </ruleset>
diff --git a/src/Module/NetteDIModule.php b/src/Module/NetteDIModule.php
@@ -164,9 +164,7 @@ private function createContainer(): void
 
 	private function getTempDir(): string
 	{
-		$tempDir = $this->path . '/' . $this->config['tempDir'];
-
-		return $tempDir;
+		return $this->path . '/' . $this->config['tempDir'];
 	}
 
 
diff --git a/tests/.coveralls.yml b/tests/.coveralls.yml
diff --git a/tests/.gitignore b/tests/.gitignore
@@ -1,3 +1,3 @@
-/_helpers
-/_log
+/_output
+/_support
 /_temp
diff --git a/tests/coverage.xml b/tests/coverage.xml
diff --git a/tests/functional.suite.yml b/tests/functional.suite.yml
@@ -7,7 +7,7 @@ modules:
         - Contributte\Codeception\Module\NetteApplicationModule:
             followRedirects: false
         - Contributte\Codeception\Module\NetteDIModule:
-            tempDir: ../_temp/functional
+            tempDir: ./../_temp/functional
             removeDefaultExtensions: true
             configFiles:
                 - config/config.neon

Original file line number	Diff line number	Diff line change
`@@ -164,9 +164,7 @@ private function createContainer(): void`
`164`	`164`
`165`	`165`	`private function getTempDir(): string`
`166`	`166`	`{`
`167`		`- $tempDir = $this->path . '/' . $this->config['tempDir'];`
`168`		`-`
`169`		`- return $tempDir;`
	`167`	`+ return $this->path . '/' . $this->config['tempDir'];`
`170`	`168`	`}`
`171`	`169`
`172`	`170`