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.30
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.31
Choose a head ref
  • 7 commits
  • 6 files changed
  • 2 contributors

Commits on Dec 2, 2016

  1. Make --version work even when we are on an unsupported version of PHP

    @sebastianbergmann
    sebastianbergmann committed Dec 2, 2016
    Copy the full SHA
    d548f90 View commit details

Commits on Dec 3, 2016

  1. TestCase - fix handling PHPUnit_Framework_Exception expectedException

    @keradus
    keradus committed Dec 3, 2016
    Copy the full SHA
    7c6ce93 View commit details

  2. Update ChangeLog

    @sebastianbergmann
    sebastianbergmann committed Dec 3, 2016
    Copy the full SHA
    56c80dd View commit details

  3. Leftover from 56c80dd

    @sebastianbergmann
    sebastianbergmann committed Dec 3, 2016
    Copy the full SHA
    54156a5 View commit details

  4. Improve ChangeLog entry

    @sebastianbergmann
    sebastianbergmann committed Dec 3, 2016
    Copy the full SHA
    c15d6af View commit details

Commits on Dec 9, 2016

  1. Update Composer to 1.2.4

    @sebastianbergmann
    sebastianbergmann committed Dec 9, 2016
    Copy the full SHA
    1179b75 View commit details

  2. Prepare release

    @sebastianbergmann
    sebastianbergmann committed Dec 9, 2016
    Copy the full SHA
    98b2b39 View commit details
Showing with 12 additions and 4 deletions.
  1. +7 −0 ChangeLog-4.8.md
  2. +1 −1 build/binary-phar-autoload.php.in
  3. BIN build/tools/composer
  4. +1 −1 phpunit
  5. +2 −1 src/Framework/TestCase.php
  6. +1 −1 src/Runner/Version.php
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.31] - 2016-12-09

### Fixed

* Fixed [#2384](https://github.com/sebastianbergmann/phpunit/pull/2384): Handle `PHPUnit_Framework_Exception` correctly when expecting exceptions

## [4.8.30] - 2016-12-02

### Fixed
@@ -215,6 +221,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.31]: https://github.com/sebastianbergmann/phpunit/compare/4.8.30...4.8.31
[4.8.30]: https://github.com/sebastianbergmann/phpunit/compare/4.8.29...4.8.30
[4.8.29]: https://github.com/sebastianbergmann/phpunit/compare/4.8.28...4.8.29
[4.8.28]: https://github.com/sebastianbergmann/phpunit/compare/4.8.27...4.8.28
2 changes: 1 addition & 1 deletion build/binary-phar-autoload.php.in
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ Phar::mapPhar('___PHAR___');
___FILELIST___

if ($execute) {
if (version_compare('5.3.3', PHP_VERSION, '>')) {
if (version_compare('5.3.3', PHP_VERSION, '>') && $argv[1] !== '--version') {
fwrite(
STDERR,
sprintf(
Binary file modified build/tools/composer
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion phpunit
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/

if (version_compare('5.3.3', PHP_VERSION, '>')) {
if (version_compare('5.3.3', PHP_VERSION, '>') && $argv[1] !== '--version') {
fwrite(
STDERR,
sprintf(
3 changes: 2 additions & 1 deletion src/Framework/TestCase.php
View file
Original file line number Diff line number Diff line change
@@ -925,7 +925,8 @@ protected function runTest()

$reflector = new ReflectionClass($this->expectedException);

if ($this->expectedException == 'PHPUnit_Framework_Exception' ||
if ($this->expectedException === 'PHPUnit_Framework_Exception' ||
$this->expectedException === '\PHPUnit_Framework_Exception' ||
$reflector->isSubclassOf('PHPUnit_Framework_Exception')) {
$checkException = true;
}
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.30', dirname(dirname(__DIR__)));
$version = new SebastianBergmann\Version('4.8.31', dirname(dirname(__DIR__)));
self::$version = $version->getVersion();
}