Change 'getContent' to not return comments

Instead make use of the new 'getRawContent' method to retrieve the content including the comments.
sebastianfeldmann · Apr 22, 2017 · 7fbf226 · 7fbf226
1 parent 845bb87
commit 7fbf226
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/src/CommitMessage.php b/src/CommitMessage.php
@@ -111,14 +111,27 @@ public function isEmpty() : bool
         return empty($this->content);
     }
 
+
+    /**
+     * Get commit message content
+     *
+     * This excludes lines that are comments.
+     *
+     * @return string
+     */
+    public function getContent() : string
+    {
+        return $this->content;
+    }
+
     /**
      * Get complete commit message content
      *
      * This includes lines that are comments.
      *
      * @return string
      */
-    public function getContent() : string
+    public function getRawContent() : string
     {
         return $this->rawContent;
     }

diff --git a/tests/git/CommitMessageTest.php b/tests/git/CommitMessageTest.php
@@ -37,18 +37,35 @@ public function testIsEmptyDoesNotIncludeComments()
         $this->assertTrue($msg->isEmpty());
     }
 
+    /**
+     * Tests CommitMessage::getContent
+     */
     public function testGetContent()
     {
         $content = 'Foo' . PHP_EOL . 'Bar' . PHP_EOL . 'Baz';
         $msg = new CommitMessage($content);
         $this->assertEquals($content, $msg->getContent());
     }
 
-    public function testGetContentIncludesComments()
+
+    /**
+     * Tests CommitMessage::getContent
+     */
+    public function testGetContentExcludesComments()
+    {
+        $content = 'Foo' . PHP_EOL . '# Bar' . PHP_EOL . 'Baz';
+        $msg = new CommitMessage($content, '#');
+        $this->assertEquals('Foo' . PHP_EOL . 'Baz', $msg->getContent());
+    }
+
+    /**
+     * Tests CommitMessage::getRawContent
+     */
+    public function testGetRawContentIncludesComments()
     {
         $content = 'Foo' . PHP_EOL . '# Bar' . PHP_EOL . 'Baz';
         $msg = new CommitMessage($content,'#');
-        $this->assertEquals($content, $msg->getContent());
+        $this->assertEquals($content, $msg->getRawContent());
     }
 
     /**