Modify test for variables

Author: zonuexe

tests/variables.php

@@ -1,8 +1,19 @@
 <?php
 
 // Test highlighting of variables with the variable-name-face
+$_;
 $regularVariable;
 $$variableVariable;
+$漢字;
+$snake_case;
+$abc123xyz;
+$def_456_ghi;
+${'var'};
+${"var"};
+${$var};
+${'v' . 'ar'};
+$a{1};
+$a{'a'};
 MyClass::$staticVariable;
 $object->memberVariable;
 $object->funCall();

tests/variables.php.faces

@@ -1,26 +1,60 @@
 ;; -*- mode: emacs-lisp -*-
 (("<?php" . php-php-tag)
- ("\n\n" . nil)
+ ("\n\n")
  ("// " . font-lock-comment-delimiter-face)
  ("Test highlighting of variables with the variable-name-face\n" . font-lock-comment-face)
  ("$" . php-variable-sigil)
+ ("_" . php-variable-name)
+ (";\n")
+ ("$" . php-variable-sigil)
  ("regularVariable" . php-variable-name)
- (";\n" . nil)
+ (";\n")
  ("$$" . php-variable-sigil)
  ("variableVariable" . php-variable-name)
- (";\n" . nil)
+ (";\n")
+ ("$" . php-variable-sigil)
+ ("漢字" . php-variable-name)
+ (";\n")
+ ("$" . php-variable-sigil)
+ ("snake_case" . php-variable-name)
+ (";\n")
+ ("$" . php-variable-sigil)
+ ("abc123xyz" . php-variable-name)
+ (";\n")
+ ("$" . php-variable-sigil)
+ ("def_456_ghi" . php-variable-name)
+ (";\n${")
+ ("'var'" . php-string)
+ ("};\n${")
+ ("\"var\"" . php-string)
+ ("};\n${")
+ ("$" . php-variable-sigil)
+ ("var" . php-variable-name)
+ ("};\n${")
+ ("'v'" . php-string)
+ (" . ")
+ ("'ar'" . php-string)
+ ("};\n")
+ ("$" . php-variable-sigil)
+ ("a" . php-variable-name)
+ ("{1};\n")
+ ("$" . php-variable-sigil)
+ ("a" . php-variable-name)
+ ("{")
+ ("'a'" . php-string)
+ ("};\n")
  ("MyClass" . php-constant)
  ("::" . php-paamayim-nekudotayim)
  ("$" . php-variable-sigil)
  ("staticVariable" . php-variable-name)
- (";\n" . nil)
+ (";\n")
  ("$" . php-variable-sigil)
  ("object" . php-variable-name)
  ("->" . php-object-op)
  ("memberVariable" . php-property-name)
- (";\n" . nil)
+ (";\n")
  ("$" . php-variable-sigil)
  ("object" . php-variable-name)
  ("->" . php-object-op)
  ("funCall" . php-method-call)
- ("();\n" . nil))
+ ("();\n"))