.gitignore

@@ -1,22 +1,13 @@
-build/api
-build/code-browser
-build/coverage
-build/logs
-build/pdepend
-build/phar
-build/phpdox
-build/*.phar
-build/*.phar.asc
-tests/TextUI/*.diff
-tests/TextUI/*.exp
-tests/TextUI/*.log
-tests/TextUI/*.out
-tests/TextUI/*.php
-/bin
-/vendor
+/.ant_targets
+/.idea
+/build/phar
+/build/*.phar
+/build/*.phar.asc
+/tests/TextUI/*.diff
+/tests/TextUI/*.exp
+/tests/TextUI/*.log
+/tests/TextUI/*.out
+/tests/TextUI/*.php
+/cache.properties
 /composer.lock
-/composer.phar
-phpunit.xml
-cache.properties
-.idea
-.ant_targets
+/vendor

.travis.yml

@@ -7,11 +7,13 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - nightly
   - hhvm
 
 matrix:
   allow_failures:
     - php: 7.0
+    - php: nightly
     - php: hhvm
 
 sudo: false
@@ -25,7 +27,7 @@ install:
 script:
   - ./phpunit
   - ./phpunit --configuration ./build/travis-ci-fail.xml > /dev/null; if [ $? -eq 0 ]; then echo "SHOULD FAIL"; false; else echo "fail checked"; fi;
-  - xmllint --noout --schema phpunit.xsd phpunit.xml.dist
+  - xmllint --noout --schema phpunit.xsd phpunit.xml
   - xmllint --noout --schema phpunit.xsd tests/_files/configuration.xml
   - xmllint --noout --schema phpunit.xsd tests/_files/configuration_empty.xml
   - xmllint --noout --schema phpunit.xsd tests/_files/configuration_xinclude.xml -xinclude

CONTRIBUTING.md

@@ -13,7 +13,7 @@ Please note that this project is released with a [Contributor Code of Conduct](C
 
 Please make sure that you have [set up your user name and email address](http://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup) for use with Git. Strings such as `silly nick name <root@localhost>` look really stupid in the commit history of a project.
 
-Pull requests for bug fixes must be based on the current stable branch whereas pull requests for new features must be based on the current alpha branch (when `5.0` is the current stable branch, then `5.1` is the current beta branch and `5.2` is the current alpha branch).
+Pull requests for bug fixes must be based on the current stable branch whereas pull requests for new features must be based on the `master` branch.
 
 We are trying to keep backwards compatibility breaks in PHPUnit to an absolute minimum. Please take this into account when proposing changes.
 

ChangeLog-4.8.md

@@ -2,6 +2,13 @@
 
 All notable changes of the PHPUnit 4.8 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [4.8.25] - 2016-05-10
+
+### Fixed
+
+* Fixed [#2112](https://github.com/sebastianbergmann/phpunit/issues/2112): Output is html entity encoded when ran through `phpdbg`
+* Fixed [#2158](https://github.com/sebastianbergmann/phpunit/issues/2158): Failure to run tests in separate processes if a file included into main process contains constant definition
+
 ## [4.8.24] - 2016-03-14
 
 ### Fixed
@@ -177,6 +184,7 @@ New PHAR release due to updated dependencies
 * Made the argument check of `assertContains()` and `assertNotContains()` more strict to prevent undefined behavior such as [#1808](https://github.com/sebastianbergmann/phpunit/issues/1808)
 * Changed the name of the default group from `__nogroup__` to `default`
 
+[4.8.25]: https://github.com/sebastianbergmann/phpunit/compare/4.8.24...4.8.25
 [4.8.24]: https://github.com/sebastianbergmann/phpunit/compare/4.8.23...4.8.24
 [4.8.23]: https://github.com/sebastianbergmann/phpunit/compare/4.8.22...4.8.23
 [4.8.22]: https://github.com/sebastianbergmann/phpunit/compare/4.8.21...4.8.22