From 8a457eb0e3dcd366b85fd0ee1e6509cf17e47814 Mon Sep 17 00:00:00 2001
From: Greg Sherwood <gsherwood@squiz.net>
Date: Mon, 12 Feb 2018 10:06:14 +1100
Subject: [PATCH] Changelog for #1892 - bakport for #1890

---
 .../Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php         | 2 +-
 package.xml                                                     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php b/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php
index e1ac42b526..040090ee51 100644
--- a/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php
+++ b/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php
@@ -100,7 +100,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
         // Get token identifier.
         $name  = strtoupper($token['content']);
         $error = 'Empty %s statement detected';
-         $phpcsFile->addError($error, $stackPtr, 'Detected'.ucfirst(strtolower($name)), array($name));
+        $phpcsFile->addError($error, $stackPtr, 'Detected'.ucfirst(strtolower($name)), array($name));
 
     }//end process()
 
diff --git a/package.xml b/package.xml
index 20c9335772..717954c5b7 100644
--- a/package.xml
+++ b/package.xml
@@ -30,6 +30,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Thanks to Michał Bundyra for the patch
   - Fixed bug #1549 : Squiz.PHP.EmbeddedPhp fixer conflict with // comment before PHP close tag
     -- Thanks to Juliette Reinders Folmer for the patch
+  - Fixed bug #1890 : Incorrect Squiz.WhiteSpace.ControlStructureSpacing.NoLineAfterClose error between catch and finally statements
  </notes>
  <contents>
   <dir name="/">