ChangeLog-4.8.md

@@ -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.11] - 2015-10-07
+
+### Fixed
+
+* Merged [#1885](https://github.com/sebastianbergmann/phpunit/issues/1885): Fixed handling of PHP configuration settings for process isolation
+* Fixed [#1857](https://github.com/sebastianbergmann/phpunit/issues/1857): `@covers` and `@uses` should only take a single word
+* Fixed [#1879](https://github.com/sebastianbergmann/phpunit/issues/1879): `assertEqualXMLStructure()` cannot compare nodes with an ID
+* Fixed [#1898](https://github.com/sebastianbergmann/phpunit/issues/1898): `@covers` and `@uses` cannot be used for namespaced functions
+* Fixed [#1901](https://github.com/sebastianbergmann/phpunit/issues/1901): `--self-update` updates to PHPUnit 5, even on PHP < 5.6
+
 ## [4.8.10] - 2015-10-01
 
 ### Fixed
@@ -75,6 +85,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.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
 [4.8.9]: https://github.com/sebastianbergmann/phpunit/compare/4.8.8...4.8.9
 [4.8.8]: https://github.com/sebastianbergmann/phpunit/compare/4.8.7...4.8.8

src/Framework/Assert.php

@@ -1795,8 +1795,13 @@ public static function assertXmlStringNotEqualsXmlString($expectedXml, $actualXm
      */
     public static function assertEqualXMLStructure(DOMElement $expectedElement, DOMElement $actualElement, $checkAttributes = false, $message = '')
     {
-        $expectedElement = clone $expectedElement;
-        $actualElement   = clone $actualElement;
+        $tmp = new DOMDocument;
+        $expectedElement = $tmp->importNode($expectedElement, true);
+
+        $tmp = new DOMDocument;
+        $actualElement= $tmp->importNode($actualElement, true);
+
+        unset($tmp);
 
         self::assertEquals(
             $expectedElement->tagName,

src/Framework/TestCase.php

@@ -670,6 +670,8 @@ public function run(PHPUnit_Framework_TestResult $result = null)
             $includePath        = "'." . $includePath . ".'";
             $codeCoverageFilter = "'." . $codeCoverageFilter . ".'";
 
+            $configurationFilePath = (isset($GLOBALS['__PHPUNIT_CONFIGURATION_FILE']) ? $GLOBALS['__PHPUNIT_CONFIGURATION_FILE'] : '');
+
             $template->setVar(
                 array(
                     'composerAutoload'                        => $composerAutoload,
@@ -690,7 +692,8 @@ public function run(PHPUnit_Framework_TestResult $result = null)
                     'isStrictAboutOutputDuringTests'          => $isStrictAboutOutputDuringTests,
                     'isStrictAboutTestSize'                   => $isStrictAboutTestSize,
                     'isStrictAboutTodoAnnotatedTests'         => $isStrictAboutTodoAnnotatedTests,
-                    'codeCoverageFilter'                      => $codeCoverageFilter
+                    'codeCoverageFilter'                      => $codeCoverageFilter,
+                    'configurationFilePath'                   => $configurationFilePath
                 )
             );
 

src/Runner/Version.php

@@ -30,7 +30,7 @@ public static function id()
         }
 
         if (self::$version === null) {
-            $version       = new SebastianBergmann\Version('4.8.10', dirname(dirname(__DIR__)));
+            $version       = new SebastianBergmann\Version('4.8.11', dirname(dirname(__DIR__)));
             self::$version = $version->getVersion();
         }
 

src/TextUI/Command.php

@@ -786,10 +786,11 @@ protected function handleSelfUpdate()
             exit(PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT);
         }
 
-        $remoteFilename = sprintf(
-            'https://phar.phpunit.de/phpunit%s.phar',
-            PHPUnit_Runner_Version::getReleaseChannel()
-        );
+        if (PHP_VERSION_ID < 50600) {
+            $remoteFilename = sprintf('https://phar.phpunit.de/phpunit-old.phar');
+        } else {
+            $remoteFilename = sprintf('https://phar.phpunit.de/phpunit.phar');
+        }
 
         $tempFilename = tempnam(sys_get_temp_dir(), 'phpunit') . '.phar';
 

src/TextUI/TestRunner.php

@@ -142,6 +142,10 @@ private function processSuiteFilters(PHPUnit_Framework_TestSuite $suite, array $
      */
     public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array())
     {
+        if (isset($arguments['configuration'])) {
+            $GLOBALS['__PHPUNIT_CONFIGURATION_FILE'] = $arguments['configuration'];
+        }
+
         $this->handleConfiguration($arguments);
 
         $this->processSuiteFilters($suite, $arguments);

src/Util/PHP/Template/TestCaseMethod.tpl.dist

@@ -70,6 +70,13 @@ function __phpunit_run_isolated_test()
     );
 }
 
+$configurationFilePath = '{configurationFilePath}';
+
+if ('' !== $configurationFilePath) {
+    $configuration = PHPUnit_Util_Configuration::getInstance($configurationFilePath);
+    $configuration->handlePHPConfiguration();
+}
+
 {constants}
 {included_files}
 {globals}

src/Util/Test.php

@@ -147,6 +147,8 @@ private static function getLinesToBeCoveredOrUsed($className, $methodName, $mode
             }
 
             $element = preg_replace('/[\s()]+$/', '', $element);
+            $element = explode(' ', $element);
+            $element = $element[0];
 
             $codeList = array_merge(
                 $codeList,
@@ -846,7 +848,9 @@ private static function resolveElementToReflectionObjects($element)
     {
         $codeToCoverList = array();
 
-        if (strpos($element, '::') !== false) {
+        if (strpos($element, '\\') !== false && function_exists($element)) {
+            $codeToCoverList[] = new ReflectionFunction($element);
+        } else if (strpos($element, '::') !== false) {
             list($className, $methodName) = explode('::', $element);
 
             if (isset($methodName[0]) && $methodName[0] == '<') {

src/Util/XML.php

@@ -100,7 +100,7 @@ public static function load($actual, $isHtml = false, $filename = '', $xinclude
             @chdir(dirname($filename));
         }
 
-        $document = new DOMDocument;
+        $document                     = new DOMDocument;
         $document->preserveWhiteSpace = false;
 
         $internal  = libxml_use_internal_errors(true);

tests/Util/TestTest.php

@@ -16,6 +16,9 @@
     );
 }
 
+require TEST_FILES_PATH . 'CoverageNamespacedFunctionTest.php';
+require TEST_FILES_PATH . 'NamespaceCoveredFunction.php';
+
 /**
  * @since      Class available since Release 3.3.6
  */
@@ -545,6 +548,23 @@ public function testMethodParenthesesAreAllowedWithWhitespace()
         );
     }
 
+    /**
+     * @covers PHPUnit_Util_Test::getLinesToBeCovered
+     * @covers PHPUnit_Util_Test::getLinesToBeCoveredOrUsed
+     */
+    public function testNamespacedFunctionCanBeCoveredOrUsed()
+    {
+        $this->assertEquals(
+            array(
+                TEST_FILES_PATH . 'NamespaceCoveredFunction.php' => range(4, 7)
+            ),
+            PHPUnit_Util_Test::getLinesToBeCovered(
+                'CoverageNamespacedFunctionTest',
+                'testFunc'
+            )
+        );
+    }
+
     public function getLinesToBeCoveredProvider()
     {
         return array(

tests/_files/CoverageNamespacedFunctionTest.php

@@ -0,0 +1,11 @@
+<?php
+class CoverageNamespacedFunctionTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers foo\func()
+     */
+    public function testFunc()
+    {
+        foo\func();
+    }
+}

tests/_files/NamespaceCoveredFunction.php

@@ -0,0 +1,7 @@
+<?php
+namespace foo;
+
+function func()
+{
+    return true;
+}