Skip to content

Commit

Permalink
Fix minimum supported PHPUnit version
Browse files Browse the repository at this point in the history
- Use PHPUnit >= 4.5 (first that properly reports version, and which includes
  prophecy).
- Use composer autoloader as phpunit bootstrap.
  • Loading branch information
weierophinney committed Mar 17, 2016
1 parent ab252e4 commit faf3cad
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 36 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
"zendframework/zend-uri": "^2.5",
"fabpot/php-cs-fixer": "1.7.*",
"phpunit/PHPUnit": "~4.0"
"phpunit/phpunit": "^4.5"
},
"suggest": {
"zendframework/zend-authentication": "Zend\\Authentication component",
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="./test/bootstrap.php"
bootstrap="./vendor/autoload.php"
colors="true">
<testsuites>
<testsuite name="zend-view Test Suite">
Expand Down
34 changes: 0 additions & 34 deletions test/bootstrap.php

This file was deleted.

0 comments on commit faf3cad

Please sign in to comment.