[+]: "ascii_extras" -> convert into ascii by default

-> so that we don't need to replace some texts twice
voku · Dec 12, 2019 · feb6df4 · feb6df4
1 parent 056000d
commit feb6df4
Show file tree

Hide file tree

Showing 5 changed files with 198 additions and 198 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -81,15 +81,15 @@ before_script:
   - wget https://scrutinizer-ci.com/ocular.phar
   - travis_retry composer self-update
   - travis_retry composer require satooshi/php-coveralls
-  - travis_retry composer require phpstan/phpstan-shim
+  - if [ "$(phpenv version-name)" == 7.3 ]; then travis_retry composer require phpstan/phpstan; fi
   - if [[ $PHP_COMPOSER_SETUP = 'basic' ]]; then travis_retry composer install --prefer-dist --no-interaction; fi
   - if [[ $PHP_COMPOSER_SETUP = 'lowest' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable; fi
   - composer dump-autoload -o
 
 script:
   - mkdir -p build/logs
   - php vendor/bin/phpunit -c phpunit.xml --debug
-  - php vendor/bin/phpstan analyse --level=7 --configuration=phpstan.neon src
+  - if [ "$(phpenv version-name)" == 7.3 ]; then php vendor/bin/phpstan analyse; fi
 
 after_script:
   - php vendor/bin/php-coveralls -v

diff --git a/phpcs.php_cs b/phpcs.php_cs
@@ -150,7 +150,7 @@ return PhpCsFixer\Config::create()
                                 'phpdoc_inline_tag'                             => true,
                                 'phpdoc_no_access'                              => true,
                                 'phpdoc_no_alias_tag'                           => true,
-                                'phpdoc_no_empty_return'                        => true,
+                                'phpdoc_no_empty_return'                        => false, // allow void
                                 'phpdoc_no_package'                             => true,
                                 'phpdoc_no_useless_inheritdoc'                  => true,
                                 'phpdoc_order'                                  => true,

diff --git a/src/voku/helper/ASCII.php b/src/voku/helper/ASCII.php
@@ -456,7 +456,7 @@ public static function normalize_msword(string $str): string
             /**
              * @psalm-suppress PossiblyNullArrayAccess - we use the prepare* methods here, so we don't get NULL here
              *
-             * @var array
+             * @var array<string, string>
              */
             $map = self::$ASCII_MAPS[self::EXTRA_MSWORD_CHARS_LANGUAGE_CODE];
 
@@ -979,7 +979,7 @@ private static function get_language(string $language)
      *
      * @param string $file
      *
-     * @return array
+     * @return array<mixed>
      */
     private static function getData(string $file)
     {
@@ -994,7 +994,7 @@ private static function getData(string $file)
      *
      * @param string $file
      *
-     * @return array
+     * @return array<mixed>
      */
     private static function getDataIfExists(string $file)
     {
@@ -1009,7 +1009,7 @@ private static function getDataIfExists(string $file)
     }
 
     /**
-     * @psalm-suppress MissingReturnType
+     * @return void
      */
     private static function prepareAsciiAndExtrasMaps()
     {
@@ -1025,7 +1025,7 @@ private static function prepareAsciiAndExtrasMaps()
     }
 
     /**
-     * @psalm-suppress MissingReturnType
+     * @return void
      */
     private static function prepareAsciiMaps()
     {