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.12
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.13
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 14, 2015

  1. Closes #1903

    @sebastianbergmann
    sebastianbergmann committed Oct 14, 2015
    Copy the full SHA
    0c822fd View commit details

  2. Prepare release

    @sebastianbergmann
    sebastianbergmann committed Oct 14, 2015
    Copy the full SHA
    be067d6 View commit details
Showing with 51 additions and 7 deletions.
  1. +11 −0 ChangeLog-4.8.md
  2. +11 −1 src/Runner/Version.php
  3. +29 −6 src/TextUI/Command.php
11 changes: 11 additions & 0 deletions ChangeLog-4.8.md
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,16 @@

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.13] - 2015-10-14

### Added

* Added the `--self-upgrade` commandline switch for upgrading a PHPUnit PHAR to the latest version

### Changed

* The `--self-update` commandline switch now updates a PHPUnit PHAR to the latest version within the same release series

## [4.8.12] - 2015-10-12

### Changed
@@ -91,6 +101,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.13]: https://github.com/sebastianbergmann/phpunit/compare/4.8.12...4.8.13
[4.8.12]: https://github.com/sebastianbergmann/phpunit/compare/4.8.11...4.8.12
[4.8.11]: https://github.com/sebastianbergmann/phpunit/compare/4.8.10...4.8.11
[4.8.10]: https://github.com/sebastianbergmann/phpunit/compare/4.8.9...4.8.10
12 changes: 11 additions & 1 deletion src/Runner/Version.php
View file
Original file line number Diff line number Diff line change
@@ -30,13 +30,23 @@ public static function id()
}

if (self::$version === null) {
$version = new SebastianBergmann\Version('4.8.12', dirname(dirname(__DIR__)));
$version = new SebastianBergmann\Version('4.8.13', dirname(dirname(__DIR__)));
self::$version = $version->getVersion();
}

return self::$version;
}

/**
* @return string
*
* @since Method available since Release 4.8.13
*/
public static function series()
{
return join('.', array_slice(explode('.', self::id()), 0, 2));
}

/**
* @return string
*/
35 changes: 29 additions & 6 deletions src/TextUI/Command.php
View file
Original file line number Diff line number Diff line change
@@ -229,6 +229,8 @@ protected function handleArguments(array $argv)
$this->longOptions['check-version'] = null;
$this->longOptions['selfupdate'] = null;
$this->longOptions['self-update'] = null;
$this->longOptions['selfupgrade'] = null;
$this->longOptions['self-upgrade'] = null;
}

try {
@@ -486,6 +488,15 @@ protected function handleArguments(array $argv)
$this->handleSelfUpdate();
break;

case '--selfupgrade':
case '--self-upgrade':
$this->handleSelfUpdate(true);
break;

case '--whitelist':
$this->arguments['whitelist'] = $option[1];
break;

default:
$optionName = str_replace('--', '', $option[0]);

@@ -774,7 +785,7 @@ protected function handleBootstrap($filename)
/**
* @since Method available since Release 4.0.0
*/
protected function handleSelfUpdate()
protected function handleSelfUpdate($upgrade = false)
{
$this->printVersionString();

@@ -790,10 +801,21 @@ protected function handleSelfUpdate()
exit(PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT);
}

if (PHP_VERSION_ID < 50600) {
$remoteFilename = sprintf('https://phar.phpunit.de/phpunit-old.phar');
if (!$upgrade) {
$remoteFilename = sprintf(
'https://phar.phpunit.de/phpunit-%s.phar',
file_get_contents(
sprintf(
'https://phar.phpunit.de/latest-version-of/phpunit-%s',
PHPUnit_Runner_Version::series()
)
)
);
} else {
$remoteFilename = sprintf('https://phar.phpunit.de/phpunit.phar');
$remoteFilename = sprintf(
'https://phar.phpunit.de/phpunit%s.phar',
PHPUnit_Runner_Version::getReleaseChannel()
);
}

$tempFilename = tempnam(sys_get_temp_dir(), 'phpunit') . '.phar';
@@ -862,7 +884,7 @@ protected function handleVersionCheck()

if ($isOutdated) {
print "You are not using the latest version of PHPUnit.\n";
print 'Use "phpunit --self-update" to install PHPUnit ' . $latestVersion . "\n";
print 'Use "phpunit --self-upgrade" to install PHPUnit ' . $latestVersion . "\n";
} else {
print "You are using the latest version of PHPUnit.\n";
}
@@ -958,7 +980,8 @@ protected function showHelp()

if (defined('__PHPUNIT_PHAR__')) {
print "\n --check-version Check whether PHPUnit is the latest version.";
print "\n --self-update Update PHPUnit to the latest version.\n";
print "\n --self-update Update PHPUnit to the latest version within the same\n release series.\n";
print "\n --self-upgrade Upgrade PHPUnit to the latest version.\n";
}
}