Skip to content

Commit 6ce1e1f

Browse files
authored
Merge pull request microsoft#112 from Ocramius/fix/composer-package-naming-correction
Fix composer package naming correction, package description, composer validation, phpunit version
2 parents e719ac1 + e8d4723 commit 6ce1e1f

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.travis.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,19 @@ cache:
2020
- validation/frameworks
2121

2222
before_script:
23+
- composer install
2324
- set -e # Stop on first error.
2425
- phpenv config-rm xdebug.ini
2526
- if find . -name "*.php" -path "./src/*" -path "./experiments/*" -path "./tools/*" -path "./syntax-visualizer/server/src/*" -exec php -l {} 2>&1 \; | grep "syntax error, unexpected"; then exit 1; fi
2627
- if find . -name "*.php" -path "./tests/*" -path "./validation/*" -maxdepth 0 --exec php -l {} 2>&1 \; | grep "syntax error, unexpected"; then exit 1; fi
2728

2829
script:
30+
- composer validate
2931
- |
3032
if [[ $VALIDATION = true ]]; then
31-
phpunit --testsuite validation
33+
./vendor/bin/phpunit --testsuite validation
3234
else
33-
phpunit --testsuite invariants
34-
phpunit --testsuite grammar
35-
phpunit --testsuite api
35+
./vendor/bin/phpunit --testsuite invariants
36+
./vendor/bin/phpunit --testsuite grammar
37+
./vendor/bin/phpunit --testsuite api
3638
fi

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
2-
"name": "Microsoft/tolerant-php-parser",
2+
"name": "microsoft/tolerant-php-parser",
3+
"description": "Tolerant PHP-to-AST parser designed for IDE usage scenarios",
34
"type": "library",
45
"require-dev": {
56
"phpunit/phpunit": "^5.5"

0 commit comments

Comments
 (0)