Merge pull request #16 from maloun96/laravel10

feat: laravel10
BinarCode · Feb 17, 2023 · 3584634 · 3584634
2 parents 9bc858e + 6b0a7c5
commit 3584634
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 35 deletions.
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
           coverage: none
 
       - name: Install composer dependencies

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -9,12 +9,12 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.0]
-        laravel: [9.*]
+        php: [8.1]
+        laravel: [^10.0]
         stability: [prefer-stable]
         include:
-          - laravel: 9.*
-            testbench: 7.*
+          - laravel: ^10.0
+            testbench: ^8.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

diff --git a/composer.json b/composer.json
@@ -16,18 +16,18 @@
         }
     ],
     "require": {
-        "php": "^8.0",
-        "illuminate/support": "^9.0",
+        "php": "^8.0|^8.1",
+        "illuminate/support": "^9.0|^10.0",
         "laravel/slack-notification-channel": "^2.4",
         "ext-json": "*"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.2",
-        "laravel/sanctum": "^2.8",
-        "orchestra/testbench": "^7.0",
-        "phpunit/phpunit": "^9.3",
+        "laravel/sanctum": "^3.2",
+        "orchestra/testbench": "^8.0",
+        "phpunit/phpunit": "^10.0",
         "symfony/stopwatch": "^4.4|^5.0",
-        "nunomaduro/larastan": "^2.0",
+        "nunomaduro/larastan": "^2.4",
         "phpstan/extension-installer": "^1.1"
     },
     "autoload": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,31 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
+<phpunit bootstrap="vendor/autoload.php"
+         backupGlobals="false"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         verbose="true"
->
+         stopOnFailure="false">
     <testsuites>
-        <testsuite name="Binarcode Test Suite">
+        <testsuite name="BinarCode 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"/>
-            <clover outputFile="build/logs/clover.xml"/>
-        </report>
-    </coverage>
-    <logging>
-        <junit outputFile="build/report.junit.xml"/>
-    </logging>
 </phpunit>