Merge branch 'master' into font-locking-fixes

Author: fallchildren

.gitignore

@@ -1,3 +1,4 @@
 /.cask/
+/php-mode-autoloads.el
 *~
 *.elc

php-mode-test.el

@@ -757,7 +757,8 @@ style from Drupal."
                     (get-text-property (point) 'face)))))
     ;; Type situations
     (let ((variables '("(array)"
-                       "array $test"
+                       "array $byValue"
+                       "array &$byReference"
                        ": array")))
       (dolist (variable variables)
         (search-forward variable)

php-mode.el

@@ -15,7 +15,7 @@
 (defconst php-mode-version-number "1.18.4"
   "PHP Mode version number.")
 
-(defconst php-mode-modified "2018-01-23"
+(defconst php-mode-modified "2018-01-29"
   "PHP Mode build date.")
 
 ;; This file is free software; you can redistribute it and/or
@@ -81,8 +81,11 @@
 (require 'flymake)
 (require 'etags)
 (require 'speedbar)
+(require 'imenu)
+(require 'semantic/imenu)
 
 (require 'cl-lib)
+(require 'mode-local)
 
 (eval-when-compile
   (require 'regexp-opt)
@@ -259,6 +262,16 @@ 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-do-not-use-semantic-imenu nil
+  "Customize `imenu-create-index-function' for `php-mode'.
+
+If using `semantic-mode' `imenu-create-index-function' will be
+set to `semantic-create-imenu-index' due to `c-mode' being its
+parent.  Set this variable to t if you want to use
+`imenu-default-create-index-function' even with `semantic-mode'
+enabled."
+  :type 'boolean)
+
 (defcustom php-site-url "http://php.net/"
   "Default PHP.net site URL.
 
@@ -1218,6 +1231,12 @@ After setting the stylevars run hooks according to STYLENAME
       (save-excursion
         (php-syntax-propertize-function (point-min) (point-max))))))
 
+(defvar-mode-local php-mode imenu-create-index-function
+  (if php-do-not-use-semantic-imenu
+      #'imenu-default-create-index-function
+    #'semantic-create-imenu-index)
+  "Imenu index function for PHP.")
+
 
 ;; Define function name completion function
 (defvar php-completion-table nil
@@ -1542,7 +1561,7 @@ a completion list."
      ;; - when used as a type hint
      ;; - when used as a return type
      ("(\\(array\\))" 1 font-lock-type-face)
-     ("\\b\\(array\\)\\s-+\\$" 1 font-lock-type-face)
+     ("\\b\\(array\\)\\s-+&?\\$" 1 font-lock-type-face)
      (")\\s-*:\\s-*\\??\\(array\\)\\b" 1 font-lock-type-face)
 
      ;; namespaces

tests/arrays.php

@@ -12,5 +12,5 @@
 // - return type, should look like `: int`
 $test = (array)$test;
 
-$test = function(array $test): array {
+$test = function(array $byValue, array &$byReference): array {
 };