Skip to content

Commit

Permalink
Fix paths after directory rename
Browse files Browse the repository at this point in the history
  • Loading branch information
mstilkerich committed Sep 14, 2022
1 parent b2a6aac commit ed43638
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -7,6 +7,6 @@
/composer.lock
/vendor
/testreports
/tests/interop/AccountData.php
/tests/Interop/AccountData.php
/xml
/doc/api
12 changes: 6 additions & 6 deletions Makefile
Expand Up @@ -13,39 +13,39 @@ stylecheck:
phpcompatcheck:
vendor/bin/phpcs --colors --standard=PHPCompatibility --runtime-set testVersion 7.1 src/ tests/

psalmanalysis: tests/interop/AccountData.php
psalmanalysis: tests/Interop/AccountData.php
vendor/bin/psalm --no-cache --shepherd --report=testreports/psalm.txt --report-show-info=true --no-progress

tests: tests-interop unittests
vendor/bin/phpcov merge --html testreports/coverage testreports

.PHONY: unittests
unittests: tests/unit/phpunit.xml
unittests: tests/Unit/phpunit.xml
@echo
@echo ==========================================================
@echo " EXECUTING UNIT TESTS"
@echo ==========================================================
@echo
@mkdir -p testreports/unit
vendor/bin/phpunit -c tests/unit/phpunit.xml
vendor/bin/phpunit -c tests/Unit/phpunit.xml

.PHONY: tests-interop
tests-interop: tests/interop/phpunit.xml tests/interop/AccountData.php
tests-interop: tests/Interop/phpunit.xml tests/Interop/AccountData.php
@echo
@echo ==========================================================
@echo " EXECUTING CARDDAV INTEROPERABILITY TESTS"
@echo ==========================================================
@echo
@mkdir -p testreports/interop
vendor/bin/phpunit -c tests/interop/phpunit.xml
vendor/bin/phpunit -c tests/Interop/phpunit.xml

doc:
rm -rf $(DOCDIR)
phpDocumentor.phar -d src/ -t $(DOCDIR) --title="CardDAV Client Library" --setting=graphs.enabled=true --validate
[ -d ../carddavclient-pages ] && rsync -r --delete --exclude .git doc/api/ ../carddavclient-pages

# For github CI system - if AccountData.php is not available, create from AccountData.php.dist
tests/interop/AccountData.php: | tests/interop/AccountData.php.dist
tests/Interop/AccountData.php: | tests/Interop/AccountData.php.dist
cp $| $@

.PHONY: codecov-upload
Expand Down
2 changes: 1 addition & 1 deletion psalm.xml
Expand Up @@ -17,7 +17,7 @@
<directory name="tests/"/>
<file name="doc/quickstart.php"/>
<ignoreFiles allowMissingFiles="true">
<file name="tests/interop/AccountData-*.php" />
<file name="tests/Interop/AccountData-*.php" />
</ignoreFiles>
</projectFiles>

Expand Down

0 comments on commit ed43638

Please sign in to comment.