Skip to content
This repository has been archived by the owner on Sep 30, 2021. It is now read-only.

DevKit updates for 3.x branch #666

Merged
merged 1 commit into from Feb 5, 2019
Merged

DevKit updates for 3.x branch #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -15,8 +15,7 @@ php:
- '7.3'
- nightly

sudo: false
dist: trusty
dist: xenial

addons:
apt:
Expand Down
10 changes: 9 additions & 1 deletion Makefile
View file
Open in desktop
Expand Up @@ -54,11 +54,19 @@ cs-fix-xml:
build:
mkdir $@

HAS_XDEBUG=$(shell php --modules|grep --quiet xdebug;echo $$?)

build/xdebug-filter.php: phpunit.xml.dist build
phpunit --dump-xdebug-filter $@
ifeq ($(HAS_XDEBUG), 0)
phpunit --dump-xdebug-filter $@
endif

test: build/xdebug-filter.php
ifeq ($(HAS_XDEBUG), 0)
phpunit --prepend build/xdebug-filter.php -c phpunit.xml.dist --coverage-clover build/logs/clover.xml
else
phpunit -c phpunit.xml.dist
endif
.PHONY: test

docs:
Expand Down