Merge branch 'feature/2512-squiz-nonexecutable-code-fix-alt-control-s…

…tructures' of https://github.com/jrfnl/PHP_CodeSniffer
hbaeumer · Jun 26, 2019 · 0d6033d · 0d6033d
2 parents f9dc6b4 + 19346c5
commit 0d6033d
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php b/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php
@@ -105,6 +105,7 @@ public function process(File $phpcsFile, $stackPtr)
                         T_CASE,
                         T_DEFAULT,
                         T_CLOSE_CURLY_BRACKET,
+                        T_ENDSWITCH,
                     ],
                     ($end + 1)
                 );

diff --git a/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.1.inc b/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.1.inc
@@ -257,3 +257,42 @@ switch ($var) {
 
 end:
 echo 'j hit 17';
+
+// Issue 2512.
+class TestAlternativeControlStructures {
+
+    public function alternative_switch_in_function( $var ) {
+
+        switch ( $var ) :
+            case 'value1':
+                do_something();
+                break;
+
+            default:
+            case 'value2':
+                do_something_else();
+                break;
+        endswitch;
+    }
+
+    public function various_alternative_control_structures() {
+        $_while = 1;
+
+        for ( $a = 0; $a++ < 1; ) :
+            foreach ( [ 1 ] as $b ) :
+                while ( $_while-- ) :
+                    if ( 1 ) :
+                        switch ( 1 ) :
+                            default:
+                                echo 'yay, we made it!';
+                                break;
+                        endswitch;
+                    endif;
+                endwhile;
+            endforeach;
+        endfor;
+    }
+}
+
+$var_after_class_in_global_space = 1;
+do_something_else();