Fixed bug #2883 : Generic.WhiteSpace.ScopeIndent.Incorrect issue afte…

…r NOWDOC

Stopping at the end of a here/nowdoc when finding the start of a statement isn't correct.
These token have openers/closers to help sniff developers, but they are still strings
and should be skipped over in the same way.

src/Files/File.php

@@ -2218,6 +2218,8 @@ public function findStartOfStatement($start, $ignore=null)
             if (isset($this->tokens[$i]['scope_opener']) === true
                 && $i === $this->tokens[$i]['scope_closer']
                 && $this->tokens[$i]['code'] !== T_CLOSE_PARENTHESIS
+                && $this->tokens[$i]['code'] !== T_END_NOWDOC
+                && $this->tokens[$i]['code'] !== T_END_HEREDOC
             ) {
                 // Found the end of the previous scope block.
                 return $lastNotEmpty;

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc

@@ -1454,6 +1454,22 @@ return [
     ]),
 ];
 
+return [
+    'lor' =>
+        <<<'INTRO'
+        lorem ipsum
+        INTRO,
+    'em' => [
+        [
+            '',
+        ],
+    ],
+    'abc' => [
+        'a' => 'wop wop',
+        'b' => 'ola ola.',
+    ],
+];
+
 ?>
 
      <?php if (true) : ?>

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc.fixed

@@ -1454,6 +1454,22 @@ return [
     ]),
 ];
 
+return [
+    'lor' =>
+        <<<'INTRO'
+        lorem ipsum
+        INTRO,
+    'em' => [
+        [
+            '',
+        ],
+    ],
+    'abc' => [
+        'a' => 'wop wop',
+        'b' => 'ola ola.',
+    ],
+];
+
 ?>
 
      <?php if (true) : ?>

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc

@@ -1454,6 +1454,22 @@ return [
 	]),
 ];
 
+return [
+	'lor' =>
+		<<<'INTRO'
+		lorem ipsum
+		INTRO,
+	'em' => [
+		[
+			'',
+		],
+	],
+	'abc' => [
+		'a' => 'wop wop',
+		'b' => 'ola ola.',
+	],
+];
+
 ?>
 
 	 <?php if (true) : ?>

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc.fixed

@@ -1454,6 +1454,22 @@ return [
 	]),
 ];
 
+return [
+	'lor' =>
+		<<<'INTRO'
+		lorem ipsum
+		INTRO,
+	'em' => [
+		[
+			'',
+		],
+	],
+	'abc' => [
+		'a' => 'wop wop',
+		'b' => 'ola ola.',
+	],
+];
+
 ?>
 
 	 <?php if (true) : ?>

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php

@@ -151,10 +151,10 @@ public function getErrorList($testFile='ScopeIndentUnitTest.inc')
             1340 => 1,
             1342 => 1,
             1345 => 1,
-            1464 => 1,
-            1465 => 1,
-            1466 => 1,
-            1467 => 1,
+            1480 => 1,
+            1481 => 1,
+            1482 => 1,
+            1483 => 1,
         ];
 
     }//end getErrorList()