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

Commits on Apr 29, 2015

  1. Eliminate dead code

    @sebastianbergmann
    sebastianbergmann committed Apr 29, 2015
    Copy the full SHA
    27d119a View commit details

  2. Use the realpath to require the error files as HHVM does not resolve … 

    …them in phars

This avoids loading the file twice on HHVM because it considers the 2 paths to be different even though they reference the same file when normalized.
Refs #1684
    @stof
    stof committed Apr 29, 2015
    Copy the full SHA
    bf5d323 View commit details

  3. Merge pull request #1701 from stof/patch-1 

    Use the realpath to require the error files as HHVM does not resolve them in phars
    @sebastianbergmann
    sebastianbergmann committed Apr 29, 2015
    Copy the full SHA
    02852fb View commit details

  4. Update ChangeLog

    @sebastianbergmann
    sebastianbergmann committed Apr 29, 2015
    Copy the full SHA
    1edb434 View commit details

  5. Prepare release

    @sebastianbergmann
    sebastianbergmann committed Apr 29, 2015
    Copy the full SHA
    3afe303 View commit details
Showing with 10 additions and 26 deletions.
  1. +4 −0 ChangeLog-4.6.md
  2. +1 −1 src/Runner/Version.php
  3. +0 −21 src/TextUI/ResultPrinter.php
  4. +5 −4 src/Util/ErrorHandler.php
4 changes: 4 additions & 0 deletions ChangeLog-4.6.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changes in PHPUnit 4.6

## PHPUnit 4.6.6

* Fixed [#1684](https://github.com/sebastianbergmann/phpunit/issues/1684): PHAR does not work on HHVM

## PHPUnit 4.6.5

* Fixed [#1677](https://github.com/sebastianbergmann/phpunit/issues/1677): Number of risky tests not printed when there are failing tests
2 changes: 1 addition & 1 deletion src/Runner/Version.php
View file
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ public static function id()
}

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

21 changes: 0 additions & 21 deletions src/TextUI/ResultPrinter.php
View file
Original file line number Diff line number Diff line change
@@ -371,27 +371,6 @@ protected function printFooter(PHPUnit_Framework_TestResult $result)
}
}

/**
* @param integer $count
* @param string $name
* @return string
* @since Method available since Release 3.0.0
*/
protected function getCountString($count, $name)
{
$string = '';

if ($count > 0) {
$string = sprintf(
', %s: %d',
$name,
$count
);
}

return $string;
}

/**
*/
public function printWaitPrompt()
9 changes: 5 additions & 4 deletions src/Util/ErrorHandler.php
View file
Original file line number Diff line number Diff line change
@@ -10,10 +10,11 @@

// Workaround for http://bugs.php.net/bug.php?id=47987,
// see https://github.com/sebastianbergmann/phpunit/issues#issue/125 for details
require_once __DIR__ . '/../Framework/Error.php';
require_once __DIR__ . '/../Framework/Error/Notice.php';
require_once __DIR__ . '/../Framework/Error/Warning.php';
require_once __DIR__ . '/../Framework/Error/Deprecated.php';
// Use dirname(__DIR__) instead of using /../ because of https://github.com/facebook/hhvm/issues/5215
require_once dirname(__DIR__) . '/Framework/Error.php';
require_once dirname(__DIR__) . '/Framework/Error/Notice.php';
require_once dirname(__DIR__) . '/Framework/Error/Warning.php';
require_once dirname(__DIR__) . '/Framework/Error/Deprecated.php';

/**
* Error handler that converts PHP errors and warnings to exceptions.