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.16
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.17
Choose a head ref
  • 5 commits
  • 5 files changed
  • 1 contributor

Commits on Nov 4, 2015

  1. Bundle newer version of DbUnit

    Sebastian Bergmann authored and Sebastian Bergmann committed Nov 4, 2015
    Copy the full SHA
    54ee96a View commit details

  2. Closes #1935

    Sebastian Bergmann authored and Sebastian Bergmann committed Nov 4, 2015
    Copy the full SHA
    3772ec2 View commit details

  3. Use HTTPS instead of HTTP

    Sebastian Bergmann authored and Sebastian Bergmann committed Nov 4, 2015
    Copy the full SHA
    9f57eb4 View commit details

Commits on Nov 10, 2015

  1. Closes #1948

    Sebastian Bergmann authored and Sebastian Bergmann committed Nov 10, 2015
    Copy the full SHA
    4ef58ab View commit details

  2. Prepare release

    Sebastian Bergmann authored and Sebastian Bergmann committed Nov 10, 2015
    Copy the full SHA
    6cc501c View commit details
Showing with 136 additions and 97 deletions.
  1. +12 −0 ChangeLog-4.8.md
  2. +6 −3 build.xml
  3. +60 −66 build/bin/phpab
  4. +1 −1 src/Runner/Version.php
  5. +57 −27 src/TextUI/TestRunner.php
12 changes: 12 additions & 0 deletions ChangeLog-4.8.md
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,17 @@

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.17] - 2015-11-10

### Fixed

* Fixed [#1935](https://github.com/sebastianbergmann/phpunit/issues/1935): `PHP_CodeCoverage_Exception` not handled properly
* Fixed [#1948](https://github.com/sebastianbergmann/phpunit/issues/1948): Unable to use PHAR due to unsupported signature error

### Changed

* DbUnit >= 2.0.2 is now bundled in the PHAR distribution

## [4.8.16] - 2015-10-23

### Added
@@ -120,6 +131,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.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
[4.8.14]: https://github.com/sebastianbergmann/phpunit/compare/4.8.13...4.8.14
9 changes: 6 additions & 3 deletions build.xml
View file
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@
<exec executable="php">
<arg value="composer.phar"/>
<arg value="require"/>
<arg value="phpunit/dbunit:~1.4"/>
<arg value="phpunit/dbunit:~2.0.2"/>
<arg value="phpunit/phpunit-selenium:~1.4"/>
<arg value="phpunit/php-invoker:~1.1"/>
</exec>
@@ -208,9 +208,8 @@
</copy>

<copy todir="${basedir}/build/phar/dbunit">
<fileset dir="${basedir}/vendor/phpunit/dbunit/PHPUnit">
<fileset dir="${basedir}/vendor/phpunit/dbunit/src">
<include name="**/*.php" />
<exclude name="**/Autoload.*" />
</fileset>
</copy>

@@ -259,6 +258,8 @@
<arg value="--static" />
<arg value="--once" />
<arg value="--phar" />
<arg value="--hash" />
<arg value="SHA-1" />
<arg value="--output" />
<arg path="${basedir}/build/phpunit-library-${_version}.phar" />
<arg value="--template" />
@@ -270,6 +271,8 @@
<arg value="--all" />
<arg value="--static" />
<arg value="--phar" />
<arg value="--hash" />
<arg value="SHA-1" />
<arg value="--output" />
<arg path="${basedir}/build/phpunit-${_version}.phar" />
<arg value="--template" />
126 changes: 60 additions & 66 deletions build/bin/phpab
View file

Large diffs are not rendered by default.

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.16', dirname(dirname(__DIR__)));
$version = new SebastianBergmann\Version('4.8.17', dirname(dirname(__DIR__)));
self::$version = $version->getVersion();
}

84 changes: 57 additions & 27 deletions src/TextUI/TestRunner.php
View file
Original file line number Diff line number Diff line change
@@ -452,55 +452,79 @@ class_exists($arguments['printer'], false)) {
"\nGenerating code coverage report in Clover XML format ..."
);

