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

Commits on Nov 11, 2015

  1. Leftover from fa33d4a

    Sebastian Bergmann authored and Sebastian Bergmann committed Nov 11, 2015
    Copy the full SHA
    6f9251d View commit details

Commits on Nov 17, 2015

  1. Fix insulated tests with phpdbg

    @nicolas-grekas
    nicolas-grekas committed Nov 17, 2015
    Copy the full SHA
    3aaddb1 View commit details

  2. Update ChangeLog

    Sebastian Bergmann authored and Sebastian Bergmann committed Nov 17, 2015
    Copy the full SHA
    d82e69c View commit details

Commits on Nov 30, 2015

  1. Prepare release

    Sebastian Bergmann authored and Sebastian Bergmann committed Nov 30, 2015
    Copy the full SHA
    b2caaf8 View commit details
Showing with 18 additions and 2 deletions.
  1. +8 −0 ChangeLog-4.8.md
  2. +1 −1 src/Runner/Version.php
  3. +6 −1 src/Util/PHP/Default.php
  4. +3 −0 src/Util/PHP/eval-stdin.php
8 changes: 8 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.19] - 2015-11-30

### Fixed

* Fixed [#1955](https://github.com/sebastianbergmann/phpunit/issues/1955): Process isolation fails when running tests with `phpdbg -qrr`

## [4.8.18] - 2015-11-11

### Changed
@@ -137,6 +143,8 @@ 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.19]: https://github.com/sebastianbergmann/phpunit/compare/4.8.18...4.8.19
[4.8.18]: https://github.com/sebastianbergmann/phpunit/compare/4.8.17...4.8.18
[4.8.17]: https://github.com/sebastianbergmann/phpunit/compare/4.8.16...4.8.17
[4.8.16]: https://github.com/sebastianbergmann/phpunit/compare/4.8.15...4.8.16
[4.8.15]: https://github.com/sebastianbergmann/phpunit/compare/4.8.14...4.8.15
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.18', dirname(dirname(__DIR__)));
$version = new SebastianBergmann\Version('4.8.19', dirname(dirname(__DIR__)));
self::$version = $version->getVersion();
}

7 changes: 6 additions & 1 deletion src/Util/PHP/Default.php
View file
Original file line number Diff line number Diff line change
@@ -30,9 +30,14 @@ class PHPUnit_Util_PHP_Default extends PHPUnit_Util_PHP
public function runJob($job, array $settings = array())
{
$runtime = new Runtime;
$runtime = $runtime->getBinary() . $this->settingsToParameters($settings);

if ('phpdbg' === PHP_SAPI) {
$runtime .= ' -qrr '.escapeshellarg(__DIR__ . '/eval-stdin.php');
}

$process = proc_open(
$runtime->getBinary() . $this->settingsToParameters($settings),
$runtime,
array(
0 => array('pipe', 'r'),
1 => array('pipe', 'w'),
3 changes: 3 additions & 0 deletions src/Util/PHP/eval-stdin.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?php

eval('?>'.file_get_contents('php://input'));