diff --git a/.travis.yml b/.travis.yml
index b61ab4b..8fe0538 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,35 +3,27 @@ language: php
 sudo: false
 
 php:
-  - 7.1
   - 7.2
   - 7.3
-
-env:
-  - PHPCS_FLAGS="--standard=PSR12"
+  - 7.4
 
 matrix:
   fast_finish: true
   include:
-    - php: 7.1
-      env:
-        - COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
-        - PHPCS_FLAGS="--standard=PSR2"
     - php: 7.2
       env:
         - PHPUNIT_FLAGS="--coverage-clover build/logs/clover.xml"
-        - PHPCS_FLAGS="--standard=PSR12"
 
 before_install:
   - travis_retry composer self-update
-  - sudo apt-get install aspell
+  - sudo apt-get install aspell aspell-en
 
 install:
-  - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction
+  - travis_retry composer install --no-interaction
 
 script:
  - mkdir -p build/logs
- - vendor/bin/phpcs ${PHPCS_FLAGS} src/ tests/
+ - vendor/bin/phpcs --standard=PSR12 src/ tests/
  - vendor/bin/phpunit ${PHPUNIT_FLAGS}
 
 after_script:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81a5c42..d3e0334 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,54 +1,60 @@
 # Changelog
 
-## Unreleased
-
-### Deleted
+## 2.1 - 2020-05-06
+### Fixed
+- Fixed issue with removed and deprecated methods for `symfony/process:^4.0`
 
-- Dropped PHP 5.4 support.
-- Dropped Symfony 2 support.
+### Changed
+- Add requirement for `php:^7.2`
+- Changed minimum requirement for `symfony/process` to `^4.4`
 
+## 2.0.4 - 2020-04-30
 ### Added
