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

Commits on Nov 22, 2016

  1. Fix count() typo

    Discovered running tests w/ PHP 7.2-dev
    mbeccati committed Nov 22, 2016
    1

    Verified

    This commit was signed with the committer’s verified signature.
    AVVS Vitaly Aminev
    Copy the full SHA
    edb0ad1 View commit details
  2. Update ChangeLog

    sebastianbergmann committed Nov 22, 2016

    Verified

    This commit was signed with the committer’s verified signature.
    targos Michaël Zasso
    Copy the full SHA
    7cfe1c2 View commit details
  3. Verified

    This commit was signed with the committer’s verified signature.
    aduh95 Antoine du Hamel
    Copy the full SHA
    6949dff View commit details
  4. Verified

    This commit was signed with the committer’s verified signature.
    ruyadorno Ruy Adorno
    Copy the full SHA
    c538310 View commit details
  5. Verified

    This commit was signed with the committer’s verified signature.
    ruyadorno Ruy Adorno
    Copy the full SHA
    50af70c View commit details

Commits on Nov 24, 2016

  1. Cleanup

    sebastianbergmann committed Nov 24, 2016
    Copy the full SHA
    2d4f894 View commit details

Commits on Nov 25, 2016

  1. Verified

    This commit was signed with the committer’s verified signature.
    ruyadorno Ruy Adorno
    Copy the full SHA
    0f80c77 View commit details

Commits on Nov 28, 2016

  1. Closes #2375

    sebastianbergmann committed Nov 28, 2016

    Unverified

    No user is associated with the committer email.
    Copy the full SHA
    42ca871 View commit details
  2. Update PHPAB

    sebastianbergmann committed Nov 28, 2016
    Copy the full SHA
    eb80c1f View commit details

Commits on Dec 1, 2016

  1. Copy the full SHA
    2e6b07a View commit details
  2. Prepare release

    sebastianbergmann committed Dec 1, 2016
    Copy the full SHA
    a534e04 View commit details
8 changes: 8 additions & 0 deletions ChangeLog-4.8.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,13 @@

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.30] - 2016-12-02

### Fixed

* Fixed [#2367](https://github.com/sebastianbergmann/phpunit/pull/2367): Bug in `PHPUnit_Util_Test::parseAnnotationContent()`
* Fixed [#2375](https://github.com/sebastianbergmann/phpunit/issues/2375): Invalid regular expression for `--filter` causes PHP warning

## [4.8.29] - 2016-11-20

### Changed
@@ -208,6 +215,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.30]: https://github.com/sebastianbergmann/phpunit/compare/4.8.29...4.8.30
[4.8.29]: https://github.com/sebastianbergmann/phpunit/compare/4.8.28...4.8.29
[4.8.28]: https://github.com/sebastianbergmann/phpunit/compare/4.8.27...4.8.28
[4.8.27]: https://github.com/sebastianbergmann/phpunit/compare/4.8.26...4.8.27
13 changes: 12 additions & 1 deletion build.xml
Original file line number Diff line number Diff line change
@@ -45,7 +45,13 @@
<target name="install-dependencies" unless="dependencies-installed" depends="-dependencies-installed,validate-composer-json" description="Install dependencies with Composer">
<exec executable="${basedir}/build/tools/composer" taskname="composer">
<env key="COMPOSER_DISABLE_XDEBUG_WARN" value="1"/>
<arg value="install"/>
<arg value="update"/>
<arg value="--no-interaction"/>
<arg value="--no-progress"/>
<arg value="--no-ansi"/>
<arg value="--no-suggest"/>
<arg value="--optimize-autoloader"/>
<arg value="--prefer-stable"/>
</exec>
</target>

@@ -82,12 +88,16 @@

<target name="signed-phar" depends="phar" description="Create signed PHAR archive of PHPUnit and all its dependencies">
<exec executable="gpg" failonerror="true">
<arg value="--local-user"/>
<arg value="sb@sebastian-bergmann.de"/>
<arg value="--armor"/>
<arg value="--detach-sign"/>
<arg path="${basedir}/build/phpunit-library-${version}.phar"/>
</exec>

<exec executable="gpg" failonerror="true">
<arg value="--local-user"/>
<arg value="sb@sebastian-bergmann.de"/>
<arg value="--armor"/>
<arg value="--detach-sign"/>
<arg path="${basedir}/build/phpunit-${version}.phar"/>
@@ -111,6 +121,7 @@
<copy file="${basedir}/composer.json" tofile="${basedir}/composer.json.bak"/>

<exec executable="${basedir}/build/tools/composer">
<env key="COMPOSER_DISABLE_XDEBUG_WARN" value="1"/>
<arg value="require"/>
<arg value="phpunit/dbunit:~1.4"/>
<arg value="phpunit/phpunit-selenium:~1.4"/>
7 changes: 6 additions & 1 deletion build/binary-phar-autoload.php.in
Original file line number Diff line number Diff line change
@@ -17,7 +17,12 @@ if ($execute) {
if (version_compare('5.3.3', PHP_VERSION, '>')) {
fwrite(
STDERR,
'This version of PHPUnit requires PHP 5.3.3; using the latest version of PHP is highly recommended.' . PHP_EOL
sprintf(
'This version of PHPUnit is supported on PHP 5.3, PHP 5.4, PHP 5.5, and PHP 5.6.' . PHP_EOL .
'You are using PHP %s%s.' . PHP_EOL,
PHP_VERSION,
defined('PHP_BINARY') ? ' (' . PHP_BINARY . ')' : ''
)
);

die(1);
Binary file modified build/tools/composer
Binary file not shown.
Loading