Merge pull request #14 from othillo/phpunit-travis

asm89 · web-flow · commit 54efc909472e · 2017-04-24T11:34:57.000+01:00
use shipped phpunit instead of phpunit provided by Travis CI
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ before_script:
   - if [[ "$SYMFONY_VERSION" == "2.3.*" ]]; then composer update --prefer-lowest; fi
 
 script:
-  - phpunit
+  - vendor/bin/phpunit
 
 branches:
   only:
diff --git a/composer.json b/composer.json
@@ -19,5 +19,8 @@
     "psr-0": {
       "Qandidate\\Common\\Symfony\\HttpKernel\\EventListener": "src/"
     }
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^4.8"
   }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -9,7 +9,7 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="test/bootstrap.php"
+         bootstrap="vendor/autoload.php"
 >
   <testsuites>
     <testsuite name="Test Suite">
diff --git a/test/bootstrap.php b/test/bootstrap.php

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,8 @@`
`19`	`19`	`"psr-0": {`
`20`	`20`	`"Qandidate\\Common\\Symfony\\HttpKernel\\EventListener": "src/"`
`21`	`21`	`}`
	`22`	`+ },`
	`23`	`+ "require-dev": {`
	`24`	`+ "phpunit/phpunit": "^4.8"`
`22`	`25`	`}`
`23`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`processIsolation="false"`
`10`	`10`	`stopOnFailure="false"`
`11`	`11`	`syntaxCheck="false"`
`12`		`- bootstrap="test/bootstrap.php"`
	`12`	`+ bootstrap="vendor/autoload.php"`
`13`	`13`	`>`
`14`	`14`	`<testsuites>`
`15`	`15`	`<testsuite name="Test Suite">`