update configuration

alcohol · Dec 27, 2023 · 96c7b62 · 96c7b62
1 parent 5e4abe3
commit 96c7b62
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,7 @@
-/build/
-/cache/
-/vendor/
+/.*.cache/
 /tools/*/vendor/
-/.php_cs
+/vendor/
 /.php-cs-fixer.cache
 /composer.lock
+/coverage.xml
 /phpunit.xml
-/.phpunit.result.cache
-/resultCache.php
diff --git a/composer.json b/composer.json
@@ -26,9 +26,10 @@
         "psr-4": { "League\\ISO3166\\": "tests" }
     },
     "scripts": {
-        "cs-review": "php-cs-fixer fix --verbose --diff --dry-run",
-        "cs-fix": "php-cs-fixer fix --verbose",
-        "test": "phpunit"
+        "test": "vendor/bin/phpunit",
+        "phpstan": "tools/phpstan/vendor/bin/phpstan",
+        "php-cs-fixer": "tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run --diff",
+        "php-cs-fixer-fix": "tools/php-cs-fixer/vendor/bin/php-cs-fixer fix"
     },
     "extra": {
         "branch-alias": {

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -6,7 +6,7 @@ includes:
 
 parameters:
   level: 9
-  tmpDir: .
+  tmpDir: .phpstan.cache
   checkGenericClassInNonGenericObjectType: true
   paths:
     - src

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
-    backupGlobals="false"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.5/phpunit.xsd"
     bootstrap="vendor/autoload.php"
+    cacheResultFile=".phpunit.cache/test-results"
     colors="true"
     stderr="true"
 >
@@ -12,15 +14,22 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <coverage cacheDirectory=".phpunit.cache/code-coverage"
+              processUncoveredFiles="true">
         <include>
             <directory>src</directory>
         </include>
+        <exclude>
+            <directory>tests</directory>
+        </exclude>
         <report>
-            <clover outputFile="build/coverage.xml"/>
-            <html outputDirectory="build/coverage"/>
+            <clover outputFile="coverage.xml"/>
             <text outputFile="php://stderr"/>
         </report>
     </coverage>
 
+    <logging>
+        <text outputFile="php://stderr"/>
+    </logging>
+
 </phpunit>