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.4
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.5
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Aug 18, 2015

  1. Rename a parameter of function assertJson 

    Rename `$expectedJson` to `$actualJson` according to commit
672d9c9. Also, rename param `$filename` in
docblock, which seems to be a typo, to `$actualJson`.
    @lancechentw @sebastianbergmann
    lancechentw authored and sebastianbergmann committed Aug 18, 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
    650f482 View commit details

Commits on Aug 19, 2015

  1. Closes #1831

    @sebastianbergmann
    sebastianbergmann committed Aug 19, 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
    fc0e5e2 View commit details

  2. Prepare release

    @sebastianbergmann
    sebastianbergmann committed Aug 19, 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
    9b7417e View commit details
Showing with 11 additions and 4 deletions.
  1. +7 −0 ChangeLog-4.8.md
  2. +1 −1 build/phar-autoload.php.in
  3. +2 −2 src/Framework/Assert/Functions.php
  4. +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.5] - 2015-08-19

### Fixed

* Fixed [#1831](https://github.com/sebastianbergmann/phpunit/issues/1831): PHAR manifest is missing

## [4.8.4] - 2015-08-15

### Fixed
@@ -41,6 +47,7 @@ All notable changes of the PHPUnit 4.8 release series are documented in this fil
* 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.5]: https://github.com/sebastianbergmann/phpunit/compare/4.8.4...4.8.5
[4.8.4]: https://github.com/sebastianbergmann/phpunit/compare/4.8.3...4.8.4
[4.8.3]: https://github.com/sebastianbergmann/phpunit/compare/4.8.2...4.8.3
[4.8.2]: https://github.com/sebastianbergmann/phpunit/compare/4.8.1...4.8.2
2 changes: 1 addition & 1 deletion build/phar-autoload.php.in
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ if ($execute) {
}

if (isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == '--manifest') {
print file_get_contents(__PHPUNIT_PHAR_ROOT__ . '/manifest.txt');
print file_get_contents(__PHPUNIT_PHAR_ROOT__ . '/phar/manifest.txt');
exit;
}

4 changes: 2 additions & 2 deletions src/Framework/Assert/Functions.php
View file
Original file line number Diff line number Diff line change
@@ -808,11 +808,11 @@ function assertInternalType($expected, $actual, $message = '')
/**
* Asserts that a string is a valid JSON string.
*
* @param string $filename
* @param string $actualJson
* @param string $message
* @since Method available since Release 3.7.20
*/
function assertJson($expectedJson, $message = '')
function assertJson($actualJson, $message = '')
{
return call_user_func_array(
'PHPUnit_Framework_Assert::assertJson',
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.4', dirname(dirname(__DIR__)));
$version = new SebastianBergmann\Version('4.8.5', dirname(dirname(__DIR__)));
self::$version = $version->getVersion();
}