From c59713fbd4dda58e569d43db9e53f3ba73ffe9e0 Mon Sep 17 00:00:00 2001
From: Greg Sherwood <gsherwood@squiz.net>
Date: Thu, 25 Jul 2019 16:29:25 +1000
Subject: [PATCH] Changelog + remove debug code for #2565 (ref #2567)

---
 package.xml                                                     | 2 ++
 .../Sniffs/ControlStructures/InlineControlStructureSniff.php    | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.xml b/package.xml
index 4a4a90fb7c..79c9def411 100644
--- a/package.xml
+++ b/package.xml
@@ -98,6 +98,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Thanks to Matthew Peveler for the patch
   - Fixed bug #2561 : PHP 7.4 compatibility fix / implode argument order
     -- Thanks to Juliette Reinders Folmer for the patch
+  - Fixed bug #2565 : Generic.ControlStructures.InlineControlStructure confused by mixed short/long tags
+    -- Thanks to Juliette Reinders Folmer for the patch
   - Fixed bug #2566 : Author tag email validation doesn't support all TLDs
     -- Thanks to Juliette Reinders Folmer for the patch
  </notes>
diff --git a/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php b/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php
index 92c4af83ca..0c18cbb585 100644
--- a/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php
+++ b/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php
@@ -141,7 +141,6 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         if ($tokens[$nextNonEmpty]['code'] === T_COLON) {
-            var_dump($tokens[$nextNonEmpty]);
             // Alternative control structure.
             // T_END... missing. Either live coding, parse error or end
             // tag in short open tags and scan run with short_open_tag=Off.