Changelog + unit test rename for #2748 (ref #2749)

squizlabs · Jan 6, 2020 · f0ec2ab · f0ec2ab
1 parent a922594
commit f0ec2ab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/package.xml b/package.xml
@@ -44,6 +44,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #2688 : Case statements not tokenized correctly when switch is contained within ternary
   - Fixed bug #2698 : PHPCS throws errors determining auto report width when shell_exec is disabled
     -- Thanks to Matthew Peveler for the patch
+  - Fixed bug #2748 : Wrong end of statement for fn closures
+    -- Thanks to Michał Bundyra for the patch
   - Fixed bug #2751 : Autoload relative paths first to avoid confusion with files from the global include path
     -- Thanks to Klaus Purer for the patch
   - Fixed bug #2768 : Generic.Files.LineLength false positive for non-breakable strings at exactly the soft limit

diff --git a/tests/Core/File/FindEndOfStatementTest.inc b/tests/Core/File/FindEndOfStatementTest.inc
@@ -36,7 +36,7 @@ $a = [
     'b' => fn() => return 1,
 ];
 
-/* testArrowFunctionEndOfStatement */
+/* testArrowFunction */
 static fn ($a) => $a;
 
 return 0;
diff --git a/tests/Core/File/FindEndOfStatementTest.php b/tests/Core/File/FindEndOfStatementTest.php
@@ -193,17 +193,17 @@ public function testArrowFunctionArrayValue()
      *
      * @return void
      */
-    public function testArrayFunctionEndOfStatement()
+    public function testArrowFunction()
     {
-        $static = (self::$phpcsFile->findNext(T_COMMENT, 0, null, false, '/* testArrowFunctionEndOfStatement */') + 2);
+        $static = (self::$phpcsFile->findNext(T_COMMENT, 0, null, false, '/* testArrowFunction */') + 2);
         $fn     = self::$phpcsFile->findNext(T_FN, ($static + 1));
 
         $endOfStatementStatic = self::$phpcsFile->findEndOfStatement($static);
         $endOfStatementFn     = self::$phpcsFile->findEndOfStatement($fn);
 
         $this->assertSame($endOfStatementFn, $endOfStatementStatic);
 
-    }//end testArrayFunctionEndOfStatement()
+    }//end testArrowFunction()
 
 
 }//end class