Merge branch 'main' into patch-1

Author: lildude

.github/workflows/ci.yml

@@ -1,14 +1,20 @@
 name: Run Tests
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
 
 jobs:
   run:
     name: PHP ${{ matrix.php }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['7.3', '7.4']
+        php: ['8.1', '8.2', '8.3', '8.4']
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -35,9 +41,9 @@ jobs:
       run: composer update --prefer-dist
 
     - name: Run tests
-      run: vendor/bin/phpunit
-
-    - name: Upload coverage results to Coveralls
-      env:
-        COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: vendor/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v
+      run: |
+        if [ ${{ matrix.php }} == '8.1' ]; then
+          vendor/bin/phpunit --configuration phpunit-8.1.xml
+        else
+          vendor/bin/phpunit
+        fi

composer.json

@@ -21,9 +21,7 @@
         "guzzlehttp/oauth-subscriber": "0.6.*"
     },
     "require-dev": {
-        "phpunit/phpunit": ">9.0",
-        "php-coveralls/php-coveralls": "^2.7",
-        "friendsofphp/php-cs-fixer": "^3.65"
+        "phpunit/phpunit": ">9.0"
     },
     "autoload": {
         "psr-4": { "phpSmug\\": "lib/phpSmug/" }

phpunit-8.1.xml

@@ -0,0 +1,31 @@
+<?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"
+         cacheDirectory=".phpunit.cache"
+         executionOrder="depends,defects"
+         requireCoverageMetadata="false"
+         beStrictAboutCoverageMetadata="false"
+         beStrictAboutOutputDuringTests="true"
+         displayDetailsOnPhpunitDeprecations="true"
+         failOnPhpunitDeprecation="true"
+         failOnRisky="true"
+         failOnWarning="true">
+    <testsuites>
+        <testsuite name="phpSmug Test Suite">
+            <directory>test/phpSmug/</directory>
+        </testsuite>
+    </testsuites>
+
+    <groups>
+        <exclude>
+            <group>functional</group>
+        </exclude>
+    </groups>
+
+    <source restrictNotices="true" restrictWarnings="true">
+        <include>
+            <directory>src</directory>
+        </include>
+    </source>
+</phpunit>