Merge branch 'master' into 3.0

Author: gsherwood

package.xml

@@ -104,6 +104,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Thanks to Jason McCreary for the patch
   - Fixed bug #1101 : Incorrect indent errors when breaking out of PHP inside an IF statement
   - Fixed bug #1102 : Squiz.Formatting.OperatorBracket.MissingBrackets faulty bracketing fix
+  - Fixed bug #1109 : Wrong scope indent reported in anonymous class
   - Fixed bug #1112 : File docblock not recognized when require_once follows it
  </notes>
  <contents>

src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php

@@ -126,7 +126,7 @@ public function register()
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        $debug = Config::getConfigData('scope_indentdebug');
+        $debug = Config::getConfigData('scope_indent_debug');
         if ($debug !== null) {
             $this->debug = (bool) $debug;
         }
@@ -962,22 +962,24 @@ public function process(File $phpcsFile, $stackPtr)
                 continue;
             }//end if
 
-            // Closures set the indent based on their own indent level.
-            if ($tokens[$i]['code'] === T_CLOSURE) {
+            // Anon classes and functions set the indent based on their own indent level.
+            if ($tokens[$i]['code'] === T_CLOSURE || $tokens[$i]['code'] === T_ANON_CLASS) {
                 $closer = $tokens[$i]['scope_closer'];
                 if ($tokens[$i]['line'] === $tokens[$closer]['line']) {
                     if ($this->debug === true) {
+                        $type = str_replace('_', ' ', strtolower(substr($tokens[$i]['type'], 2)));
                         $line = $tokens[$i]['line'];
-                        echo "* ignoring single-line closure on line $line".PHP_EOL;
+                        echo "* ignoring single-line $type on line $line".PHP_EOL;
                     }
 
                     $i = $closer;
                     continue;
                 }
 
                 if ($this->debug === true) {
+                    $type = str_replace('_', ' ', strtolower(substr($tokens[$i]['type'], 2)));
                     $line = $tokens[$i]['line'];
-                    echo "Open closure on line $line".PHP_EOL;
+                    echo "Open $type on line $line".PHP_EOL;
                 }
 
                 $first         = $phpcsFile->findFirstOnLine(T_WHITESPACE, $i, true);
@@ -1078,14 +1080,16 @@ public function process(File $phpcsFile, $stackPtr)
                 continue;
             }//end if
 
-            // Closing a closure.
+            // Closing an anon class or function.
             if (isset($tokens[$i]['scope_condition']) === true
                 && $tokens[$i]['scope_closer'] === $i
-                && $tokens[$tokens[$i]['scope_condition']]['code'] === T_CLOSURE
+                && ($tokens[$tokens[$i]['scope_condition']]['code'] === T_CLOSURE
+                || $tokens[$tokens[$i]['scope_condition']]['code'] === T_ANON_CLASS)
             ) {
                 if ($this->debug === true) {
+                    $type = str_replace('_', ' ', strtolower(substr($tokens[$tokens[$i]['scope_condition']]['type'], 2)));
                     $line = $tokens[$i]['line'];
-                    echo "Close closure on line $line".PHP_EOL;
+                    echo "Close $type on line $line".PHP_EOL;
                 }
 
                 $prev = false;

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

@@ -1117,6 +1117,24 @@ if (somethingIsTrue()) {
     <?php
 }
 
+$foo = [
+        new class() implements Bar {
+
+            public static function foo(): string
+            {
+                return 'foo';
+            }
+        },
+];
+
+$foo = [
+        function () {
+            if ($foo) {
+                return 'foo';
+            }
+        },
+];
+
 $foo = foo(
     function () {
         $foo->debug(

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

@@ -1117,6 +1117,24 @@ if (somethingIsTrue()) {
     <?php
 }
 
+$foo = [
+        new class() implements Bar {
+
+            public static function foo(): string
+            {
+                return 'foo';
+            }
+        },
+];
+
+$foo = [
+        function () {
+            if ($foo) {
+                return 'foo';
+            }
+        },
+];
+
 $foo = foo(
     function () {
         $foo->debug(

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

@@ -1117,6 +1117,24 @@ if (somethingIsTrue()) {
 	<?php
 }
 
+$foo = [
+		new class() implements Bar {
+
+			public static function foo(): string
+			{
+				return 'foo';
+			}
+		},
+];
+
+$foo = [
+		function () {
+			if ($foo) {
+				return 'foo';
+			}
+		},
+];
+
 $foo = foo(
 	function () {
 		$foo->debug(

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

@@ -1117,6 +1117,24 @@ if (somethingIsTrue()) {
 	<?php
 }
 
+$foo = [
+		new class() implements Bar {
+
+			public static function foo(): string
+			{
+				return 'foo';
+			}
+		},
+];
+
+$foo = [
+		function () {
+			if ($foo) {
+				return 'foo';
+			}
+		},
+];
+
 $foo = foo(
 	function () {
 		$foo->debug(

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

@@ -138,11 +138,11 @@ public function getErrorList($testFile='ScopeIndentUnitTest.inc')
                 823  => 1,
                 858  => 1,
                 879  => 1,
-                1125 => 1,
-                1133 => 1,
-                1138 => 1,
-                1140 => 1,
                 1143 => 1,
+                1151 => 1,
+                1156 => 1,
+                1158 => 1,
+                1161 => 1,
                );
 
     }//end getErrorList()