Merge pull request #87 from marcreichel/chore/cleanup

🧹 Cleanup
marcreichel · Mar 10, 2024 · f865e0b · f865e0b
2 parents 3b82c97 + e18f36e
commit f865e0b
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 134 deletions.
diff --git a/.github/workflows/code-quality-pr.yml b/.github/workflows/code-quality-pr.yml
diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
@@ -3,9 +3,8 @@ name: PHPStan
 on:
   push:
     branches: [ main ]
-    paths-ignore:
-      - 'LICENSE'
-      - 'README.md'
+  pull_request:
+    branches: [ main ]
 
 jobs:
   phpstan:

diff --git a/.github/workflows/code-style-pr.yml b/.github/workflows/code-style-pr.yml
diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml
@@ -3,9 +3,8 @@ name: Pint
 on:
   push:
     branches: [ main ]
-    paths-ignore:
-      - 'LICENSE'
-      - 'README.md'
+  pull_request:
+    branches: [ main ]
 
 jobs:
   pint:

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -2,11 +2,7 @@ name: Code coverage
 
 on:
   push:
-    branches:
-      - main
-    paths-ignore:
-      - LICENSE
-      - README.md
+    branches: [ main ]
 
 jobs:
   build:

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -2,10 +2,8 @@ name: Deploy docs
 
 on:
   push:
-    branches:
-      - main
-    paths:
-      - docs/**/*
+    branches: [ main ]
+    paths: [ docs/**/* ]
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/tests-pr.yml b/.github/workflows/tests-pr.yml
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -2,11 +2,9 @@ name: Tests
 
 on:
   push:
-    branches:
-      - main
-    paths-ignore:
-      - LICENSE
-      - README.md
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
 
 jobs:
   run-tests:
@@ -17,15 +15,13 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         php: [8.3, 8.2, 8.1]
-        laravel: ['8.*', '9.*', '10.*', '11.*']
+        laravel: ['9.*', '10.*', '11.*']
         stability: [prefer-stable]
         include:
           - laravel: 10.*
             testbench: 8.*
           - laravel: 9.*
             testbench: 7.*
-          - laravel: 8.*
-            testbench: 6.*
           - laravel: 11.*
             testbench: 9.*
         exclude:

diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ vendor/
 build/
 report/
 composer.lock
+.phpunit.cache
 .phpunit.result.cache
 cghooks.lock
 
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "require": {
         "php": "^8.1",
         "ext-json": "*",
-        "illuminate/support": "^8.40.0|^9.0|^10.0|^11.0",
+        "illuminate/support": "^9.0|^10.0|^11.0",
         "guzzlehttp/guzzle": "~6.0|~7.0",
         "nesbot/carbon": "^2.53.1|^3.0"
     },

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,25 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-        bootstrap="vendor/autoload.php"
-        colors="true"
-        executionOrder="random"
-        failOnWarning="true"
-        failOnRisky="true"
-        failOnEmptyTestSuite="true"
-        beStrictAboutOutputDuringTests="true"
-        verbose="true"
->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php"
+         colors="true" executionOrder="random" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true"
+         beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache">
     <testsuites>
         <testsuite name="IGDBLaravel Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
     <coverage>
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
         <report>
             <html outputDirectory="build/coverage"/>
             <text outputFile="build/coverage.txt"/>
@@ -30,6 +19,11 @@
         <junit outputFile="build/report.junit.xml"/>
     </logging>
     <php>
-        <env name="IGDB_WEBHOOK_SECRET" value="secret" />
+        <env name="IGDB_WEBHOOK_SECRET" value="secret"/>
     </php>
+    <source>
+        <include>
+            <directory>./src</directory>
+        </include>
+    </source>
 </phpunit>