Fix CS to new version

spell-checker · Oct 5, 2020 · 943271e · 943271e
1 parent 3ec4fbe
commit 943271e
Show file tree

Hide file tree

Showing 25 changed files with 70 additions and 61 deletions.
diff --git a/src/Dictionary/DictionaryCollection.php b/src/Dictionary/DictionaryCollection.php
@@ -42,21 +42,21 @@ class DictionaryCollection
     /** @var string[] */
     private $checkedFiles;
 
-    /** @var \SpellChecker\Dictionary\Dictionary[] */
+    /** @var Dictionary[] */
     private $dictionaries;
 
     /** @var string[] */
     private $diacriticDictionaries;
 
-    /** @var \Dogma\Application\Console|null */
+    /** @var Console|null */
     private $console;
 
     /**
      * @param string[] $directories
      * @param string[] $diacriticDictionaries
      * @param string[] $checkedFiles
      * @param string|null $baseDir
-     * @param \Dogma\Application\Console|null $console
+     * @param Console|null $console
      */
     public function __construct(
         array $directories,
@@ -231,7 +231,7 @@ private function findDictionaryFiles(): void
     }
 
     /**
-     * @return \SpellChecker\Dictionary\Dictionary[]
+     * @return Dictionary[]
      */
     public function getDictionaries(): array
     {

diff --git a/src/FileFinder.php b/src/FileFinder.php
@@ -3,6 +3,7 @@
 namespace SpellChecker;
 
 use Dogma\Application\Configurator;
+use Dogma\ArrayIterator;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Finder\Iterator\FilenameFilterIterator;
 use function array_intersect;
@@ -34,7 +35,7 @@ public function getBaseDir(): string
     }
 
     /**
-     * @param \Dogma\Application\Configurator $config
+     * @param Configurator $config
      * @return string[]
      */
     public function findFilesByConfig(Configurator $config): array
