wip

timgavin · Sep 8, 2020 · e67ebba · e67ebba
1 parent 007c210
commit e67ebba
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 61 deletions.
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -0,0 +1,29 @@
+name: Check & fix styling
+
+on: [push]
+
+jobs:
+    style:
+        runs-on: ubuntu-latest
+
+        steps:
+            -   name: Checkout code
+                uses: actions/checkout@v1
+
+            -   name: Fix style
+                uses: docker://oskarstark/php-cs-fixer-ga
+                with:
+                    args: --config=.php_cs --allow-risky=yes
+
+            -   name: Extract branch name
+                shell: bash
+                run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+                id: extract_branch
+
+            -   name: Commit changes
+                uses: stefanzweifel/[email protected]
+                with:
+                    commit_message: Fix styling
+                    branch: ${{ steps.extract_branch.outputs.branch }}
+                env:
+                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -13,9 +13,11 @@ jobs:
             fail-fast: false
             matrix:
                 php: [7.4]
-                laravel: [7.*, 6.*]
+                laravel: [8.*, 7.*, 6.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 include:
+                    - laravel: 8.*
+                      testbench: 6.*
                     - laravel: 7.*
                       testbench: 5.*
                     - laravel: 6.*

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
diff --git a/.styleci.yml b/.styleci.yml
diff --git a/composer.json b/composer.json
@@ -25,11 +25,11 @@
         "php": "^7.4",
         "ext-fileinfo": "*",
         "ext-json": "*",
-        "illuminate/bus": "^6.18|^7.0",
-        "illuminate/console": "^6.18|^7.0",
-        "illuminate/database": "^6.18|^7.0",
-        "illuminate/pipeline": "^6.18|^7.0",
-        "illuminate/support": "^6.18|^7.0",
+        "illuminate/bus": "^6.18|^7.0|^8.0",
+        "illuminate/console": "^6.18|^7.0|^8.0",
+        "illuminate/database": "^6.18|^7.0|^8.0",
+        "illuminate/pipeline": "^6.18|^7.0|^8.0",
+        "illuminate/support": "^6.18|^7.0|^8.0",
         "league/flysystem": "^1.0.64",
         "maennchen/zipstream-php": "^1.0|^2.0",
         "spatie/image": "^1.4.0",
@@ -44,7 +44,7 @@
         "guzzlehttp/guzzle": "^6.3",
         "league/flysystem-aws-s3-v3": "^1.0.23",
         "mockery/mockery": "^1.3",
-        "orchestra/testbench": "^4.0|^5.0",
+        "orchestra/testbench": "^4.0|^5.0|^6.0",
         "php-ffmpeg/php-ffmpeg": "^0.16.0",
         "phpunit/phpunit": "^9.1",
         "spatie/pdf-to-image": "^2.0",
@@ -63,6 +63,10 @@
             "Spatie\\MediaLibrary\\": "src"
         }
     },
+    "scripts": {
+        "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes",
+        "test": "vendor/bin/phpunit"
+    },
     "autoload-dev": {
         "psr-4": {
             "Spatie\\MediaLibrary\\Tests\\": "tests"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,22 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Spatie Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Spatie Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/phpunit.xml.dist.bak b/phpunit.xml.dist.bak
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="vendor/autoload.php"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         verbose="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false">
+    <testsuites>
+        <testsuite name="Spatie Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src/</directory>
+        </whitelist>
+    </filter>
+</phpunit>