[nongnu] elpa/php-mode 9603a4f54f 10/12: Revert string-trim-right

[ELPA Syncer]

branch: elpa/php-mode
commit 9603a4f54f90fa5cde253e6c9fb9470aacaca33c
Author: USAMI Kenta <tadsan@zonu.me>
Commit: USAMI Kenta <tadsan@zonu.me>

    Revert string-trim-right
---
 lisp/php-mode.el | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index 24932bf25a..6843b3a720 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -90,9 +90,16 @@
 
 (defconst php-mode-version-id
   (eval-when-compile
-    (let* ((fallback-version (format "%s-non-vcs" (with-no-warnings 
php-mode-version-number))))
+    (let ((fallback-version (format "%s-non-vcs" (with-no-warnings 
php-mode-version-number))))
       (if (locate-dominating-file default-directory ".git")
-          (string-trim-left (string-trim-right (shell-command-to-string "git 
describe --tags")) "v")
+          (save-match-data
+            (let ((tag (replace-regexp-in-string
+                        (rx bos "v") ""
+                        (shell-command-to-string "git describe --tags")))
+                  (pattern (rx (group (+ any)) eol)))
+              (if (string-match pattern tag)
+                  (match-string 0 tag)
+                (error "Faild to obtain git tag"))))
         fallback-version)))
   "PHP Mode build ID.