Updated dogma-dev and build

spell-checker · Oct 29, 2021 · 88c28e3 · 88c28e3
1 parent f7384b6
commit 88c28e3
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 39 deletions.
diff --git a/build/phpstan.neon b/build/phpstan.neon
@@ -1,4 +1,10 @@
 
 parameters:
+    level: 6
+
+    paths:
+        - ../source
+        - ../tests
+        - ../util
+
     ignoreErrors:
-    universalObjectCratesClasses: []
diff --git a/composer.json b/composer.json
@@ -11,14 +11,14 @@
         }
     ],
     "require": {
-        "php": "^7.2|^8.0",
+        "php": "^7.1|^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.17"
+        "dogma/dogma-dev": "0.1.21"
     },
     "extra": {
         "branch-alias": {
@@ -40,54 +40,62 @@
             "php -r \"@mkdir('temp/cache', 0777, true);\"",
             "rm -rf temp/cache/*"
         ],
-        "check": [
-            "@test",
-            "@stan",
-            "@cs-src",
-            "@cs-tests",
-            "@spell",
-            "@lint"
+        "check:run": [
+            "@tests:run",
+            "@phpstan:run",
+            "@phpcs:src",
+            "@phpcs:tests",
+            "@spell:check",
+            "@lint:run"
         ],
-        "check-all": [
-            "@test-all",
-            "@stan-all",
-            "@lint-all",
-            "@spell",
-            "@cs-src",
-            "@cs-tests"
+        "check:all": [
+            "@tests:all",
+            "@phpstan:all",
+            "@lint:all",
+            "@spell:check",
+            "@phpcs:src",
+            "@phpcs:tests"
         ],
 
-        "test": "sh vendor/bin/tester tests -c tests --colors 1",
-        "test-all": [
+        "tests:run": "php vendor/bin/tester tests -c tests --colors 1",
+        "tests:all": [
+            "php81 vendor/nette/tester/src/tester tests -c tests --colors 1",
             "php80 vendor/nette/tester/src/tester tests -c tests --colors 1",
             "php74 vendor/nette/tester/src/tester tests -c tests --colors 1",
             "php73 vendor/nette/tester/src/tester tests -c tests --colors 1",
-            "php72 vendor/nette/tester/src/tester tests -c tests --colors 1"
+            "php72 vendor/nette/tester/src/tester tests -c tests --colors 1",
+            "php71 vendor/nette/tester/src/tester tests -c tests --colors 1"
         ],
-        "tests-coverage": "sh vendor/bin/tester tests -c tests --colors 1 -p phpdbg --coverage tests/coverage.html --coverage-src source",
+        "tests:coverage": "php vendor/bin/tester tests -c tests --colors 1 -p phpdbg --coverage tests/coverage.html --coverage-src source",
 
-        "stan": "sh vendor/bin/phpstan analyse -c build/phpstan.neon -l 6 source tests",
-        "stan-all": [
-            "php80 vendor/phpstan/phpstan/phpstan analyse -c build/phpstan.neon -l 6 source tests",
-            "php74 vendor/phpstan/phpstan/phpstan analyse -c build/phpstan.neon -l 6 source tests"
+        "phpstan:run": "php vendor/bin/phpstan analyse -c build/phpstan.neon",
+        "phpstan:all": [
+            "php81 vendor/phpstan/phpstan/phpstan analyse -c build/phpstan.neon",
+            "php80 vendor/phpstan/phpstan/phpstan analyse -c build/phpstan.neon",
+            "php74 vendor/phpstan/phpstan/phpstan analyse -c build/phpstan.neon",
+            "php73 vendor/phpstan/phpstan/phpstan analyse -c build/phpstan.neon",
+            "php72 vendor/phpstan/phpstan/phpstan analyse -c build/phpstan.neon",
+            "php71 vendor/phpstan/phpstan/phpstan analyse -c build/phpstan.neon"
         ],
 
-        "cs": [
-            "@cs-src",
-            "@cs-tests"
-        ],
-        "cs-src": "sh vendor/bin/phpcs --standard=vendor/dogma/dogma-dev/src/CodeSniffer/ruleset.xml --extensions=php --encoding=utf-8 --tab-width=4 -sp source",
-        "cs-tests": "sh vendor/bin/phpcs --standard=vendor/dogma/dogma-dev/src/CodeSniffer/ruleset-tests.xml --extensions=php,phpt --encoding=utf-8 --tab-width=4 -sp tests",
-        "cs-fix": "sh vendor/bin/phpcbf --standard=vendor/dogma/dogma-dev/src/CodeSniffer/ruleset-tests.xml --extensions=php,phpt --encoding=utf-8 --tab-width=4 source tests",
-
-        "spell": "php spell-checker.php -c build/spell-checker.neon --checkDictionaryFiles --memoryLimit 1024M --noLogo",
-
-        "lint": "sh vendor/bin/parallel-lint source tests",
-        "lint-all": [
+        "lint:run": "php vendor/bin/parallel-lint source tests",
+        "lint:all": [
+            "php81 vendor/php-parallel-lint/php-parallel-lint/parallel-lint source tests",
             "php80 vendor/php-parallel-lint/php-parallel-lint/parallel-lint source tests",
             "php74 vendor/php-parallel-lint/php-parallel-lint/parallel-lint source tests",
             "php73 vendor/php-parallel-lint/php-parallel-lint/parallel-lint source tests",
-            "php72 vendor/php-parallel-lint/php-parallel-lint/parallel-lint source tests"
-        ]
+            "php72 vendor/php-parallel-lint/php-parallel-lint/parallel-lint source tests",
+            "php71 vendor/php-parallel-lint/php-parallel-lint/parallel-lint source tests"
+        ],
+
+        "phpcs:all": [
+            "@phpcs:src",
+            "@phpcs:tests"
+        ],
+        "phpcs:src": "php vendor/bin/phpcs --standard=vendor/dogma/dogma-dev/src/CodeSniffer/ruleset.xml --extensions=php --encoding=utf-8 --tab-width=4 -sp source util",
+        "phpcs:tests": "php vendor/bin/phpcs --standard=vendor/dogma/dogma-dev/src/CodeSniffer/ruleset-tests.xml --extensions=php,phpt --encoding=utf-8 --tab-width=4 -sp tests",
+        "phpcs:fix": "php vendor/bin/phpcbf --standard=vendor/dogma/dogma-dev/src/CodeSniffer/ruleset-tests.xml --extensions=php,phpt --encoding=utf-8 --tab-width=4 source util tests",
+
+        "spell:check": "php spell-checker.php -c build/spell-checker.neon --checkDictionaryFiles --memoryLimit 1024M --noLogo"
     }
 }