Supports PHP 8.0; Updated dev deps; Renamed src is a workarround for …

…php/phar/include bug
spell-checker · Nov 21, 2020 · 48cf779 · 48cf779
1 parent 943271e
commit 48cf779
Show file tree

Hide file tree

Showing 35 changed files with 40 additions and 130 deletions.
diff --git a/build.xml b/build.xml
diff --git a/build/spell-checker.neon b/build/spell-checker.neon
@@ -2,7 +2,7 @@
 # directories to search for files
 directories:
     - build
-    - src
+    - source
     - tests
     - util
     - //
@@ -19,6 +19,7 @@ extensions:
 
 # file name pattern -> list of dictionaries (first matched is used)
 dictionariesByFileName:
+    *spell-checker.neon: skip
     *.php: en
     *.phpt: en
     *.neon: en
@@ -42,3 +43,6 @@ dictionaryDirectories:
 # words, that cannot be parsed by default conventions
 wordsParserExceptions:
     - PHPUnit
+
+localIgnores:
+	*composer.json: da sp
diff --git a/build/spell-checker/en-custom.dic b/build/spell-checker/en-custom.dic
@@ -64,6 +64,7 @@ ln
 logoutput
 merchantability
 metadata
+mkdir
 msgid
 msgstr
 multi
@@ -74,9 +75,11 @@ ORM
 param
 parsers
 passthru
+phpcbf
 printf
 redistributions
 regex
+rf
 ruleset
 SAPI
 src

diff --git a/composer.json b/composer.json
@@ -7,32 +7,56 @@
     "authors": [
         {
             "name": "Vlasta Neubauer",
-            "homepage": "http://www.paranoiq.cz"
+            "homepage": "https://www.paranoiq.cz"
         }
     ],
     "require": {
-        "php": "^7.2.0",
+        "php": "^7.2|^8.0",
         "nette/neon": "~2.4|~3.0",
         "symfony/finder": "~3.4|~4.0|~5.0",
         "tracy/tracy": "~2.4",
         "dogma/dogma": "^0.1.15|^0.2.0"
     },
     "require-dev": {
-        "dogma/dogma-dev": "0.1.15"
+        "dogma/dogma-dev": "0.1.17"
     },
     "extra": {
         "branch-alias": {
             "dev-master": "0.3-dev"
         }
     },
-    "config": {
-        "bin-dir": "bin"
-    },
     "autoload": {
-        "classmap": ["src", "tests"]
+        "classmap": ["source", "tests"]
     },
     "bin": [
         "spell-checker"
     ],
-    "minimum-stability": "alpha"
+    "scripts": {
+        "da": "composer dump-autoload",
+        "build": [
+            "composer install",
+            "php -r \"@mkdir('log', 0777, true);\"",
+            "php -r \"@mkdir('temp/cache', 0777, true);\"",
+            "rm -rf temp/cache/*"
+        ],
+        "check": [
+            "@tests",
+            "@phpstan",
+            "@phpcs-setup",
+            "@phpcs-src",
+            "@spell-check",
+            "@phplint"
+        ],
+        "cs": [
+            "@phpcs-src",
+            "@phpcs-tests"
+        ],
+        "phpcs-src": "sh vendor/bin/phpcs --standard=vendor/dogma/dogma-dev/src/CodeSniffer/ruleset.xml --extensions=php --encoding=utf-8 --tab-width=4 -sp source",
+        "phpcs-tests": "sh vendor/bin/phpcs --standard=vendor/dogma/dogma-dev/src/CodeSniffer/ruleset-tests.xml --extensions=php --encoding=utf-8 --tab-width=4 -sp tests",
+        "phpcs-fix": "sh vendor/bin/phpcbf --standard=vendor/dogma/dogma-dev/src/CodeSniffer/ruleset-tests.xml --extensions=php --encoding=utf-8 --tab-width=4 source tests",
+        "phplint": "sh vendor/bin/parallel-lint source tests",
+        "phpstan": "sh vendor/bin/phpstan analyse -c build/phpstan.neon -l 5 source",
+        "spell-check": "php spell-checker.php -c build/spell-checker.neon --checkDictionaryFiles --memoryLimit 1024M --noLogo",
+        "tests": "sh vendor/bin/tester tests -c tests --colors 1"
+    }
 }
