Skip to content

Commit

Permalink
Fix: Move
Browse files Browse the repository at this point in the history
  • Loading branch information
localheinz committed Jan 28, 2023
1 parent f331567 commit c8f4b8b
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- name: "Collect code coverage with Xdebug and phpunit/phpunit"
env:
XDEBUG_MODE: "coverage"
run: "vendor/bin/phpunit --colors=always --configuration=phpunit.xml --coverage-clover=.build/phpunit/logs/clover.xml"
run: "vendor/bin/phpunit --colors=always --configuration=test/Unit/phpunit.xml --coverage-clover=.build/phpunit/logs/clover.xml"

- name: "Send code coverage report to codecov.io"
uses: "codecov/codecov-action@v3.1.1"
Expand Down Expand Up @@ -318,5 +318,5 @@ jobs:
with:
dependencies: "${{ matrix.dependencies }}"

- name: "Run tests with phpunit/phpunit"
run: "vendor/bin/phpunit --colors=always --configuration=phpunit.xml"
- name: "Run unit tests with phpunit/phpunit"
run: "vendor/bin/phpunit --colors=always --configuration=test/Unit/phpunit.xml"
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ it: coding-standards static-code-analysis tests ## Runs the coding-standards, st
.PHONY: code-coverage
code-coverage: vendor ## Collects coverage from running unit tests with phpunit/phpunit
mkdir -p .build/phpunit
vendor/bin/phpunit --configuration=phpunit.xml --coverage-text
vendor/bin/phpunit --configuration=test/Unit/phpunit.xml --coverage-text

.PHONY: coding-standards
coding-standards: vendor ## Normalizes composer.json with ergebnis/composer-normalize and fixes code style issues with friendsofphp/php-cs-fixer
Expand Down Expand Up @@ -32,7 +32,7 @@ phive: .phive## Installs dependencies with phive

.PHONY: tests
tests: vendor ## Runs tests with phpunit/phpunit
vendor/bin/phpunit --configuration=phpunit.xml
vendor/bin/phpunit --configuration=test/Unit/phpunit.xml

.PHONY: static-code-analysis
static-code-analysis: vendor ## Runs a static code analysis with vimeo/psalm
Expand Down
2 changes: 1 addition & 1 deletion infection.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"minCoveredMsi": 100,
"minMsi": 100,
"phpUnit": {
"configDir": "."
"configDir": "test/Unit/"
},
"source": {
"directories": [
Expand Down
12 changes: 6 additions & 6 deletions phpunit.xml → test/Unit/phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
backupGlobals="false"
backupStaticAttributes="false"
bootstrap="vendor/autoload.php"
cacheResultFile=".build/phpunit/unit.cache"
bootstrap="../../vendor/autoload.php"
cacheResultFile="../../.build/phpunit/unit.cache"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
Expand All @@ -15,12 +15,12 @@
>
<coverage>
<include>
<directory>src/</directory>
<directory>../../src/</directory>
</include>
</coverage>
<testsuites>
<testsuite name="Tree test suite">
<directory>./test/</directory>
<testsuite name="Unit Tests">
<directory>.</directory>
</testsuite>
</testsuites>
</phpunit>

0 comments on commit c8f4b8b

Please sign in to comment.