+- Added support for `symfony/process:^5.0` to work with laravel 7 (thanks [@](https://github.com/ibarrajo) [#21](https://github.com/mekras/php-speller/pull/21))
 
-- PHP 7 support.
+## 2.0.3 - 2020-04-28
+### Fixed
+- Resolve an issue with malformed html input (thanks to [@rouliane](https://github.com/rouliane) [#20](https://github.com/mekras/php-speller/pull/20))
 
-## 2.0
+## 2.0.2 - 2019-01-25
+### Fixed
+- backward support for `php:^7.1 and `symfony/process: ^3.4`
+
+## 2.0.1 - 2019-01-18
+### Fixed
+- Fixed support for hunspell paths on windows OS
 
+## 2.0 - 2019-01-17
+### Added
 - Add custom dictionary support for aspell
+
+### Changed
 - Raise PHP requirement to 7.2
+
+### Removed
 - Dropped `@deprecated` interfaces
 
 ## 1.7.2 - 2017-04-30
-
 ### Fixed
-
 - HtmlFilter: `<script>` content should be filtered out.
 - HtmlFilter: only for "keywords" and "description" meta tags "content" attr should be treated as
   string.
 
 ## 1.7.1 - 2017-04-29
-
 ### Fixed
-
 - HtmlFilter: meta tags with http-equiv should be filtered out.
 
-
 ## 1.7 - 2017-03-22
-
 ### Fixed
-
 - #6: Failed to execute "hunspell -i UTF-8 -a": Can't open affix or dictionary files for dictionary
   named "default".
 - FileSource throws SourceException when using "php://stdin".
 
 ### Changed
-
 - HtmlSource should throw SourceException on invalid HTML.
 
-
 ## 1.6 - 2017-03-12
-
 ### Added
-
 - Aspell — aspell backend.
 - Ispell — ispell backend.
 - IconvSource — converts text encoding using iconv.
@@ -58,84 +64,53 @@
 - Own exceptions.
 
 ### Changed
-
 - Hunspell class derived from new Ispell class.
 - All sources now implement EncodingAwareSource.
 - HtmlSource and XliffSource derived from MetaSource.
 
-
 ## 1.5.1 - 2017-03-11
-
 ### Fixed
-
 - HtmlSource: only for "keywords" and "description" meta tags "content" attr should be treated as
   user visible text.
 
-
 ## 1.5 - 2017-03-11
-
 ### Added
-
 - HtmlSource.
 
-
 ## 1.4.1 - 2016-08-02
-
 ### Fixed
-
 - #2: Word suggestions with space splits up
 
-
 ## 1.4 - 2016-04-19
-
 ### Deleted
-
 - Dropped PHP 5.4 support.
 
 ### Added
-
 - PHP 7 support.
 - Symfony 3.x support.
 
-
 ## 1.3.1 - 2015-05-13
-
 ### Changed
-
 - Fixed HTML entities filtering in HtmlFilter
 
-
 ## 1.3 - 2015-05-13
-
 ### Added
-
 - HtmlFilter added.
 
-
 ## 1.2 - 2015-05-12
-
 ### Added
-
 - New feature: Filters.
 - FileSource.
 - XliffSource for XLIFF translation files.
 
 ### Changed
-
 - Forced UTF-8 input encoding for Hunspell.
 
-
 ## 1.1 - 2015-05-08
-
 ### Fixed
-
 - Fixed invalid shell arguments escaping.
-
 ### Added
-
 - LanguageMapper now supports manual setting of preferred mappings.
 
-
 ## 1.0 - 2015-05-08
-
-Initial release.
+Initial release.
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 17c8ec3..38a6d18 100644
--- a/composer.json
+++ b/composer.json
@@ -20,16 +20,16 @@
         }
     ],
     "require": {
-        "php": "~7.1",
-        "symfony/process": "^3.4 || ^4.0 || ^5.0",
+        "php": "^7.1",
+        "symfony/process": "^4.4 || ^5.0",
         "ext-iconv": "*",
         "ext-dom": "*",
         "ext-libxml": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5",
-        "php-coveralls/php-coveralls": "^2.0",
-        "squizlabs/php_codesniffer": "^3.2"
+        "php-coveralls/php-coveralls": "^2.2",
+        "phpunit/phpunit": "^8.5",
+        "squizlabs/php_codesniffer": "^3.5"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Aspell/Aspell.php b/src/Aspell/Aspell.php
index 69ae2c6..f29e56c 100644
--- a/src/Aspell/Aspell.php
+++ b/src/Aspell/Aspell.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Aspell;
 
 use Mekras\Speller\Dictionary;
@@ -64,7 +65,7 @@ public function __construct(string $binaryPath = 'aspell')
     public function getSupportedLanguages(): array
     {
         if (null === $this->supportedLanguages) {
-            $process = $this->createProcess('dump dicts');
+            $process = $this->createProcess(['dump', 'dicts']);
             $process->run();
             if (!$process->isSuccessful()) {
                 throw new ExternalProgramFailedException(
@@ -100,6 +101,7 @@ public function getSupportedLanguages(): array
     public function setPersonalDictionary(Dictionary $dictionary): void
     {
         $this->personalDictionary = $dictionary;
+        $this->resetProcess();
     }
 
     /**
diff --git a/src/Dictionary.php b/src/Dictionary.php
index 98bde49..20b6bba 100644
--- a/src/Dictionary.php
+++ b/src/Dictionary.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller;
 
 /**
diff --git a/src/Exception/EnvironmentException.php b/src/Exception/EnvironmentException.php
index d1f75cb..1bdfd09 100644
--- a/src/Exception/EnvironmentException.php
+++ b/src/Exception/EnvironmentException.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Exception;
 
 /**
diff --git a/src/Exception/ExternalProgramFailedException.php b/src/Exception/ExternalProgramFailedException.php
index 218b213..e720d92 100644
--- a/src/Exception/ExternalProgramFailedException.php
+++ b/src/Exception/ExternalProgramFailedException.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Exception;
 
 /**
diff --git a/src/Exception/PhpSpellerException.php b/src/Exception/PhpSpellerException.php
index dc551ba..adea36b 100644
--- a/src/Exception/PhpSpellerException.php
+++ b/src/Exception/PhpSpellerException.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,14 +8,18 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Exception;
 
+use Throwable;
+
 /**
  * Common interface for all Speller exceptions.
  *
  * @since 1.6
  */
-interface PhpSpellerException
+interface PhpSpellerException extends Throwable
 {
     /**
      * @return string
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index 0b1bf28..3db42d1 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Exception;
 
 /**
diff --git a/src/Exception/SourceException.php b/src/Exception/SourceException.php
index cfda9f0..8864ef8 100644
--- a/src/Exception/SourceException.php
+++ b/src/Exception/SourceException.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Exception;
 
 /**
diff --git a/src/ExternalSpeller.php b/src/ExternalSpeller.php
index 8d34c44..ec55b9f 100644
--- a/src/ExternalSpeller.php
+++ b/src/ExternalSpeller.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller;
 
 use Mekras\Speller\Exception\EnvironmentException;
@@ -105,7 +106,8 @@ public function checkText(EncodingAwareSource $source, array $languages): array
 
         $output = $process->getOutput();
 
-        if ($source instanceof EncodingAwareSource
+        if (
+            $source instanceof EncodingAwareSource
             && strcasecmp($source->getEncoding(), 'UTF-8') !== 0
         ) {
             $output = iconv($source->getEncoding(), 'UTF-8', $output);
@@ -130,24 +132,15 @@ public function setTimeout($seconds): void
     /**
      * Compose shell command line
      *
-     * @param string|string[]|null $args Ispell arguments.
+     * @param array $args Ispell arguments.
      *
-     * @return string
+     * @return array
      *
      * @since 1.6
      */
-    protected function composeCommand($args): string
+    protected function composeCommand(array $args = []): array
     {
-        $command = $this->getBinary();
-
-        if (\is_array($args)) {
-            $args = implode(' ', $args);
-        }
-
-        // Only append args if we have some
-        $command .= $args !== '' ? ' ' . $args : '';
-
-        return $command;
+        return array_merge([$this->getBinary()], $args);
     }
 
     /**
@@ -210,7 +203,7 @@ abstract protected function parseOutput(string $output): array;
     /**
      * Create new instance of external program.
      *
-     * @param string|string[]|null $args Command arguments.
+     * @param array $args Command arguments.
      *
      * @return Process
      *
@@ -219,14 +212,14 @@ abstract protected function parseOutput(string $output): array;
      *
      * @since 1.6
      */
-    protected function createProcess($args = null): Process
+    protected function createProcess(array $args = null): Process
     {
         $command = $this->composeCommand($args);
 
         try {
             $process = $this->composeProcess($command);
         } catch (RuntimeException $e) {
-            throw new ExternalProgramFailedException($command, $e->getMessage(), 0, $e);
+            throw new ExternalProgramFailedException(join(' ', $command), $e->getMessage(), 0, $e);
         }
 
         return $process;
@@ -235,21 +228,19 @@ protected function createProcess($args = null): Process
     /**
      * Compose a process with given command. If no process is given in current instance a new one will be created.
      *
-     * @param string $command
+     * @param array $command
      *
      * @return Process
      *
      * @since 2.0
      */
-    private function composeProcess(string $command): Process
+    private function composeProcess(array $command): Process
     {
         if ($this->process === null) {
-            $this->process = new Process([$command]);
+            $this->process = new Process($command);
         }
 
-        $this->process->inheritEnvironmentVariables();
         $this->process->setTimeout($this->timeout);
-        $this->process->setCommandLine($command);
 
         return $this->process;
     }
@@ -265,4 +256,12 @@ public function setProcess(Process $process): self
 
         return $this;
     }
+
+    /**
+     * Reset current process to null
+     */
+    protected function resetProcess(): void
+    {
+        $this->process = null;
+    }
 }
diff --git a/src/Helper/LanguageMapper.php b/src/Helper/LanguageMapper.php
index 52cdc56..6dd2f2d 100644
--- a/src/Helper/LanguageMapper.php
+++ b/src/Helper/LanguageMapper.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Helper;
 
 /**
diff --git a/src/Hunspell/Hunspell.php b/src/Hunspell/Hunspell.php
index 176a579..659edee 100644
--- a/src/Hunspell/Hunspell.php
+++ b/src/Hunspell/Hunspell.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Hunspell;
 
 use Mekras\Speller\Exception\ExternalProgramFailedException;
@@ -73,7 +74,7 @@ public function __construct(string $binaryPath = 'hunspell')
     public function getSupportedLanguages(): array
     {
         if (null === $this->supportedLanguages) {
-            $process = $this->createProcess('-D');
+            $process = $this->createProcess(['-D']);
             $process->run();
             if (!$process->isSuccessful()) {
                 throw new ExternalProgramFailedException(
@@ -82,6 +83,7 @@ public function getSupportedLanguages(): array
                     $process->getExitCode()
                 );
             }
+            $this->resetProcess();
 
             $languages = [];
 
@@ -89,7 +91,8 @@ public function getSupportedLanguages(): array
             $is_win = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
             foreach ($output as $line) {
                 $line = trim($line);
-                if ('' === $line // Skip empty lines
+                if (
+                    '' === $line // Skip empty lines
                     || substr($line, -1) === ':' // Skip headers
                     || strpos($line, $is_win ? ';' : ':') !== false // Skip search path
                 ) {
diff --git a/src/Ispell/Ispell.php b/src/Ispell/Ispell.php
index 63101da..5a38f3f 100644
--- a/src/Ispell/Ispell.php
+++ b/src/Ispell/Ispell.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Ispell;
 
 use Mekras\Speller\Exception\EnvironmentException;
diff --git a/src/Issue.php b/src/Issue.php
index 95c3c67..45d7c3d 100644
--- a/src/Issue.php
+++ b/src/Issue.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller
@@ -8,6 +7,9 @@
  * @author    Михаил Красильников <m.krasilnikov@yandex.ru>
  * @license   http://opensource.org/licenses/MIT MIT
  */
+
+declare(strict_types=1);
+
 namespace Mekras\Speller;
 
 /**
diff --git a/src/Source/EncodingAwareSource.php b/src/Source/EncodingAwareSource.php
index 2ec06f5..eb2f8f2 100644
--- a/src/Source/EncodingAwareSource.php
+++ b/src/Source/EncodingAwareSource.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Source;
 
 use Mekras\Speller\Exception\SourceException;
diff --git a/src/Source/FileSource.php b/src/Source/FileSource.php
index e3379cb..104db8d 100644
--- a/src/Source/FileSource.php
+++ b/src/Source/FileSource.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Source;
 
 use Mekras\Speller\Exception\SourceException;
diff --git a/src/Source/Filter/Filter.php b/src/Source/Filter/Filter.php
index a98610f..f21332d 100644
--- a/src/Source/Filter/Filter.php
+++ b/src/Source/Filter/Filter.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Source\Filter;
 
 /**
diff --git a/src/Source/Filter/HtmlFilter.php b/src/Source/Filter/HtmlFilter.php
index 99af897..4e3c756 100644
--- a/src/Source/Filter/HtmlFilter.php
+++ b/src/Source/Filter/HtmlFilter.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Source\Filter;
 
 /**
@@ -235,7 +236,8 @@ private function filterMetaTags(string $string): string
         return preg_replace_callback(
             '/<meta[^>]+(http-equiv\s*=|name\s*=\s*["\']?([^>"\']+))[^>]*>/i',
             function ($match) {
-                if (count($match) < 3
+                if (
+                    count($match) < 3
                     || !in_array(strtolower($match[2]), self::$textMetaTags, true)
                 ) {
                     return str_repeat(' ', strlen($match[0]));
diff --git a/src/Source/Filter/StripAllFilter.php b/src/Source/Filter/StripAllFilter.php
index fd3eee2..620eebb 100644
--- a/src/Source/Filter/StripAllFilter.php
+++ b/src/Source/Filter/StripAllFilter.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller
@@ -8,6 +7,9 @@
  * @author    Михаил Красильников <m.krasilnikov@yandex.ru>
  * @license   http://opensource.org/licenses/MIT MIT
  */
+
+declare(strict_types=1);
+
 namespace Mekras\Speller\Source\Filter;
 
 /**
diff --git a/src/Source/HtmlSource.php b/src/Source/HtmlSource.php
index 808ba76..69370ea 100644
--- a/src/Source/HtmlSource.php
+++ b/src/Source/HtmlSource.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Source;
 
 use Mekras\Speller\Exception\SourceException;
diff --git a/src/Source/IconvSource.php b/src/Source/IconvSource.php
index bd6d197..a13fcbb 100644
--- a/src/Source/IconvSource.php
+++ b/src/Source/IconvSource.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Source;
 
 use Mekras\Speller\Exception\SourceException;
diff --git a/src/Source/MetaSource.php b/src/Source/MetaSource.php
index f138091..fb5de95 100644
--- a/src/Source/MetaSource.php
+++ b/src/Source/MetaSource.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Source;
 
 /**
diff --git a/src/Source/StringSource.php b/src/Source/StringSource.php
index 63d67e1..6fc55e7 100644
--- a/src/Source/StringSource.php
+++ b/src/Source/StringSource.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Source;
 
 /**
diff --git a/src/Source/XliffSource.php b/src/Source/XliffSource.php
index 782826e..d1923c7 100644
--- a/src/Source/XliffSource.php
+++ b/src/Source/XliffSource.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Source;
 
 use Mekras\Speller\Source\Filter\Filter;
diff --git a/src/Speller.php b/src/Speller.php
index 2354975..54ed7b6 100644
--- a/src/Speller.php
+++ b/src/Speller.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller;
 
 use Mekras\Speller\Source\EncodingAwareSource;
diff --git a/tests/Functional/Aspell/AspellTest.php b/tests/Functional/Aspell/AspellTest.php
index c08cd99..c82d3e4 100644
--- a/tests/Functional/Aspell/AspellTest.php
+++ b/tests/Functional/Aspell/AspellTest.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Tests\Functional\Aspell;
 
 use Mekras\Speller\Aspell\Aspell;
diff --git a/tests/Functional/AspellTestCase.php b/tests/Functional/AspellTestCase.php
index 6e3d225..c172ede 100644
--- a/tests/Functional/AspellTestCase.php
+++ b/tests/Functional/AspellTestCase.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Tests\Functional;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/Aspell/AspellTest.php b/tests/Unit/Aspell/AspellTest.php
index 60c6f01..bd47639 100644
--- a/tests/Unit/Aspell/AspellTest.php
+++ b/tests/Unit/Aspell/AspellTest.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Tests\Unit\Aspell;
 
 use Mekras\Speller\Aspell\Aspell;
@@ -31,7 +32,7 @@ class AspellTest extends TestCase
     /**
      * @inheritdoc
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
 
@@ -47,8 +48,6 @@ public function testGetSupportedLanguages(): void
     {
         $process = $this->prophesize(Process::class);
 
-        $process->setCommandLine('aspell dump dicts')->shouldBeCalled();
-        $process->inheritEnvironmentVariables()->shouldBeCalled();
         $process->setTimeout(600)->shouldBeCalled();
         $process->run()->shouldBeCalled();
         $process->isSuccessful()->shouldBeCalled()->willReturn(true);
@@ -85,8 +84,6 @@ public function testCheckText(): void
     {
         $process = $this->prophesize(Process::class);
 
-        $process->setCommandLine('aspell --encoding=UTF-8 -a --lang=en')->shouldBeCalled();
-        $process->inheritEnvironmentVariables()->shouldBeCalled();
         $process->setTimeout(600)->shouldBeCalled();
         $process->setEnv([])->shouldBeCalled();
         $process->setInput(self::$input)->shouldBeCalled();
diff --git a/tests/Unit/ExternalSpellerTest.php b/tests/Unit/ExternalSpellerTest.php
index f399893..f056ea6 100644
--- a/tests/Unit/ExternalSpellerTest.php
+++ b/tests/Unit/ExternalSpellerTest.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Tests\Unit;
 
 use Mekras\Speller\Exception\EnvironmentException;
@@ -34,8 +35,6 @@ public function testProcessRunException(): void
         $commandLine = 'aspell';
         $process = $this->prophesize(Process::class);
 
-        $process->setCommandLine($commandLine)->shouldBeCalled();
-        $process->inheritEnvironmentVariables()->shouldBeCalled();
         $process->setTimeout(600)->shouldBeCalled();
         $process->setEnv([])->shouldBeCalled();
         $process->setInput('')->shouldBeCalled();
@@ -61,11 +60,8 @@ public function testProcessRunException(): void
      */
     public function testProcessGetExitCode(): void
     {
-        $commandLine = 'aspell';
         $process = $this->prophesize(Process::class);
 
-        $process->setCommandLine($commandLine)->shouldBeCalled();
-        $process->inheritEnvironmentVariables()->shouldBeCalled();
         $process->setTimeout(600)->shouldBeCalled();
         $process->setEnv([])->shouldBeCalled();
         $process->setInput('')->shouldBeCalled();
@@ -95,8 +91,6 @@ public function testProcessExitCodeDifferFromZero(): void
         $commandLine = 'aspell';
         $process = $this->prophesize(Process::class);
 
-        $process->setCommandLine($commandLine)->shouldBeCalled();
-        $process->inheritEnvironmentVariables()->shouldBeCalled();
         $process->setTimeout(600)->shouldBeCalled();
         $process->setEnv([])->shouldBeCalled();
         $process->setInput('')->shouldBeCalled();
diff --git a/tests/Unit/Helper/LanguageMapperTest.php b/tests/Unit/Helper/LanguageMapperTest.php
index 05453fe..13d3b12 100644
--- a/tests/Unit/Helper/LanguageMapperTest.php
+++ b/tests/Unit/Helper/LanguageMapperTest.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller
@@ -8,6 +7,9 @@
  * @author    Михаил Красильников <m.krasilnikov@yandex.ru>
  * @license   http://opensource.org/licenses/MIT MIT
  */
+
+declare(strict_types=1);
+
 namespace Mekras\Speller\Tests\Unit\Helper;
 
 use Mekras\Speller\Helper\LanguageMapper;
diff --git a/tests/Unit/Hunspell/HunspellTest.php b/tests/Unit/Hunspell/HunspellTest.php
index e7b533a..aa54d9d 100644
--- a/tests/Unit/Hunspell/HunspellTest.php
+++ b/tests/Unit/Hunspell/HunspellTest.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Tests\Unit\Hunspell;
 
 use Mekras\Speller\Hunspell\Hunspell;
@@ -33,7 +34,7 @@ public function testArgumentEscaping(): void
         $hunspell = new Hunspell();
         $method = new ReflectionMethod(get_class($hunspell), 'composeCommand');
         $method->setAccessible(true);
-        static::assertEquals('hunspell -d foo,bar', $method->invoke($hunspell, ['-d foo,bar']));
+        static::assertEquals(['hunspell', '-d', 'foo,bar'], $method->invoke($hunspell, ['-d', 'foo,bar']));
     }
 
     /**
diff --git a/tests/Unit/Ispell/IspellTest.php b/tests/Unit/Ispell/IspellTest.php
index 90b4acf..d285d79 100644
--- a/tests/Unit/Ispell/IspellTest.php
+++ b/tests/Unit/Ispell/IspellTest.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Tests\Unit\Ispell;
 
 use Mekras\Speller\Ispell\Ispell;
diff --git a/tests/Unit/IssueTest.php b/tests/Unit/IssueTest.php
index d815d9d..c6252b0 100644
--- a/tests/Unit/IssueTest.php
+++ b/tests/Unit/IssueTest.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller
@@ -8,6 +7,9 @@
  * @author Михаил Красильников <m.krasilnikov@yandex.ru>
  * @license http://opensource.org/licenses/MIT MIT
  */
+
+declare(strict_types=1);
+
 namespace Mekras\Speller\Tests\Unit;
 
 use Mekras\Speller\Issue;
diff --git a/tests/Unit/Source/FileSourceTest.php b/tests/Unit/Source/FileSourceTest.php
index 3b4307d..efdf6ba 100644
--- a/tests/Unit/Source/FileSourceTest.php
+++ b/tests/Unit/Source/FileSourceTest.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Tests\Unit\Source;
 
 use Mekras\Speller\Source\FileSource;
diff --git a/tests/Unit/Source/Filter/HtmlFilterTest.php b/tests/Unit/Source/Filter/HtmlFilterTest.php
index 73e4106..fa2fb92 100644
--- a/tests/Unit/Source/Filter/HtmlFilterTest.php
+++ b/tests/Unit/Source/Filter/HtmlFilterTest.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Tests\Unit\Source\Filter;
 
 use Mekras\Speller\Source\Filter\HtmlFilter;
diff --git a/tests/Unit/Source/Filter/StripAllFilterTest.php b/tests/Unit/Source/Filter/StripAllFilterTest.php
index 62594f6..b4dfff2 100644
--- a/tests/Unit/Source/Filter/StripAllFilterTest.php
+++ b/tests/Unit/Source/Filter/StripAllFilterTest.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller
@@ -8,6 +7,9 @@
  * @author Михаил Красильников <m.krasilnikov@yandex.ru>
  * @license http://opensource.org/licenses/MIT MIT
  */
+
+declare(strict_types=1);
+
 namespace Mekras\Speller\Tests\Unit\Source\Filter;
 
 use Mekras\Speller\Source\Filter\StripAllFilter;
diff --git a/tests/Unit/Source/HtmlSourceTest.php b/tests/Unit/Source/HtmlSourceTest.php
index 5c5f170..122d09b 100644
--- a/tests/Unit/Source/HtmlSourceTest.php
+++ b/tests/Unit/Source/HtmlSourceTest.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Tests\Unit\Source;
 
 use Mekras\Speller\Source\HtmlSource;
diff --git a/tests/Unit/Source/IconvSourceTest.php b/tests/Unit/Source/IconvSourceTest.php
index 57c539d..acefa6e 100644
--- a/tests/Unit/Source/IconvSourceTest.php
+++ b/tests/Unit/Source/IconvSourceTest.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Tests\Unit\Source;
 
 use Mekras\Speller\Source\IconvSource;
diff --git a/tests/Unit/Source/StringSourceTest.php b/tests/Unit/Source/StringSourceTest.php
index 0568fa6..22b5c57 100644
--- a/tests/Unit/Source/StringSourceTest.php
+++ b/tests/Unit/Source/StringSourceTest.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller.
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Tests\Unit\Source;
 
 use Mekras\Speller\Source\StringSource;
diff --git a/tests/Unit/Source/XliffSourceTest.php b/tests/Unit/Source/XliffSourceTest.php
index 24af9d1..b497de7 100644
--- a/tests/Unit/Source/XliffSourceTest.php
+++ b/tests/Unit/Source/XliffSourceTest.php
@@ -1,5 +1,4 @@
 <?php
-declare(strict_types=1);
 
 /**
  * PHP Speller
@@ -9,6 +8,8 @@
  * @license   http://opensource.org/licenses/MIT MIT
  */
 
+declare(strict_types=1);
+
 namespace Mekras\Speller\Tests\Unit\Source;
 
 use Mekras\Speller\Source\XliffSource;
@@ -34,7 +35,7 @@ public function testBasics(): void
         static::assertEquals('Foo', substr($lines[7], 17, 3));
         static::assertEquals('Bar', substr($lines[12], 20, 3));
         static::assertEquals('Bar', substr($lines[13], 20, 3));
-        static::assertNotContains('var', $lines[14]);
+        static::assertStringNotContainsString('var', $lines[14]);
         static::assertEquals('Baz', substr($lines[27], 42, 3));
     }
 }