@@ -109,7 +110,7 @@ public function filterFiles(?array $files, ?array $directories, ?array $extensio
 
             // filter files by extensions and excludes
             if ($extensions || $excludes) {
-                return iterator_to_array(new FilenameFilterIterator(new \ArrayIterator($foundFiles), $extensions ?? [], $excludes ?? []));
+                return iterator_to_array(new FilenameFilterIterator(new ArrayIterator($foundFiles), $extensions ?? [], $excludes ?? []));
             } else {
                 return $foundFiles;
             }
@@ -121,7 +122,7 @@ public function filterFiles(?array $files, ?array $directories, ?array $extensio
     /**
      * @param string[]|null $extensions
      * @param string[]|null $excludes
-     * @return \Symfony\Component\Finder\Finder
+     * @return Finder
      */
     private function createFinder(?array $extensions = null, ?array $excludes = null): Finder
     {

diff --git a/src/Heuristic/AddressDetector.php b/src/Heuristic/AddressDetector.php
@@ -25,7 +25,7 @@ class AddressDetector implements Heuristic
     public const RESULT_URL = 'url';
     public const RESULT_URL_PART = 'url-part';
 
-    /** @var \SpellChecker\Dictionary\DictionaryCollection */
+    /** @var DictionaryCollection */
     private $dictionaries;
 
     /** @var bool */
@@ -46,7 +46,7 @@ public function __construct(
     }
 
     /**
-     * @param \SpellChecker\Word $word
+     * @param Word $word
      * @param string $string
      * @param string[] $dictionaries
      * @return string|null

diff --git a/src/Heuristic/Base64DataDetector.php b/src/Heuristic/Base64DataDetector.php
@@ -13,7 +13,7 @@ class Base64DataDetector implements Heuristic
     public const RESULT_IMAGE = 'image';
 
     /**
-     * @param \SpellChecker\Word $word
+     * @param Word $word
      * @param string $string
      * @param string[] $dictionaries
      * @return string|null

diff --git a/src/Heuristic/BulletsDetector.php b/src/Heuristic/BulletsDetector.php
@@ -27,7 +27,7 @@ public function __construct()
     }
 
     /**
-     * @param \SpellChecker\Word $word
+     * @param Word $word
      * @param string $string
      * @param string[] $dictionaries
      * @return string|null

diff --git a/src/Heuristic/CssUnitsDetector.php b/src/Heuristic/CssUnitsDetector.php
@@ -16,7 +16,7 @@ class CssUnitsDetector implements Heuristic
     public const RESULT_UNIT = 'unit';
 
     /**
-     * @param \SpellChecker\Word $word
+     * @param Word $word
      * @param string $string
      * @param string[] $dictionaries
      * @return string|null

diff --git a/src/Heuristic/DictionarySearch.php b/src/Heuristic/DictionarySearch.php
@@ -16,7 +16,7 @@ class DictionarySearch implements Heuristic
     public const TRY_CAPITALIZED = 2;
     public const TRY_WITHOUT_DIACRITICS = 4;
 
-    /** @var \SpellChecker\Dictionary\DictionaryCollection */
+    /** @var DictionaryCollection */
     private $dictionaries;
 
     public function __construct(DictionaryCollection $dictionaries)
@@ -25,7 +25,7 @@ public function __construct(DictionaryCollection $dictionaries)
     }
 
     /**
-     * @param \SpellChecker\Word $word
+     * @param Word $word
      * @param string $string
      * @param string[] $dictionaries
      * @return string|null

diff --git a/src/Heuristic/EscapeSequenceDetector.php b/src/Heuristic/EscapeSequenceDetector.php
@@ -15,7 +15,7 @@ class EscapeSequenceDetector implements Heuristic
     public const RESULT_ENTITY = 'entity';
 
     /**
-     * @param \SpellChecker\Word $word
+     * @param Word $word
      * @param string $string
      * @param string[] $dictionaries
      * @return string|null

diff --git a/src/Heuristic/FileNameDetector.php b/src/Heuristic/FileNameDetector.php
@@ -18,7 +18,7 @@ class FileNameDetector implements Heuristic
 
     public const RESULT_FILE_NAME = 'file';
 
-    /** @var \SpellChecker\Dictionary\DictionaryCollection */
+    /** @var DictionaryCollection */
     private $dictionaries;
 
     /** @var string[] */
@@ -34,7 +34,7 @@ public function __construct(DictionaryCollection $dictionaries)
     }
 
     /**
-     * @param \SpellChecker\Word $word
+     * @param Word $word
      * @param string $string
      * @param string[] $dictionaries
      * @return string|string

diff --git a/src/Heuristic/GarbageDetector.php b/src/Heuristic/GarbageDetector.php
@@ -17,7 +17,7 @@ class GarbageDetector implements Heuristic
     public const RESULT_GARBAGE = 'garbage';
 
     /**
-     * @param \SpellChecker\Word $word
+     * @param Word $word
      * @param string $string
      * @param string[] $dictionaries
      * @return string|null

diff --git a/src/Heuristic/Heuristic.php b/src/Heuristic/Heuristic.php
@@ -10,7 +10,7 @@ interface Heuristic
     /**
      * Checks the given word.
      * Returns the name of rule or dictionary for which the word matches or null if it does not match.
-     * @param \SpellChecker\Word $word
+     * @param Word $word
      * @param string $string
      * @param string[] $dictionaries
      * @return string|null

diff --git a/src/Heuristic/IdentifiersDetector.php b/src/Heuristic/IdentifiersDetector.php
@@ -19,7 +19,7 @@ class IdentifiersDetector implements Heuristic
     public const ID = 'id';
     public const CONSTANT = 'constant';
 
-    /** @var \SpellChecker\Dictionary\DictionaryCollection */
+    /** @var DictionaryCollection */
     private $dictionaries;
 
     public function __construct(DictionaryCollection $dictionaries)
@@ -28,7 +28,7 @@ public function __construct(DictionaryCollection $dictionaries)
     }
 
     /**
-     * @param \SpellChecker\Word $word
+     * @param Word $word
      * @param string $string
      * @param string[] $dictionaries
      * @return string|string

diff --git a/src/Heuristic/PrintfDetector.php b/src/Heuristic/PrintfDetector.php
@@ -15,7 +15,7 @@ class PrintfDetector implements Heuristic
     public const RESULT_PRINTF = 'printf';
 
     /**
-     * @param \SpellChecker\Word $word
+     * @param Word $word
      * @param string $string
      * @param string[] $dictionaries
      * @return string|string

diff --git a/src/Heuristic/SimpleHtmlDetector.php b/src/Heuristic/SimpleHtmlDetector.php
@@ -26,7 +26,7 @@ class SimpleHtmlDetector implements Heuristic
     ];
 
     /**
-     * @param \SpellChecker\Word $word
+     * @param Word $word
      * @param string $string
      * @param string[] $dictionaries
      * @return string|null

diff --git a/src/Heuristic/SqlTableShortcutDetector.php b/src/Heuristic/SqlTableShortcutDetector.php
@@ -67,7 +67,7 @@ class SqlTableShortcutDetector implements Heuristic
     private $pattern;
 
     /**
-     * @param \SpellChecker\Word $word
+     * @param Word $word
      * @param string $string
      * @param string[] $dictionaries
      * @return string|null

diff --git a/src/Parser/DefaultParser.php b/src/Parser/DefaultParser.php
@@ -37,7 +37,7 @@ public function __construct(array $exceptions = [])
     /**
      * Parse code with camelCase and under_scores
      * @param string $string
-     * @return \SpellChecker\Word[]
+     * @return Word[]
      */
     public function parse(string $string): array
     {
@@ -70,7 +70,7 @@ public function parse(string $string): array
      * @param string $block
      * @param int $position
      * @param int $rowNumber
-     * @param \SpellChecker\Word[] $result
+     * @param Word[] $result
      * @param string|null $context
      */
     public function blocksToWords(string $block, int $position, int $rowNumber, array &$result, ?string $context = null): void

diff --git a/src/Parser/Parser.php b/src/Parser/Parser.php
@@ -2,6 +2,8 @@
 
 namespace SpellChecker\Parser;
 
+use SpellChecker\Word;
+
 interface Parser
 {
 
@@ -13,7 +15,7 @@ interface Parser
     /**
      * Parse words from text
      * @param string $string
-     * @return \SpellChecker\Word[]
+     * @return Word[]
      */
     public function parse(string $string): array;
 

diff --git a/src/Parser/PhpParser.php b/src/Parser/PhpParser.php
@@ -2,15 +2,7 @@
 
 namespace SpellChecker\Parser;
 
-use function explode;
-use function ltrim;
-use function preg_match_all;
-use function rtrim;
-use function str_replace;
-use function strlen;
-use function substr;
-use function token_get_all;
-use function trim;
+use SpellChecker\Word;
 use const PREG_OFFSET_CAPTURE;
 use const T_COMMENT;
 use const T_CONSTANT_ENCAPSED_STRING;
@@ -22,6 +14,16 @@
 use const T_STRING;
 use const T_STRING_VARNAME;
 use const T_VARIABLE;
+use function explode;
+use function is_string;
+use function ltrim;
+use function preg_match_all;
+use function rtrim;
+use function str_replace;
+use function strlen;
+use function substr;
+use function token_get_all;
+use function trim;
 
 class PhpParser implements Parser
 {
@@ -33,7 +35,7 @@ class PhpParser implements Parser
     public const CONTEXT_HTML = 'html';
     public const CONTEXT_DATA = 'data';
 
-    /** @var \SpellChecker\Parser\DefaultParser */
+    /** @var DefaultParser */
     private $defaultParser;
 
     public function __construct(DefaultParser $defaultParser)
@@ -43,7 +45,7 @@ public function __construct(DefaultParser $defaultParser)
 
     /**
      * @param string $string
-     * @return \SpellChecker\Word[]
+     * @return Word[]
      */
     public function parse(string $string): array
     {
@@ -123,7 +125,7 @@ public function parse(string $string): array
     }
 
     /**
-     * @param \SpellChecker\Word[] $result
+     * @param Word[] $result
      * @param string $string
      * @param int $filePosition
      * @param int $rowNumber

diff --git a/src/Parser/PoParser.php b/src/Parser/PoParser.php
@@ -2,6 +2,7 @@
 
 namespace SpellChecker\Parser;
 
+use SpellChecker\Word;
 use const PREG_OFFSET_CAPTURE;
 use function explode;
 use function preg_match;
@@ -14,7 +15,7 @@ class PoParser implements Parser
     public const CONTEXT_MESSAGE = 'msgid';
     public const CONTEXT_TRANSLATION = 'msgstr';
 
-    /** @var \SpellChecker\Parser\DefaultParser */
+    /** @var DefaultParser */
     private $defaultParser;
 
     public function __construct(DefaultParser $defaultParser)
@@ -24,7 +25,7 @@ public function __construct(DefaultParser $defaultParser)
 
     /**
      * @param string $string
-     * @return \SpellChecker\Word[]
+     * @return Word[]
      */
     public function parse(string $string): array
     {

diff --git a/src/Result.php b/src/Result.php
@@ -8,14 +8,14 @@
 class Result
 {
 
-    /** @var \SpellChecker\Word[][] */
+    /** @var Word[][] */
     private $errors;
 
     /** @var int */
     private $errorsCount;
 
     /**
-     * @param \SpellChecker\Word[][] $errors
+     * @param Word[][] $errors
      * @param int $errorsCount
      */
     public function __construct(array $errors, int $errorsCount)
@@ -30,7 +30,7 @@ public function errorsFound(): bool
     }
 
     /**
-     * @return \SpellChecker\Word[][]
+     * @return Word[][]
      */
     public function getErrors(): array
     {

diff --git a/src/ResultFormatter.php b/src/ResultFormatter.php
@@ -23,7 +23,7 @@
 class ResultFormatter
 {
 
-    /** @var \SpellChecker\Dictionary\DictionaryResolver */
+    /** @var DictionaryResolver */
     private $dictionaryResolver;
 
     /** @var string|null */
@@ -167,7 +167,7 @@ public function formatErrors(Result $result): string
 
     /**
      * @param string $fileName
-     * @param \SpellChecker\Word[] $errors
+     * @param Word[] $errors
      * @param int $maxWidth
      * @return string
      */
@@ -213,7 +213,7 @@ public function formatErrorsShort(Result $result): string
 
     /**
      * @param string $fileName
-     * @param \SpellChecker\Word[] $errors
+     * @param Word[] $errors
      * @return string
      */
     public function formatFileErrorsShort(string $fileName, array $errors): string