Merge branch '6.0'

ezpublishlegacy · Mar 28, 2017 · f96c9da · f96c9da
2 parents f671214 + 0d5be8c
commit f96c9da
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ChangeLog-6.0.md b/ChangeLog-6.0.md
@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 6.0 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [6.0.11] - 2017-MM-DD
+
+### Fixed
+
+* Fixed [#2584](https://github.com/sebastianbergmann/phpunit/issues/2584): Wrong path to `eval-stdin.php`
+
 ## [6.0.10] - 2017-03-19
 
 ### Fixed
@@ -131,6 +137,7 @@ All notable changes of the PHPUnit 6.0 release series are documented in this fil
 * DbUnit is no longer bundled in the PHAR distribution of PHPUnit
 * PHPUnit is no longer supported on PHP 5.6
 
+[6.0.11]: https://github.com/sebastianbergmann/phpunit/compare/6.0.10...6.0.11
 [6.0.10]: https://github.com/sebastianbergmann/phpunit/compare/6.0.9...6.0.10
 [6.0.9]: https://github.com/sebastianbergmann/phpunit/compare/6.0.8...6.0.9
 [6.0.8]: https://github.com/sebastianbergmann/phpunit/compare/6.0.7...6.0.8

diff --git a/src/Util/PHP/AbstractPhpProcess.php b/src/Util/PHP/AbstractPhpProcess.php
@@ -225,7 +225,7 @@ public function getCommand(array $settings, $file = null)
             if ($file) {
                 $command .= '-e ' . escapeshellarg($file);
             } else {
-                $command .= escapeshellarg(__DIR__ . '/PHP/eval-stdin.php');
+                $command .= escapeshellarg(__DIR__ . '/eval-stdin.php');
             }
         } elseif ($file) {
             $command .= ' -f ' . escapeshellarg($file);