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

Commits on Feb 3, 2016

  1. fix for missing loggerType coverage-xml in .xsd

    added missing loggerType coverage-xml to phpunit.xsd file
    thoys authored and sebastianbergmann committed Feb 3, 2016
    Copy the full SHA
    1ae3a68 View commit details

Commits on Feb 11, 2016

  1. Closes #2072

    Sebastian Bergmann authored and Sebastian Bergmann committed Feb 11, 2016
    Copy the full SHA
    4b3272e View commit details
  2. Prepare release

    Sebastian Bergmann authored and Sebastian Bergmann committed Feb 11, 2016
    Copy the full SHA
    6e35126 View commit details
Showing with 17 additions and 2 deletions.
  1. +8 −1 ChangeLog-4.8.md
  2. +1 −0 phpunit.xsd
  3. +1 −1 src/Runner/Version.php
  4. +3 −0 src/Util/Configuration.php
  5. +1 −0 tests/Util/ConfigurationTest.php
  6. +3 −0 tests/_files/configuration.xml
9 changes: 8 additions & 1 deletion ChangeLog-4.8.md
Original file line number Diff line number Diff line change
@@ -2,9 +2,15 @@

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.23] - 2016-02-11

### Fixed

* Fixed [#2072](https://github.com/sebastianbergmann/phpunit/issues/2072): Paths in XML configuration file were not handled correctly when they have whitespace around them

## [4.8.22] - 2016-02-02

### Changed
### Fixed

* Fixed [#2050](https://github.com/sebastianbergmann/phpunit/issues/2050): `PHPUnit_Util_XML::load()` raises exception with empty message when XML string is empty
* Fixed a bug in `PHPUnit_Runner_Version::series()`
@@ -163,6 +169,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.23]: https://github.com/sebastianbergmann/phpunit/compare/4.8.22...4.8.23
[4.8.22]: https://github.com/sebastianbergmann/phpunit/compare/4.8.21...4.8.22
[4.8.21]: https://github.com/sebastianbergmann/phpunit/compare/4.8.20...4.8.21
[4.8.20]: https://github.com/sebastianbergmann/phpunit/compare/4.8.19...4.8.20
1 change: 1 addition & 0 deletions phpunit.xsd
Original file line number Diff line number Diff line change
@@ -118,6 +118,7 @@
<xs:enumeration value="coverage-text"/>
<xs:enumeration value="coverage-clover"/>
<xs:enumeration value="coverage-crap4j"/>
<xs:enumeration value="coverage-xml"/>
<xs:enumeration value="json"/>
<xs:enumeration value="plain"/>
<xs:enumeration value="tap"/>
2 changes: 1 addition & 1 deletion src/Runner/Version.php
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.22', dirname(dirname(__DIR__)));
$version = new SebastianBergmann\Version('4.8.23', dirname(dirname(__DIR__)));
self::$version = $version->getVersion();
}

3 changes: 3 additions & 0 deletions src/Util/Configuration.php
Original file line number Diff line number Diff line change
@@ -1099,6 +1099,7 @@ protected function readFilterFiles($query)

foreach ($this->xpath->query($query) as $file) {
$filePath = (string) $file->textContent;

if ($filePath) {
$files[] = $this->toAbsolutePath($filePath);
}
@@ -1117,6 +1118,8 @@ protected function readFilterFiles($query)
*/
protected function toAbsolutePath($path, $useIncludePath = false)
{
$path = trim($path);

if ($path[0] === '/') {
return $path;
}
1 change: 1 addition & 0 deletions tests/Util/ConfigurationTest.php
Original file line number Diff line number Diff line change
@@ -103,6 +103,7 @@ public function testFilterConfigurationIsReadCorrectly()
'file' =>
array(
0 => '/path/to/file',
1 => '/path/to/file',
),
),
'exclude' =>
3 changes: 3 additions & 0 deletions tests/_files/configuration.xml
Original file line number Diff line number Diff line change
@@ -45,6 +45,9 @@
<blacklist>
<directory suffix=".php">/path/to/files</directory>
<file>/path/to/file</file>
<file>
/path/to/file
</file>
<exclude>
<directory suffix=".php">/path/to/files</directory>
<file>/path/to/file</file>