From 72bd9971fe4b771ff6463d6f2df0eb995732e2e8 Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <Sebastian Bergmann sb@sebastian-bergmann.de>
Date: Mon, 22 Feb 2016 15:54:42 -0500
Subject: [PATCH] Closes #2039

---
 src/Util/TestDox/NamePrettifier.php       | 18 ++++++++----------
 tests/Util/TestDox/NamePrettifierTest.php |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/Util/TestDox/NamePrettifier.php b/src/Util/TestDox/NamePrettifier.php
index 55a972fd3f8..e452ef99a1c 100644
--- a/src/Util/TestDox/NamePrettifier.php
+++ b/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]);
diff --git a/tests/Util/TestDox/NamePrettifierTest.php b/tests/Util/TestDox/NamePrettifierTest.php
index 30b9be4c956..729e8ac2f29 100644
--- a/tests/Util/TestDox/NamePrettifierTest.php
+++ b/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'));
     }