ChangeLog-4.8.md

@@ -2,6 +2,14 @@
 
 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.24] - 2016-03-14
+
+### Fixed
+
+* Fixed [#1959](https://github.com/sebastianbergmann/phpunit/issues/1959): Prophecy errors are not handled correctly
+* Fixed [#2039](https://github.com/sebastianbergmann/phpunit/issues/2039): TestDox does not handle snake_case test methods properly
+* Fixed [#2109](https://github.com/sebastianbergmann/phpunit/issues/2109): Process isolation leaks global variable
+
 ## [4.8.23] - 2016-02-11
 
 ### Fixed
@@ -169,6 +177,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.24]: https://github.com/sebastianbergmann/phpunit/compare/4.8.23...4.8.24
 [4.8.23]: https://github.com/sebastianbergmann/phpunit/compare/4.8.22...4.8.23
 [4.8.22]: https://github.com/sebastianbergmann/phpunit/compare/4.8.21...4.8.22
 [4.8.21]: https://github.com/sebastianbergmann/phpunit/compare/4.8.20...4.8.21

src/Framework/Constraint/TraversableContains.php

@@ -71,19 +71,17 @@ protected function matches($other)
 
         if (is_object($this->value)) {
             foreach ($other as $element) {
-                if (($this->checkForObjectIdentity &&
-                     $element === $this->value) ||
-                    (!$this->checkForObjectIdentity &&
-                     $element == $this->value)) {
+                if ($this->checkForObjectIdentity && $element === $this->value) {
+                    return true;
+                } else if (!$this->checkForObjectIdentity && $element == $this->value) {
                     return true;
                 }
             }
         } else {
             foreach ($other as $element) {
-                if (($this->checkForNonObjectIdentity &&
-                     $element === $this->value) ||
-                    (!$this->checkForNonObjectIdentity &&
-                     $element == $this->value)) {
+                if ($this->checkForNonObjectIdentity && $element === $this->value) {
+                    return true;
+                } else if (!$this->checkForNonObjectIdentity && $element == $this->value) {
                     return true;
                 }
             }

src/Framework/TestCase.php

@@ -1004,7 +1004,7 @@ protected function verifyMockObjects()
         if ($this->prophet !== null) {
             try {
                 $this->prophet->checkPredictions();
-            } catch (Throwable $t) {
+            } catch (Throwable $e) {
                 /* Intentionally left empty */
             } catch (Exception $e) {
                 /* Intentionally left empty */

src/Runner/Version.php

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

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

@@ -75,6 +75,7 @@ $configurationFilePath = '{configurationFilePath}';
 if ('' !== $configurationFilePath) {
     $configuration = PHPUnit_Util_Configuration::getInstance($configurationFilePath);
     $configuration->handlePHPConfiguration();
+    unset($configuration);
 }
 
 {constants}

src/Util/TestDox/NamePrettifier.php

@@ -81,23 +81,21 @@ public function prettifyTestMethod($name)
             $this->strings[] = $string;
         }
 
-        if (strpos($name, '_') !== false) {
-            return str_replace('_', ' ', $name);
+        if (substr($name, 0, 4) == 'test') {
+            $name = substr($name, 4);
         }
 
-        $max = strlen($name);
+        $name[0] = strtoupper($name[0]);
 
-        if (substr($name, 0, 4) == 'test') {
-            $offset = 4;
-        } else {
-            $offset  = 0;
-            $name[0] = strtoupper($name[0]);
+        if (strpos($name, '_') !== false) {
+            return trim(str_replace('_', ' ', $name));
         }
 
+        $max        = strlen($name);
         $wasNumeric = false;
 
-        for ($i = $offset; $i < $max; $i++) {
-            if ($i > $offset &&
+        for ($i = 0; $i < $max; $i++) {
+            if ($i > 0 &&
                 ord($name[$i]) >= 65 &&
                 ord($name[$i]) <= 90) {
                 $buffer .= ' ' . strtolower($name[$i]);

tests/Regression/1021.phpt → tests/Regression/Trac/1021.phpt

@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue1021Test';
 $_SERVER['argv'][3] = dirname(__FILE__) . '/1021/Issue1021Test.php';
 
-require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--

tests/Regression/523.phpt → tests/Regression/Trac/523.phpt

@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue523Test';
 $_SERVER['argv'][3] = dirname(__FILE__) . '/523/Issue523Test.php';
 
-require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--

tests/Regression/578.phpt → tests/Regression/Trac/578.phpt

@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue578Test';
 $_SERVER['argv'][3] = dirname(__FILE__) . '/578/Issue578Test.php';
 
-require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--

tests/Regression/684.phpt → tests/Regression/Trac/684.phpt

@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue684Test';
 $_SERVER['argv'][3] = dirname(__FILE__) . '/684/Issue684Test.php';
 
-require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--

tests/Regression/783.phpt → tests/Regression/Trac/783.phpt

@@ -8,7 +8,7 @@ $_SERVER['argv'][3] = 'foo,bar';
 $_SERVER['argv'][4] = 'ParentSuite';
 $_SERVER['argv'][5] = dirname(__FILE__) . '/783/ParentSuite.php';
 
-require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--

tests/Util/TestDox/NamePrettifierTest.php

@@ -64,7 +64,7 @@ public function testTestNameIsConvertedToASentence()
     {
         $this->assertEquals('This is a test', $this->namePrettifier->prettifyTestMethod('testThisIsATest'));
         $this->assertEquals('This is a test', $this->namePrettifier->prettifyTestMethod('testThisIsATest2'));
-        $this->assertEquals('this is a test', $this->namePrettifier->prettifyTestMethod('this_is_a_test'));
+        $this->assertEquals('This is a test', $this->namePrettifier->prettifyTestMethod('this_is_a_test'));
         $this->assertEquals('Foo for bar is 0', $this->namePrettifier->prettifyTestMethod('testFooForBarIs0'));
         $this->assertEquals('Foo for baz is 1', $this->namePrettifier->prettifyTestMethod('testFooForBazIs1'));
     }