Merge pull request #26 from laravel-shift/l11-compatibility

Laravel 11.x Compatibility
victorybiz · Apr 1, 2024 · 783182b · 783182b
2 parents 2f1dd56 24edbbe
commit 783182b
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 43 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,45 1,57 @@
 name: run-tests
 
 on:
- push:
- branches: [master]
- pull_request:
- branches: [master]
  push:
  branches:
  - master
  pull_request:
  branches:
  - master
 
 jobs:
- test:
- runs-on: ${{ matrix.os }}
- strategy:
- fail-fast: true
- matrix:
- os: [ubuntu-latest, windows-latest]
- php: [7.4, 8.0]
- laravel: [8.*]
- stability: [prefer-lowest, prefer-stable]
- include:
- - laravel: 8.*
- testbench: ^6.6
-
- name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
-
- steps:
- - name: Checkout code
- uses: actions/checkout@v2
-
- - name: Setup PHP
- uses: shivammathur/setup-php@v2
- with:
- php-version: ${{ matrix.php }}
- extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
- coverage: none
-
- - name: Setup problem matchers
- run: |
- echo "::add-matcher::${{ runner.tool_cache }}/php.json"
- echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
- - name: Install dependencies
- run: |
- composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
- composer update --${{ matrix.stability }} --prefer-dist --no-interaction
- - name: Execute tests
- run: vendor/bin/phpunit
  test:
  runs-on: ${{ matrix.os }}
 
  strategy:
  fail-fast: true
  matrix:
  os: [ubuntu-latest, windows-latest]
  php: [7.4, 8.0, '8.2']
  laravel: ['8.*', '11.*']
  stability: [prefer-lowest, prefer-stable]
  include:
  - laravel: 8.*
  testbench: ^6.6
  - laravel: 11.*
  testbench: ^9.0
  exclude:
  - laravel: 11.*
  php: 7.4
  - laravel: 11.*
  php: 8.0
 
  name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
  steps:
  - name: Checkout code
  uses: actions/checkout@v2
 
  - name: Setup PHP
  uses: shivammathur/setup-php@v2
  with:
  php-version: ${{ matrix.php }}
  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
  coverage: none
 
  - name: Setup problem matchers
  run: |
  echo "::add-matcher::${{ runner.tool_cache }}/php.json"
  echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
  - name: Install dependencies
  run: |
  composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
  composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
  - name: Execute tests
  run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -27,10 27,10 @@
  ],
  "require": {
  "php": "^7.4|^8.0",
- "illuminate/support": "^8.0|^9.0|^10.0"
  "illuminate/support": "^8.0|^9.0|^10.0|^11.0"
  },
  "require-dev": {
- "orchestra/testbench": "^6.0|^7.0",
  "orchestra/testbench": "^6.0|^7.0|^9.0",
  "phpunit/phpunit": "^9.0|^10.0"
  },
  "autoload": {
@@ -46,7 46,6 @@
  "scripts": {
  "test": "vendor/bin/phpunit",
  "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
-
  },
  "config": {
  "sort-packages": true