diff --git a/src/Dictionary/Dictionary.php → source/Dictionary/Dictionary.php b/src/Dictionary/Dictionary.php → source/Dictionary/Dictionary.php
diff --git a/src/Dictionary/DictionaryCollection.php → source/Dictionary/DictionaryCollection.php b/src/Dictionary/DictionaryCollection.php → source/Dictionary/DictionaryCollection.php
diff --git a/src/Dictionary/DictionaryResolver.php → source/Dictionary/DictionaryResolver.php b/src/Dictionary/DictionaryResolver.php → source/Dictionary/DictionaryResolver.php
diff --git a/...ns/DictionaryFileNotReadableException.php → ...ns/DictionaryFileNotReadableException.php b/...ns/DictionaryFileNotReadableException.php → ...ns/DictionaryFileNotReadableException.php
diff --git a/...ptions/NoDictionaryFileFoundException.php → ...ptions/NoDictionaryFileFoundException.php b/...ptions/NoDictionaryFileFoundException.php → ...ptions/NoDictionaryFileFoundException.php
diff --git a/src/FileFinder.php → source/FileFinder.php b/src/FileFinder.php → source/FileFinder.php
diff --git a/src/Heuristic/AddressDetector.php → source/Heuristic/AddressDetector.php b/src/Heuristic/AddressDetector.php → source/Heuristic/AddressDetector.php
diff --git a/src/Heuristic/Base64DataDetector.php → source/Heuristic/Base64DataDetector.php b/src/Heuristic/Base64DataDetector.php → source/Heuristic/Base64DataDetector.php
diff --git a/src/Heuristic/BulletsDetector.php → source/Heuristic/BulletsDetector.php b/src/Heuristic/BulletsDetector.php → source/Heuristic/BulletsDetector.php
diff --git a/src/Heuristic/CssUnitsDetector.php → source/Heuristic/CssUnitsDetector.php b/src/Heuristic/CssUnitsDetector.php → source/Heuristic/CssUnitsDetector.php
diff --git a/src/Heuristic/DictionarySearch.php → source/Heuristic/DictionarySearch.php b/src/Heuristic/DictionarySearch.php → source/Heuristic/DictionarySearch.php
diff --git a/src/Heuristic/EscapeSequenceDetector.php → source/Heuristic/EscapeSequenceDetector.php b/src/Heuristic/EscapeSequenceDetector.php → source/Heuristic/EscapeSequenceDetector.php
diff --git a/src/Heuristic/FileNameDetector.php → source/Heuristic/FileNameDetector.php b/src/Heuristic/FileNameDetector.php → source/Heuristic/FileNameDetector.php
diff --git a/src/Heuristic/GarbageDetector.php → source/Heuristic/GarbageDetector.php b/src/Heuristic/GarbageDetector.php → source/Heuristic/GarbageDetector.php
diff --git a/src/Heuristic/Heuristic.php → source/Heuristic/Heuristic.php b/src/Heuristic/Heuristic.php → source/Heuristic/Heuristic.php
diff --git a/src/Heuristic/IdentifiersDetector.php → source/Heuristic/IdentifiersDetector.php b/src/Heuristic/IdentifiersDetector.php → source/Heuristic/IdentifiersDetector.php
diff --git a/src/Heuristic/PrintfDetector.php → source/Heuristic/PrintfDetector.php b/src/Heuristic/PrintfDetector.php → source/Heuristic/PrintfDetector.php
diff --git a/src/Heuristic/SimpleHtmlDetector.php → source/Heuristic/SimpleHtmlDetector.php b/src/Heuristic/SimpleHtmlDetector.php → source/Heuristic/SimpleHtmlDetector.php
diff --git a/src/Heuristic/SqlTableShortcutDetector.php → ...ce/Heuristic/SqlTableShortcutDetector.php b/src/Heuristic/SqlTableShortcutDetector.php → ...ce/Heuristic/SqlTableShortcutDetector.php
diff --git a/src/Parser/DefaultParser.php → source/Parser/DefaultParser.php b/src/Parser/DefaultParser.php → source/Parser/DefaultParser.php
diff --git a/src/Parser/Parser.php → source/Parser/Parser.php b/src/Parser/Parser.php → source/Parser/Parser.php
diff --git a/src/Parser/PhpParser.php → source/Parser/PhpParser.php b/src/Parser/PhpParser.php → source/Parser/PhpParser.php
diff --git a/src/Parser/PoParser.php → source/Parser/PoParser.php b/src/Parser/PoParser.php → source/Parser/PoParser.php
diff --git a/src/Result.php → source/Result.php b/src/Result.php → source/Result.php
diff --git a/src/ResultFormatter.php → source/ResultFormatter.php b/src/ResultFormatter.php → source/ResultFormatter.php
diff --git a/src/RowHelper.php → source/RowHelper.php b/src/RowHelper.php → source/RowHelper.php
diff --git a/src/SpellChecker.php → source/SpellChecker.php b/src/SpellChecker.php → source/SpellChecker.php
diff --git a/src/SpellCheckerApplication.php → source/SpellCheckerApplication.php b/src/SpellCheckerApplication.php → source/SpellCheckerApplication.php
diff --git a/src/Word.php → source/Word.php b/src/Word.php → source/Word.php
diff --git a/...exceptions/ContextNotDefinedException.php → ...exceptions/ContextNotDefinedException.php b/...exceptions/ContextNotDefinedException.php → ...exceptions/ContextNotDefinedException.php
diff --git a/...ions/FileSearchNotConfiguredException.php → ...ions/FileSearchNotConfiguredException.php b/...ions/FileSearchNotConfiguredException.php → ...ions/FileSearchNotConfiguredException.php