Merge branch 'hotfix/9' into develop

Forward port #9
webimpress · May 10, 2019 · 3b6a852 · 3b6a852
2 parents 824e361 + 7974d3c
commit 3b6a852
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -52,6 +52,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 - [#8](https://github.com/webimpress/coding-standard/pull/8) `Formatting\StringClassReference` - fixes checking if string is a valid class name before check if class/interface/trait exists
 
+- [#9](https://github.com/webimpress/coding-standard/pull/9) `PHP\DisallowFqn` - fixes conflict with `Namespaces\UnusedUseStatement` when newly added import was deleted straight away
+
 ## 1.0.0 - 2019-03-07
 
 Initial release.

diff --git a/src/WebimpressCodingStandard/Sniffs/PHP/DisallowFqnSniff.php b/src/WebimpressCodingStandard/Sniffs/PHP/DisallowFqnSniff.php
@@ -410,7 +410,7 @@ private function processString(File $phpcsFile, int $stackPtr, string $namespace
 
         $error = '%s must be imported as %s';
         $data = [$name, $alias];
-        $fix = $phpcsFile->addFixableError($error, $stackPtr, 'Import', $data);
+        $fix = $this->error($phpcsFile, $error, $stackPtr, 'Import', $data, $alias);
 
         if ($fix) {
             return $this->import($type, $name, $alias);
@@ -460,7 +460,7 @@ private function error(
         string $code,
         array $data,
         string $expected
-    ) : void {
+    ) : bool {
         $fix = $phpcsFile->addFixableError($error, $stackPtr, $code, $data);
         if ($fix) {
             $tokens = $phpcsFile->getTokens();
@@ -481,6 +481,8 @@ private function error(
             }
             $phpcsFile->fixer->endChangeset();
         }
+
+        return $fix;
     }
 
     private function import(string $type, string $fqn, string $alias) : array