Skip to content

Commit

Permalink
Merge pull request #8 from laravel-shift/l11-compatibility
Browse files Browse the repository at this point in the history
Laravel 11.x Compatibility
  • Loading branch information
yoelpc4 authored Jul 18, 2024
2 parents 388a116 + 3743f91 commit 39b69c9
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 9 deletions.
19 changes: 15 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,49 @@
name: Tests

on: [ push, pull_request ]
on:
- push
- pull_request

jobs:
tests:

runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
php: [ 8.2, 8.1 ]
laravel: [ 10.* ]
php: [8.2, 8.1]
laravel: ['10.*', '11.*']
include:
- laravel: 10.*
testbench: 8.*
phpunit: 10.*
- laravel: 11.*
testbench: 9.*
phpunit: '8.2'
exclude:
- laravel: 11.*
php: 8.1

name: PHP v${{ matrix.php }} - Laravel v${{ matrix.laravel }}

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv, gd
coverage: pcov

- name: Install dependencies
run: |
composer validate
composer self-update
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "phpunit/phpunit:${{ matrix.phpunit }}" --no-interaction --no-update
composer install --prefer-dist --no-interaction --no-suggest

- name: Execute tests
run: vendor/bin/phpunit
env:
Expand All @@ -48,6 +58,7 @@ jobs:
CLOUDINARY_SECURE: ${{ secrets.CLOUDINARY_SECURE }}
FILESYSTEM_CLOUD: ${{ secrets.FILESYSTEM_CLOUD }}
FILESYSTEM_DISK: ${{ secrets.FILESYSTEM_DISK }}

- name: Upload coverage
uses: codecov/codecov-action@v2
with:
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
"require": {
"php": ">=8.1",
"cloudinary/cloudinary_php": "^2.9.0",
"illuminate/contracts": "10.*",
"illuminate/filesystem": "10.*",
"illuminate/http": "10.*",
"illuminate/support": "10.*",
"illuminate/contracts": "10.*|^11.0",
"illuminate/filesystem": "10.*|^11.0",
"illuminate/http": "10.*|^11.0",
"illuminate/support": "10.*|^11.0",
"league/flysystem": "^3.8.0"
},
"require-dev": {
"orchestra/testbench": "8.*",
"orchestra/testbench": "8.*|^9.0",
"phpunit/phpunit": "10.*"
},
"autoload": {
Expand Down

0 comments on commit 39b69c9

Please sign in to comment.