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.6.9
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.6.10
Choose a head ref
  • 16 commits
  • 10 files changed
  • 6 contributors

Commits on Jun 2, 2015

  1. Mute chdir failures 

    chdir() can be disabled in some environments. In which case it will error with an `E_WARNING`. 

Processing of the configuration works fine though, so there is no need to error out. If an error happens it should do something on line 131.

Stack for the warning: 

````
phpunit-unittests:
     [exec] PHP Warning:  chdir() has been disabled for security reasons in phar:///usr/bin/phpunit/phpunit/Util/XML.php on line 108
     [exec] PHP Stack trace:
     [exec] PHP   1. {main}() /usr/bin/phpunit:0
     [exec] PHP   2. PHPUnit_TextUI_Command::main() /usr/bin/phpunit:535
     [exec] PHP   3. PHPUnit_TextUI_Command->run() phar:///usr/bin/phpunit/phpunit/TextUI/Command.php:105
     [exec] PHP   4. PHPUnit_TextUI_Command->handleArguments() phar:///usr/bin/phpunit/phpunit/TextUI/Command.php:115
     [exec] PHP   5. PHPUnit_Util_Configuration::getInstance() phar:///usr/bin/phpunit/phpunit/TextUI/Command.php:612
     [exec] PHP   6. PHPUnit_Util_Configuration->__construct() phar:///usr/bin/phpunit/phpunit/Util/Configuration.php:196
     [exec] PHP   7. PHPUnit_Util_XML::loadFile() phar:///usr/bin/phpunit/phpunit/Util/Configuration.php:164
     [exec] PHP   8. PHPUnit_Util_XML::load() phar:///usr/bin/phpunit/phpunit/Util/XML.php:71
     [exec] PHP   9. chdir() phar:///usr/bin/phpunit/phpunit/Util/XML.php:108
     [exec] PHP Warning:  chdir() has been disabled for security reasons in phar:///usr/bin/phpunit/phpunit/Util/XML.php on line 140
     [exec] PHP Stack trace:
     [exec] PHP   1. {main}() /usr/bin/phpunit:0
     [exec] PHP   2. PHPUnit_TextUI_Command::main() /usr/bin/phpunit:535
     [exec] PHP   3. PHPUnit_TextUI_Command->run() phar:///usr/bin/phpunit/phpunit/TextUI/Command.php:105
     [exec] PHP   4. PHPUnit_TextUI_Command->handleArguments() phar:///usr/bin/phpunit/phpunit/TextUI/Command.php:115
     [exec] PHP   5. PHPUnit_Util_Configuration::getInstance() phar:///usr/bin/phpunit/phpunit/TextUI/Command.php:612
     [exec] PHP   6. PHPUnit_Util_Configuration->__construct() phar:///usr/bin/phpunit/phpunit/Util/Configuration.php:196
     [exec] PHP   7. PHPUnit_Util_XML::loadFile() phar:///usr/bin/phpunit/phpunit/Util/Configuration.php:164
     [exec] PHP   8. PHPUnit_Util_XML::load() phar:///usr/bin/phpunit/phpunit/Util/XML.php:71
     [exec] PHP   9. chdir() phar:///usr/bin/phpunit/phpunit/Util/XML.php:140
     [exec] PHPUnit 4.6.4 by Sebastian Bergmann and contributors.
````
    @sebastianbergmann
    Willem Stuursma authored and sebastianbergmann committed Jun 2, 2015
    Copy the full SHA
    67c9fb1 View commit details

  2. Avoid hardcode URI to phpunit.xsd 

    Using URI reference to local phpunit.xsd avoid the need of update the XSD for each release.
    @Maks3w @sebastianbergmann
    Maks3w authored and sebastianbergmann committed Jun 2, 2015

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fce09d5 View commit details

  3. Fix phpDox metadata

    @DavidPrevot @sebastianbergmann
    DavidPrevot authored and sebastianbergmann committed Jun 2, 2015

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bd4ca2a View commit details

  4. Fixed malformed doc comment descriptions

    @shira-374 @sebastianbergmann
    shira-374 authored and sebastianbergmann committed Jun 2, 2015

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f4d8fcb View commit details

  5. Wrapped long doc comment descriptions

    @shira-374 @sebastianbergmann
    shira-374 authored and sebastianbergmann committed Jun 2, 2015
    Copy the full SHA
    ce98571 View commit details

