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

Commits on Aug 14, 2015

  1. Columns attribute in phpunit.xml is ignored

    @m157y @sebastianbergmann
    m157y authored and sebastianbergmann committed Aug 14, 2015
    Copy the full SHA
    c382968 View commit details

  2. Update ChangeLog

    @sebastianbergmann
    sebastianbergmann committed Aug 14, 2015
    Copy the full SHA
    4493eaf View commit details

Commits on Aug 15, 2015

  1. Bump

    @sebastianbergmann
    sebastianbergmann committed Aug 15, 2015
    Copy the full SHA
    1aa11af View commit details

  2. Prepare release

    @sebastianbergmann
    sebastianbergmann committed Aug 15, 2015
    Copy the full SHA
    55bf1d6 View commit details
Showing with 13 additions and 1 deletion.
  1. +7 −0 ChangeLog-4.8.md
  2. +1 −1 src/Runner/Version.php
  3. +5 −0 src/TextUI/Command.php
7 changes: 7 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.4] - 2015-08-15

### Fixed

* Fixed [#1823](https://github.com/sebastianbergmann/phpunit/issues/1823): Columns attribute in XML configuration file is ignored

## [4.8.3] - 2015-08-10

### Changed
@@ -35,6 +41,7 @@ All notable changes of the PHPUnit 4.8 release series are documented in this fil
* 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.4]: https://github.com/sebastianbergmann/phpunit/compare/4.8.3...4.8.4
[4.8.3]: https://github.com/sebastianbergmann/phpunit/compare/4.8.2...4.8.3
[4.8.2]: https://github.com/sebastianbergmann/phpunit/compare/4.8.1...4.8.2
[4.8.1]: https://github.com/sebastianbergmann/phpunit/compare/4.8.0...4.8.1
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.3', dirname(dirname(__DIR__)));
$version = new SebastianBergmann\Version('4.8.4', dirname(dirname(__DIR__)));
self::$version = $version->getVersion();
}

5 changes: 5 additions & 0 deletions src/TextUI/Command.php
View file
Original file line number Diff line number Diff line change
@@ -592,6 +592,11 @@ protected function handleArguments(array $argv)
$this->arguments['stderr'] = $phpunit['stderr'];
}


if (isset($phpunit['columns']) && ! isset($this->arguments['columns'])) {
$this->arguments['columns'] = $phpunit['columns'];
}

if (isset($phpunit['printerClass'])) {
if (isset($phpunit['printerFile'])) {
$file = $phpunit['printerFile'];