Skip to content

Commit 61413a1

Browse files
committed
feature #375 Use locked PHPUnit from dependencies (bocharsky-bw, javiereguiluz)
This PR was merged into the master branch. Discussion ---------- Use locked PHPUnit from dependencies This finishes and rebases #365. Commits ------- 41fad4b Fixed binaries path in AppVeyor script 46ac33e Moved binaries back to vendor/bin/ 189eec1 Use the recommended OR operator 239b6b8 Allow to install newer PHPUnit versions 381732d Use locked PHPUnit from dependencies
2 parents d17b1f2 + 41fad4b commit 61413a1

File tree

5 files changed

+1006
-10
lines changed

5 files changed

+1006
-10
lines changed

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,5 @@
1212
/var/sessions/*
1313
!var/sessions/.gitkeep
1414
!var/SymfonyRequirements.php
15-
/bin/*
16-
!bin/console
17-
!bin/symfony_requirements
1815
/vendor/
1916
/web/bundles/

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ install:
2323
- composer install
2424

2525
script:
26-
- phpunit
26+
- ./vendor/bin/phpunit

appveyor.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ install:
2323
- cd %APPVEYOR_BUILD_FOLDER%
2424
- php -r "readfile('http://getcomposer.org/installer');" | php
2525
- php composer.phar install --no-interaction --no-progress
26-
- appveyor DownloadFile https://phar.phpunit.de/phpunit.phar
2726

2827
test_script:
2928
- cd %APPVEYOR_BUILD_FOLDER%
30-
- php phpunit.phar --verbose
29+
- php ./vendor/bin/phpunit --verbose

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
"white-october/pagerfanta-bundle" : "^1.0"
3232
},
3333
"require-dev": {
34-
"sensio/generator-bundle" : "~3.0",
34+
"phpunit/phpunit" : "^4.8 || ^5.0",
35+
"sensio/generator-bundle" : "^3.0",
3536
"symfony/phpunit-bridge" : "^3.0"
3637
},
3738
"scripts": {
@@ -53,7 +54,6 @@
5354
]
5455
},
5556
"config": {
56-
"bin-dir": "bin",
5757
"platform": {
5858
"php": "5.5.9"
5959
}

0 commit comments

Comments
 (0)