Commits on Jun 3, 2015

  1. Verify that phar file can be overwritten before attempting self update

    @theseer @sebastianbergmann
    theseer authored and sebastianbergmann committed Jun 3, 2015
    Copy the full SHA
    a8c63df View commit details

  2. Fix whitespace

    @sebastianbergmann
    sebastianbergmann committed Jun 3, 2015
    Copy the full SHA
    a8b57af View commit details

  3. Move check

    @sebastianbergmann
    sebastianbergmann committed Jun 3, 2015
    Copy the full SHA
    83c9e93 View commit details

  4. Add additional check

    @sebastianbergmann
    sebastianbergmann committed Jun 3, 2015
    Copy the full SHA
    404adde View commit details

  5. Use constant

    @sebastianbergmann
    sebastianbergmann committed Jun 3, 2015
    Copy the full SHA
    1431b80 View commit details

  6. Update for Symfony/Yaml 2.7

    @sebastianbergmann
    sebastianbergmann committed Jun 3, 2015
    Copy the full SHA
    909daf3 View commit details

  7. Revert "Add additional check" 

    This reverts commit 404adde.
    @sebastianbergmann
    sebastianbergmann committed Jun 3, 2015
    Copy the full SHA
    9900373 View commit details

  8. Update ChangeLog

    @sebastianbergmann
    sebastianbergmann committed Jun 3, 2015
    Copy the full SHA
    06b645c View commit details

  9. Closes #1737

    @sebastianbergmann
    sebastianbergmann committed Jun 3, 2015
    Copy the full SHA
    00b9b5d View commit details

  10. Better fix for #1737

    @sebastianbergmann
    sebastianbergmann committed Jun 3, 2015
    Copy the full SHA
    41432ce View commit details

  11. Prepare release

    @sebastianbergmann
    sebastianbergmann committed Jun 3, 2015
    Copy the full SHA
    7b5fe98 View commit details
Showing with 118 additions and 98 deletions.
  1. +9 −0 ChangeLog-4.6.md
  2. +1 −1 build.xml
  3. +1 −1 phpdox.xml.dist
  4. +1 −1 phpunit.xml.dist
  5. +9 −12 src/Framework/Assert/Functions.php
  6. +13 −16 src/Framework/TestCase.php
  7. +1 −1 src/Runner/Version.php
  8. +9 −3 src/TextUI/Command.php
  9. +72 −61 src/Util/TestDox/ResultPrinter.php
  10. +2 −2 src/Util/XML.php
9 changes: 9 additions & 0 deletions ChangeLog-4.6.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changes in PHPUnit 4.6

## PHPUnit 4.6.10

