Fixed Commit::getShortMessage

Do not cache result since the method took arguments

Author: lyrixx

src/Gitonomy/Git/Commit.php

@@ -111,13 +111,6 @@ class Commit
      */
     private $message;
 
-    /**
-     * Short message of the commit.
-     *
-     * @var string
-     */
-    private $shortMessage;
-
     /**
      * Constructor.
      *
@@ -266,36 +259,47 @@ public function getLastModification($path, $lastHash = null)
     }
 
     /**
-     * Returns the first line of the commit, and the first 80 characters.
+     * Returns the first line of the commit, and the first 50 characters.
+     *
+     * Ported from https://github.com/fabpot/Twig-extensions/blob/d67bc7e69788795d7905b52d31188bbc1d390e01/lib/Twig/Extensions/Extension/Text.php#L52-L109
+     *
+     * @param integer $length
+     * @param boolean $preserve
+     * @param string  $separator
      *
      * @return string
      */
-    public function getShortMessage($limit = 50)
+    public function getShortMessage($length = 50, $preserve = false, $separator = '...')
     {
         $this->initialize();
 
-        if (null !== $this->shortMessage) {
-            return $this->shortMessage;
-        }
+        $message = $this->getSubjectMessage();
 
-        $pos    = mb_strpos($this->message, "\n");
-        $length = mb_strlen($this->message);
+        if (function_exists('mb_substr')) {
+            if (mb_strlen($message) > $length) {
+                if ($preserve) {
+                    if (false !== ($breakpoint = mb_strpos($message, ' ', $length))) {
+                        $length = $breakpoint;
+                    }
+                }
 
-        if (false === $pos) {
-            if ($length < $limit) {
-                $shortMessage = $this->message;
-            } else {
-                $shortMessage = mb_substr($this->message, 0, $limit).'...';
+                return rtrim(mb_substr($message, 0, $length)) . $separator;
             }
+
+            return $message;
         } else {
-            if ($pos < $limit) {
-                $shortMessage = mb_substr($this->message, 0, $pos);
-            } else {
-                $shortMessage = mb_substr($this->message, 0, $limit).'...';
+            if (strlen($message) > $length) {
+                if ($preserve) {
+                    if (false !== ($breakpoint = strpos($message, ' ', $length))) {
+                        $length = $breakpoint;
+                    }
+                }
+
+                return rtrim(substr($message, 0, $length)) . $separator;
             }
-        }
 
-        return $this->shortMessage = $shortMessage;
+            return $message;
+        }
     }
 
     /**

tests/Gitonomy/Git/Tests/CommitTest.php

@@ -182,7 +182,8 @@ public function testGetSubjectMessage($repository)
     {
         $commit = $repository->getCommit(self::LONGMESSAGE_COMMIT);
 
-        $this->assertEquals('Fixed permissions of test.sh. Basically I just run bash command.', $commit->getSubjectMessage());
+        $this->assertEquals('Fixed perm!!!', $commit->getShortMessage(10, false, '!!!'));
+        $this->assertEquals('Fixed permissions!!!', $commit->getShortMessage(10, true, '!!!'));
     }
 
     /**