$writer = new PHP_CodeCoverage_Report_Clover;
$writer->process($codeCoverage, $arguments['coverageClover']);
try {
$writer = new PHP_CodeCoverage_Report_Clover;
$writer->process($codeCoverage, $arguments['coverageClover']);

$this->printer->write(" done\n");
unset($writer);
$this->printer->write(" done\n");
unset($writer);
} catch (PHP_CodeCoverage_Exception $e) {
$this->printer->write(
" failed\n" . $e->getMessage() . "\n"
);
}
}

if (isset($arguments['coverageCrap4J'])) {
$this->printer->write(
"\nGenerating Crap4J report XML file ..."
);

$writer = new PHP_CodeCoverage_Report_Crap4j($arguments['crap4jThreshold']);
$writer->process($codeCoverage, $arguments['coverageCrap4J']);
try {
$writer = new PHP_CodeCoverage_Report_Crap4j($arguments['crap4jThreshold']);
$writer->process($codeCoverage, $arguments['coverageCrap4J']);

$this->printer->write(" done\n");
unset($writer);
$this->printer->write(" done\n");
unset($writer);
} catch (PHP_CodeCoverage_Exception $e) {
$this->printer->write(
" failed\n" . $e->getMessage() . "\n"
);
}
}

if (isset($arguments['coverageHtml'])) {
$this->printer->write(
"\nGenerating code coverage report in HTML format ..."
);

$writer = new PHP_CodeCoverage_Report_HTML(
$arguments['reportLowUpperBound'],
$arguments['reportHighLowerBound'],
sprintf(
' and <a href="http://phpunit.de/">PHPUnit %s</a>',
PHPUnit_Runner_Version::id()
)
);
try {
$writer = new PHP_CodeCoverage_Report_HTML(
$arguments['reportLowUpperBound'],
$arguments['reportHighLowerBound'],
sprintf(
' and <a href="https://phpunit.de/">PHPUnit %s</a>',
PHPUnit_Runner_Version::id()
)
);

$writer->process($codeCoverage, $arguments['coverageHtml']);
$writer->process($codeCoverage, $arguments['coverageHtml']);

$this->printer->write(" done\n");
unset($writer);
$this->printer->write(" done\n");
unset($writer);
} catch (PHP_CodeCoverage_Exception $e) {
$this->printer->write(
" failed\n" . $e->getMessage() . "\n"
);
}
}

if (isset($arguments['coveragePHP'])) {
$this->printer->write(
"\nGenerating code coverage report in PHP format ..."
);

$writer = new PHP_CodeCoverage_Report_PHP;
$writer->process($codeCoverage, $arguments['coveragePHP']);
try {
$writer = new PHP_CodeCoverage_Report_PHP;
$writer->process($codeCoverage, $arguments['coveragePHP']);

$this->printer->write(" done\n");
unset($writer);
$this->printer->write(" done\n");
unset($writer);
} catch (PHP_CodeCoverage_Exception $e) {
$this->printer->write(
" failed\n" . $e->getMessage() . "\n"
);
}
}

if (isset($arguments['coverageText'])) {
@@ -529,11 +553,17 @@ class_exists($arguments['printer'], false)) {
"\nGenerating code coverage report in PHPUnit XML format ..."
);

$writer = new PHP_CodeCoverage_Report_XML;
$writer->process($codeCoverage, $arguments['coverageXml']);
try {
$writer = new PHP_CodeCoverage_Report_XML;
$writer->process($codeCoverage, $arguments['coverageXml']);

$this->printer->write(" done\n");
unset($writer);
$this->printer->write(" done\n");
unset($writer);
} catch (PHP_CodeCoverage_Exception $e) {
$this->printer->write(
" failed\n" . $e->getMessage() . "\n"
);
}
}
}