* Merged [#1693](https://github.com/sebastianbergmann/phpunit/pull/1693): Improved API documentation
* Merged [#1706](https://github.com/sebastianbergmann/phpunit/pull/1706): Avoid hard-coded URI to `phpunit.xsd`
* Merged [#1725](https://github.com/sebastianbergmann/phpunit/pull/1725): Update phpDox XSD URI
* Merged [#1735](https://github.com/sebastianbergmann/phpunit/pull/1735): Mute `chdir()` failures in XInclude handling of XML configuration file
* Merged [#1736](https://github.com/sebastianbergmann/phpunit/pull/1736): Verify that phar file can be overwritten before attempting self update
* Fixed [#1737](https://github.com/sebastianbergmann/phpunit/issues/1737): Confusing output from `--testdox` for empty test class

## PHPUnit 4.6.9

* Fixed [#1731](https://github.com/sebastianbergmann/phpunit/issues/1731): `.` after failure count has no background color when `--colors` is used
2 changes: 1 addition & 1 deletion build.xml
View file
Original file line number Diff line number Diff line change
@@ -319,7 +319,7 @@
</fileset>
</copy>

<copy file="${basedir}/vendor/symfony/yaml/Symfony/Component/Yaml/LICENSE" tofile="${basedir}/build/phar/symfony/LICENSE"/>
<copy file="${basedir}/vendor/symfony/yaml/LICENSE" tofile="${basedir}/build/phar/symfony/LICENSE"/>
<copy todir="${basedir}/build/phar/symfony">
<fileset dir="${basedir}/vendor/symfony">
<include name="**/*.php" />
2 changes: 1 addition & 1 deletion phpdox.xml.dist
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<phpdox xmlns="http://phpdox.net/config">
<phpdox xmlns="http://xml.phpdox.net/config">
<project name="PHPUnit" source="src" workdir="build/phpdox">
<collector publiconly="false">
<include mask="*.php" />
2 changes: 1 addition & 1 deletion phpunit.xml.dist
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.4/phpunit.xsd"
xsi:noNamespaceSchemaLocation="phpunit.xsd"
bootstrap="tests/bootstrap.php"
backupGlobals="false"
verbose="true">
21 changes: 9 additions & 12 deletions src/Framework/Assert/Functions.php
View file
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@
*/

/**
* Returns a matcher that matches when the method it is evaluated for
* is executed zero or more times.
* Returns a matcher that matches when the method is executed
* zero or more times.
*
* @return PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount
* @since Method available since Release 3.0.0
@@ -1770,8 +1770,8 @@ function assertXmlStringNotEqualsXmlString($expectedXml, $actualXml, $message =
}

/**
* Returns a matcher that matches when the method it is evaluated for
* is invoked at the given $index.
* Returns a matcher that matches when the method is executed
* at the given $index.
*
* @param integer $index
* @return PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex
@@ -1786,8 +1786,7 @@ function at($index)
}

/**
* Returns a matcher that matches when the method it is evaluated for
* is executed at least once.
* Returns a matcher that matches when the method is executed at least once.
*
* @return PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce
* @since Method available since Release 3.0.0
@@ -1952,8 +1951,8 @@ function equalTo($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $i
}

/**
* Returns a matcher that matches when the method it is evaluated for
* is executed exactly $count times.
* Returns a matcher that matches when the method is executed
* exactly $count times.
*
* @param integer $count
* @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
@@ -2248,8 +2247,7 @@ function matchesRegularExpression($pattern)
}

/**
* Returns a matcher that matches when the method it is evaluated for
* is never executed.
* Returns a matcher that matches when the method is never executed.
*
* @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
* @since Method available since Release 3.0.0
@@ -2291,8 +2289,7 @@ function onConsecutiveCalls()
}

/**
* Returns a matcher that matches when the method it is evaluated for
* is executed exactly once.
* Returns a matcher that matches when the method is executed exactly once.
*
* @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
* @since Method available since Release 3.0.0
29 changes: 13 additions & 16 deletions src/Framework/TestCase.php
View file
Original file line number Diff line number Diff line change
@@ -1487,8 +1487,8 @@ public function getNumAssertions()
}

/**
* Returns a matcher that matches when the method it is evaluated for
* is executed zero or more times.
* Returns a matcher that matches when the method is executed
* zero or more times.
*
* @return PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount
* @since Method available since Release 3.0.0
@@ -1499,8 +1499,7 @@ public static function any()
}

/**
* Returns a matcher that matches when the method it is evaluated for
* is never executed.
* Returns a matcher that matches when the method is never executed.
*
* @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
* @since Method available since Release 3.0.0
@@ -1511,8 +1510,8 @@ public static function never()
}

/**
* Returns a matcher that matches when the method it is evaluated for
* is executed at least N times.
* Returns a matcher that matches when the method is executed
* at least N times.
*
* @param integer $requiredInvocations
* @return PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastCount
@@ -1526,8 +1525,7 @@ public static function atLeast($requiredInvocations)
}

/**
* Returns a matcher that matches when the method it is evaluated for
* is executed at least once.
* Returns a matcher that matches when the method is executed at least once.
*
* @return PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce
* @since Method available since Release 3.0.0
@@ -1538,8 +1536,7 @@ public static function atLeastOnce()
}

/**
* Returns a matcher that matches when the method it is evaluated for
* is executed exactly once.
* Returns a matcher that matches when the method is executed exactly once.
*
* @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
* @since Method available since Release 3.0.0
@@ -1550,8 +1547,8 @@ public static function once()
}

/**
* Returns a matcher that matches when the method it is evaluated for
* is executed exactly $count times.
* Returns a matcher that matches when the method is executed
* exactly $count times.
*
* @param integer $count
* @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
@@ -1563,8 +1560,8 @@ public static function exactly($count)
}

/**
* Returns a matcher that matches when the method it is evaluated for
* is executed at most N times.
* Returns a matcher that matches when the method is executed
* at most N times.
*
* @param integer $allowedInvocations
* @return PHPUnit_Framework_MockObject_Matcher_InvokedAtMostCount
@@ -1578,8 +1575,8 @@ public static function atMost($allowedInvocations)
}

/**
* Returns a matcher that matches when the method it is evaluated for
* is invoked at the given $index.
* Returns a matcher that matches when the method is executed
* at the given index.
*
* @param integer $index
* @return PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex
2 changes: 1 addition & 1 deletion src/Runner/Version.php
View file
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ public static function id()
}

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

12 changes: 9 additions & 3 deletions src/TextUI/Command.php
View file
Original file line number Diff line number Diff line change
@@ -761,6 +761,13 @@ protected function handleSelfUpdate()
{
$this->printVersionString();

$localFilename = realpath($_SERVER['argv'][0]);

if (!is_writable($localFilename)) {
print "No write permission to update " . $localFilename . "\n";
exit(PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT);
}

if (!extension_loaded('openssl')) {
print "The OpenSSL extension is not loaded.\n";
exit(PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT);
@@ -771,8 +778,7 @@ protected function handleSelfUpdate()
PHPUnit_Runner_Version::getReleaseChannel()
);

$localFilename = realpath($_SERVER['argv'][0]);
$tempFilename = basename($localFilename, '.phar') . '-temp.phar';
$tempFilename = basename($localFilename, '.phar') . '-temp.phar';

// Workaround for https://bugs.php.net/bug.php?id=65538
$caFile = dirname($tempFilename) . '/ca.pem';
@@ -817,7 +823,7 @@ protected function handleSelfUpdate()
}

print " done\n";
exit(0);
exit(PHPUnit_TextUI_TestRunner::SUCCESS_EXIT);
}

/**
Loading