Added a few more tests for the T_FN backfill (ref #2863, #2860, #2859)

squizlabs · Feb 9, 2020 · 3a62dd4 · jrfnl · Feb 9, 2020 · gsherwood
1 parent 2adcb64
commit 3a62dd4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/tests/Core/Tokenizer/BackfillFnTokenTest.inc b/tests/Core/Tokenizer/BackfillFnTokenTest.inc
@@ -76,6 +76,9 @@ $fn = fn($a) => $a ? /* testTernaryThen */ fn() : string => 'a' : /* testTernary
 /* testConstantDeclaration */
 const FN = 'a';
 
+/* testConstantDeclarationLower */
+const fn = 'a';
+
 class Foo {
     /* testStaticMethodName */
     public static function fn($param) {
@@ -101,9 +104,15 @@ $a = Foo::fn($param);
 /* testNonArrowConstantAccess */
 $a = MyClass::FN;
 
+/* testNonArrowConstantAccessMixed */
+$a = MyClass::Fn;
+
 /* testNonArrowObjectMethodCall */
 $a = $obj->fn($param);
 
+/* testNonArrowObjectMethodCallUpper */
+$a = $obj->FN($param);
+
 /* testNonArrowNamespacedFunctionCall */
 $a = MyNS\Sub\Fn($param);
 

diff --git a/tests/Core/Tokenizer/BackfillFnTokenTest.php b/tests/Core/Tokenizer/BackfillFnTokenTest.php
@@ -604,6 +604,10 @@ public function dataNotAnArrowFunction()
                 '/* testConstantDeclaration */',
                 'FN',
             ],
+            [
+                '/* testConstantDeclarationLower */',
+                'fn',
+            ],
             ['/* testStaticMethodName */'],
             ['/* testPropertyAssignment */'],
             [
@@ -615,12 +619,19 @@ public function dataNotAnArrowFunction()
                 '/* testNonArrowConstantAccess */',
                 'FN',
             ],
+            [
+                '/* testNonArrowConstantAccessMixed */',
+                'Fn',
+            ],
             ['/* testNonArrowObjectMethodCall */'],
             [
                 '/* testNonArrowNamespacedFunctionCall */',
                 'Fn',
             ],
-            ['/* testNonArrowNamespaceOperatorFunctionCall */'],
+            [
+                '/* testNonArrowObjectMethodCallUpper */',
+                'FN',
+            ],
             ['/* testLiveCoding */'],
         ];