Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sebastianbergmann/phpunit
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4.8.9
Choose a base ref
...
head repository: sebastianbergmann/phpunit
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4.8.10
Choose a head ref
  • 5 commits
  • 4 files changed
  • 2 contributors

Commits on Sep 27, 2015

  1. Avoid exiting the Travis build script in case the status code testing… 

    … fails
    @stof @sebastianbergmann
    stof authored and sebastianbergmann committed Sep 27, 2015

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    c584046 View commit details

Commits on Oct 1, 2015

  1. Hopefully make it clear that PHPUnit 4.8 is not supported on PHP 7

    @sebastianbergmann
    sebastianbergmann committed Oct 1, 2015

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    505196b View commit details

  2. Revert "Hopefully make it clear that PHPUnit 4.8 is not supported on … 

    …PHP 7"

This reverts commit 505196b.
    @sebastianbergmann
    sebastianbergmann committed Oct 1, 2015

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    2d43825 View commit details

  3. Avoid passing Error to onNotSuccesfulTest on PHP 7 

    onNotSuccessfulTest is typehinted as Exception, so only Exception
throwables should be passed to it.
    @stof @sebastianbergmann
    stof authored and sebastianbergmann committed Oct 1, 2015

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    7d75bd8 View commit details

  4. Prepare release

    @sebastianbergmann
    sebastianbergmann committed Oct 1, 2015

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    4631637 View commit details
Showing with 14 additions and 2 deletions.
  1. +1 −1 .travis.yml
  2. +7 −0 ChangeLog-4.8.md
  3. +5 −0 src/Framework/TestCase.php
  4. +1 −1 src/Runner/Version.php
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ install:

script:
- ./phpunit
- ./phpunit --configuration ./build/travis-ci-fail.xml > /dev/null; if [ $? -eq 0 ]; then echo "SHOULD FAIL"; exit 1; else echo "fail checked"; fi;
- ./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 tests/_files/configuration.xml
- xmllint --noout --schema phpunit.xsd tests/_files/configuration_empty.xml
7 changes: 7 additions & 0 deletions ChangeLog-4.8.md
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,12 @@

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.10] - 2015-10-01

### Fixed

* Merged [#1884](https://github.com/sebastianbergmann/phpunit/issues/1884): Avoid passing `Error` to `onNotSuccessfulTest()` on PHP 7

## [4.8.9] - 2015-09-20

### Fixed
@@ -69,6 +75,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.10]: https://github.com/sebastianbergmann/phpunit/compare/4.8.9...4.8.10
[4.8.9]: https://github.com/sebastianbergmann/phpunit/compare/4.8.8...4.8.9
[4.8.8]: https://github.com/sebastianbergmann/phpunit/compare/4.8.7...4.8.8
[4.8.7]: https://github.com/sebastianbergmann/phpunit/compare/4.8.6...4.8.7
5 changes: 5 additions & 0 deletions src/Framework/TestCase.php
View file
Original file line number Diff line number Diff line change
@@ -848,6 +848,11 @@ public function runBare()
$e = new PHPUnit_Framework_AssertionFailedError($e->getMessage());
}

if (!$e instanceof Exception) {
// Rethrow Error directly on PHP 7 as onNotSuccessfulTest does not support it
throw $e;
}

$this->onNotSuccessfulTest($e);
}
}
2 changes: 1 addition & 1 deletion src/Runner/Version.php
View file
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ public static function id()
}

if (self::$version === null) {
$version = new SebastianBergmann\Version('4.8.9', dirname(dirname(__DIR__)));
$version = new SebastianBergmann\Version('4.8.10', dirname(dirname(__DIR__)));
self::$version = $version->getVersion();
}