Skip to content

Commit 6a36367

Browse files
committed
Core: fix phpunit install
1 parent 15a75b9 commit 6a36367

File tree

6 files changed

+9
-459
lines changed

6 files changed

+9
-459
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
src/Michelf/*
1010
src/.gitignore
1111
vendor/**
12+
composer.lock
1213

1314
# JIRA plugin
1415
atlassian-ide-plugin.xml

.travis.yml

+2-8
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,12 @@ php:
33
- '5.6'
44
- '7.0'
55
before_script:
6-
- composer -n --prefer-source install --dev
7-
- if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then wget https://phar.phpunit.de/phpunit-5.7.phar; fi
8-
- if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then mv phpunit-5.7.phar phpunit; fi
9-
- if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then chmod +x phpunit; fi
6+
- composer -n install
107
- if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then pecl install runkit; fi
118
- if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then echo "runkit.internal_override=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
129
- if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.0" ]]; then pecl install uopz; fi
13-
- wget --content-disposition "https://github.com/theseer/Autoload/releases/download/1.22.0/phpab-1.22.0.phar"
14-
- mv phpab-1.22.0.phar phpab
15-
- chmod +x phpab
1610
- export PATH=$PATH:$PWD
17-
script: phpunit --configuration tests/phpunit.xml
11+
script: vendor/bin/phpunit --configuration tests/phpunit.xml
1812
before_deploy:
1913
- ant phar-nightly
2014
deploy:

build.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<arg value="${type}"/>
8181
</exec>
8282

83-
<exec executable="phpab" taskname="phpab">
83+
<exec executable="${basedir}vendor/bin/phpab" taskname="phpab">
8484
<arg value="--all"/>
8585
<arg value="--static"/>
8686
<arg value="--once"/>
@@ -94,7 +94,7 @@
9494
<arg path="${basedir}/build/phar"/>
9595
</exec>
9696

97-
<exec executable="phpab" taskname="phpab">
97+
<exec executable="${basedir}vendor/bin/phpab" taskname="phpab">
9898
<arg value="--all"/>
9999
<arg value="--nolower"/>
100100
<arg value="--static"/>

composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
"michelf/php-markdown": "1.*"
2323
},
2424
"require-dev": {
25-
"theseer/autoload": "^1.22"
25+
"theseer/autoload": "^1.22",
26+
"phpunit/phpunit": "5.7.*"
2627
},
2728
"autoload": {
2829
"psr-4": { "PHPDraft\\": "src/PHPDraft" }

0 commit comments

Comments
 (0)