Update for Laravel 9. (#27)

ptondereau · Feb 17, 2022 · 7841eea · 7841eea
1 parent c690c7f
commit 7841eea
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,15 +7,25 @@ on:
 jobs:
   tests:
     name: PHP ${{ matrix.php }}; Laravel ${{ matrix.laravel }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     strategy:
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0']
-        laravel: ['6', '7', '8']
+        php: [ '7.2', '7.3', '7.4', '8.0', '8.1' ]
+        laravel: [ '6', '7', '8', '9' ]
         exclude:
           - php: '7.2'
             laravel: '8'
+          - php: '7.2'
+            laravel: '9'
+          - php: '7.3'
+            laravel: '9'
+          - php: '7.4'
+            laravel: '9'
+          - php: '8.1'
+            laravel: '6'
+          - php: '8.1'
+            laravel: '7'
 
     steps:
       - name: Checkout Code
@@ -55,21 +65,20 @@ jobs:
           command: composer require "laravel/framework:8.*" --no-update --no-interaction
         if: "matrix.laravel == '8'"
 
-      - name: Install PHP 7 Dependencies
+      - name: Select Laravel 9
         uses: nick-invision/retry@v1
         with:
           timeout_minutes: 5
           max_attempts: 5
-          command: composer update --no-interaction --no-progress
-        if: "matrix.php < 8"
+          command: composer require "laravel/framework:9.*" --no-update --no-interaction
+        if: "matrix.laravel == '9'"
 
-      - name: Install PHP 8 Dependencies
+      - name: Install PHP Dependencies
         uses: nick-invision/retry@v1
         with:
           timeout_minutes: 5
           max_attempts: 5
-          command: composer update --no-interaction --no-progress --ignore-platform-req=php
-        if: "matrix.php >= 8"
+          command: composer update --no-interaction --no-progress
 
       - name: Execute PHPUnit
         run: vendor/bin/phpunit
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Laravel UPS Api
 =================
 
-## For Laravel 6, 7 and 8
+## For Laravel 6, 7, 8 and 9
 
 <p align="center">
 <a href="https://github.com/ptondereau/Laravel-UPS-Api/actions?query=workflow%3ATests"><img src="https://img.shields.io/github/workflow/status/ptondereau/Laravel-UPS-Api/Tests?label=Tests&style=flat-square" alt="Build Status"/></a>

diff --git a/composer.json b/composer.json
@@ -4,13 +4,13 @@
   "keywords": ["laravel", "framework", "UPS", "Laravel UPS Api", "Laravel-Ups-Api", "Pierre Tondereau", "Ptondereau"],
   "require": {
     "php": "^7.2.5 || ^8.0",
-    "illuminate/contracts": "^6.0 || ^7.0 || ^8.0",
-    "illuminate/support": "^6.0 || ^7.0 || ^8.0",
+    "illuminate/contracts": "^6.0 || ^7.0 || ^8.0 || ^9.0",
+    "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0",
     "gabrielbull/ups-api": "^1.2.2 || ^2.0"
   },
   "require-dev": {
     "graham-campbell/analyzer": "^3.0",
-    "graham-campbell/testbench": "^5.4",
+    "graham-campbell/testbench": "^5.7",
     "phpunit/phpunit": "^8.5.8 || ^9.3.7"
   },
   "autoload": {