Make php-imenu-generic-expression accept symbol of variable name

Author: zonuexe

lisp/php-mode.el

@@ -1195,7 +1195,9 @@ After setting the stylevars run hooks according to STYLENAME
   (add-hook 'syntax-propertize-extend-region-functions
             #'php-syntax-propertize-extend-region t t)
 
-  (setq imenu-generic-expression php-imenu-generic-expression)
+  (setq imenu-generic-expression (if (symbolp php-imenu-generic-expression)
+                                     (symbol-value php-imenu-generic-expression)
+                                   php-imenu-generic-expression))
 
   ;; PHP vars are case-sensitive
   (setq case-fold-search t)

lisp/php.el

@@ -396,10 +396,12 @@ can be used to match against definitions for that classlike."
        "^\\s-*function\\s-+\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*(" 1)))
   "Imenu generic expression for PHP Mode.  See `imenu-generic-expression'.")
 
-(defcustom php-imenu-generic-expression php-imenu-generic-expression-default
+(defcustom php-imenu-generic-expression 'php-imenu-generic-expression-default
   "Default Imenu generic expression for PHP Mode.  See `imenu-generic-expression'."
-  :type '(alist :key-type string
-                :value-type list)
+  :type '(choice (alist :key-type string :value-type list)
+                 (const 'php-imenu-generic-expression-legacy)
+                 (const 'php-imenu-generic-expression-simple)
+                 variable)
   :group 'php)
 
 (defconst php--re-namespace-pattern

tests/php-mode-test.el

@@ -320,8 +320,10 @@ style from Drupal."
   (with-php-mode-test ("issue-83.php")
     (let* ((index-alist (imenu--make-index-alist))
            (all-methods (mapcar 'car (cdr (assoc "Methods" index-alist)))))
-      (should (member "static public function staticBeforeVisibility()" all-methods))
-      (should (member "public static function staticAfterVisibility()" all-methods)))))
+      (should (equal all-methods
+                     (list
+                      "static public function staticBeforeVisibility()"
+                      "public static function staticAfterVisibility()"))))))
 
 (ert-deftest php-mode-test-issue-99 ()
   "Proper indentation for 'foreach' statements without braces."