Fixed bug #3303 : findStartOfStatement() doesn't work with T_OPEN_TAG_WITH_ECHO

Author: gsherwood

package.xml

@@ -30,6 +30,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Thanks to Alessandro Chitolina for the patch
     -- Thanks to Juliette Reinders Folmer for the tests
   - Fixed bug #3296 : PSR2.ControlStructures.SwitchDeclaration takes phpcs:ignore as content of case body
+  - Fixed bug #3303 : findStartOfStatement() doesn't work with T_OPEN_TAG_WITH_ECHO
  </notes>
  <contents>
   <dir name="/">

src/Files/File.php

@@ -2285,8 +2285,9 @@ public function findNext(
     public function findStartOfStatement($start, $ignore=null)
     {
         $startTokens = Util\Tokens::$blockOpeners;
-        $startTokens[T_OPEN_SHORT_ARRAY] = true;
-        $startTokens[T_OPEN_TAG]         = true;
+        $startTokens[T_OPEN_SHORT_ARRAY]   = true;
+        $startTokens[T_OPEN_TAG]           = true;
+        $startTokens[T_OPEN_TAG_WITH_ECHO] = true;
 
         $endTokens = [
             T_CLOSE_TAG    => true,

tests/Core/File/FindStartOfStatementTest.inc

@@ -111,3 +111,13 @@ $result = match ($key) {
 };
 
 return 0;
+
+/* testOpenTag */
+?>
+<h1>Test</h1>
+<?php echo '<h2>', foo(), '</h2>';
+
+/* testOpenTagWithEcho */
+?>
+<h1>Test</h1>
+<?= '<h2>', foo(), '</h2>';

tests/Core/File/FindStartOfStatementTest.php

@@ -468,4 +468,36 @@ public function testNestedMatch()
     }//end testNestedMatch()
 
 
+    /**
+     * Test nested match expressions.
+     *
+     * @return void
+     */
+    public function testOpenTag()
+    {
+        $start  = $this->getTargetToken('/* testOpenTag */', T_OPEN_TAG);
+        $start += 2;
+        $found  = self::$phpcsFile->findStartOfStatement($start);
+
+        $this->assertSame(($start - 1), $found);
+
+    }//end testOpenTag()
+
+
+    /**
+     * Test nested match expressions.
+     *
+     * @return void
+     */
+    public function testOpenTagWithEcho()
+    {
+        $start  = $this->getTargetToken('/* testOpenTagWithEcho */', T_OPEN_TAG_WITH_ECHO);
+        $start += 3;
+        $found  = self::$phpcsFile->findStartOfStatement($start);
+
+        $this->assertSame(($start - 1), $found);
+
+    }//end testOpenTagWithEcho()
+
+
 }//end class