Merge branch 'release/2.1.1'

Author: arnested

php-extras-gen-eldoc.el

@@ -80,7 +80,10 @@
                        (with-temp-buffer
                          (insert (cdr (assoc 'return (cdr elem))))
                          (shr-render-buffer (current-buffer))
-                         (buffer-string)))))
+                         (delete-trailing-whitespace)
+                         (buffer-string)))
+                     "\n\n"
+                     "(" (cdr (assoc 'versions (cdr elem))) ")"))
           (puthash (symbol-name (car elem)) (cons `(documentation . ,doc) (cdr elem)) function-arguments-temp)))
       ;; PHP control structures are not present in JSON list. We add
       ;; them here (hard coded - there are not so many of them).

php-extras.el

@@ -5,7 +5,7 @@
 ;; Author: Arne Jørgensen <arne@arnested.dk>
 ;; URL: https://github.com/arnested/php-extras
 ;; Created: June 28, 2012
-;; Version: 2.1.0
+;; Version: 2.1.1
 ;; Package-Requires: ((php-mode "1.5.0"))
 ;; Keywords: programming, php