Merge pull request #9 from webimpress/hotfix/disallow-fqn-unused-impo…

…rt-conflict DisallowFqn - resolve conflict with UnusedImport sniff when imported class was removed
webimpress · May 10, 2019 · d335b87 · d335b87
2 parents 129b8a7 + eed69d3
commit d335b87
Showing 1 changed file with 4 additions and 2 deletions.
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