upgrade to laravel 11

awssat · Jul 6, 2024 · a189132 · a189132
1 parent 9670d76
commit a189132
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 32 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -9,31 +9,20 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [8.0, 8.1]
-                laravel: [8.*, 9.*, 10.*]
+                php: [8.1, 8.2, 8.3]
+                laravel: [9.*, 10.*, 11.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 include:
+                    - laravel: 11.*
+                      testbench: 9.*
                     - laravel: 10.*
                       testbench: 8.*
                     - laravel: 9.*
                       testbench: 7.*
-                    - laravel: 8.*
-                      testbench: 6.*
                 exclude:
-                   # excludes laravel 10 on php7.4, php 8.0
-                    - php: 7.4
-                      laravel: 10.*
-                    - php: 8.0
-                      laravel: 10.*
-                    # excludes laravel 9 on php7.4
-                    - php: 7.4
-                      laravel: 9.*
-                    # excludes laravel 7 on php8
-                    - php: 8.0
-                      laravel: 7.*
-                    # excludes laravel 7+8 on php8.1
+                   # excludes laravel 11 on php 8.1
                     - php: 8.1
-                      laravel: 7.*
+                      laravel: 11.*
                     - php: 8.1
                       laravel: 8.*
 
@@ -46,8 +35,7 @@ jobs:
             - name: Install SQLite 3
               run: |
                   sudo apt-get update
-                  sudo apt-get install sqlite3
-                  sudo apt-get install redis
+                  sudo apt-get install sqlite3 redis
             - name: Cache dependencies
               uses: actions/cache@v2
               with:

diff --git a/composer.json b/composer.json
@@ -25,18 +25,19 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
+        "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0",
         "jaybizzle/crawler-detect": "^1.2",
         "spatie/laravel-referer": "^1.6",
-        "torann/geoip": "^1.0|^3.0"
+        "torann/geoip": "^1.0|^3.0",
+        "nesbot/carbon": "^2.0"
     },
     "require-dev": {
         "doctrine/dbal": "^2.6|^3.0",
-        "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
-        "mockery/mockery": "^1.4 || ^2.0",
-        "orchestra/testbench": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
-        "phpunit/phpunit": "^9.0",
-        "predis/predis": "^1.1|^2.1"
+        "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0",
+        "mockery/mockery": "^1.4 || ^1.6",
+        "orchestra/testbench": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "phpunit/phpunit": "^9.0 || ^10.1",
+        "predis/predis": "^1.1|^2.0"
     },
     "suggest": {
         "predis/predis": "Needed if you are using redis as data engine of laravel-visits",

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="./vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">./src</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="./vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <testsuites>
     <testsuite name="Unit">
       <directory>./tests/Unit</directory>
@@ -13,4 +8,9 @@
       <directory>./tests/Feature</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>