Revert "Optimize php-mode--string-interpolated-variable-font-lock-find"

This reverts commit 9abc38b.

Author: zonuexe

lisp/php-mode.el

@@ -1451,9 +1451,7 @@ for \\[find-tag] (which see)."
 
      ;; Logical operators (and, or, &&, ...)
      ;; Not operator (!) is defined in "before cc-mode" section above.
-     ("\\(&&\\|||\\)" 1 'php-logical-op)
-     ;; string interpolation ("$var, ${var}, {$var}")
-     (php-mode--string-interpolated-variable-font-lock-find 0 nil)))
+     ("\\(&&\\|||\\)" 1 'php-logical-op)))
   "Detailed highlighting for PHP Mode.")
 
 (defvar php-font-lock-keywords php-font-lock-keywords-3
@@ -1485,15 +1483,22 @@ The output will appear in the buffer *PHP*."
 (defconst php-string-interpolated-variable-regexp
   "{\\$[^}\n\\\\]*\\(?:\\\\.[^}\n\\\\]*\\)*}\\|\\${\\sw+}\\|\\$\\sw+")
 
-(defun php-mode--string-interpolated-variable-font-lock-find (limit)
-  "Apply text-property to LIMIT for string interpolation by font-lock."
-  (let (quoted-stuff)
-    (while (re-search-forward php-string-interpolated-variable-regexp limit t)
-      (setq quoted-stuff (php-in-string-p))
+(defun php-string-intepolated-variable-font-lock-find (limit)
+  (while (re-search-forward php-string-interpolated-variable-regexp limit t)
+    (let ((quoted-stuff (nth 3 (syntax-ppss))))
       (when (or (eq ?\" quoted-stuff) (eq ?` quoted-stuff))
-        (put-text-property (match-beginning 0) (match-end 0) 'face 'php-variable-name))))
+        (put-text-property (match-beginning 0) (match-end 0)
+                           'face 'php-variable-name))))
   nil)
+
+(eval-after-load 'php-mode
+  '(progn
+     (font-lock-add-keywords
+      'php-mode
+      `((php-string-intepolated-variable-font-lock-find))
+      'append)))
 
+
 ;;; Correct the behavior of `delete-indentation' by modifying the
 ;;; logic of `fixup-whitespace'.
 (defun php-mode--fixup-whitespace-after ()