Skip to content

Commit 8071c87

Browse files
authored
Support for Laravel 9 (#6)
1 parent 07aeff2 commit 8071c87

File tree

5 files changed

+52
-68
lines changed

5 files changed

+52
-68
lines changed

.github/workflows/run-tests.yml

+43-38
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,46 @@ name: run-tests
33
on: [push, pull_request]
44

55
jobs:
6-
test:
7-
runs-on: ubuntu-latest
8-
strategy:
9-
fail-fast: true
10-
matrix:
11-
php: [8.1, 8.0, 7.4]
12-
laravel: [8.*]
13-
dependency-version: [prefer-lowest, prefer-stable]
14-
include:
15-
- laravel: 8.*
16-
testbench: 6.*
17-
18-
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
19-
20-
steps:
21-
- name: Checkout code
22-
uses: actions/checkout@v2
23-
24-
- name: Setup PHP
25-
uses: shivammathur/setup-php@v2
26-
with:
27-
php-version: ${{ matrix.php }}
28-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, mysql, mysqli, pdo_mysql
29-
coverage: none
30-
31-
- name: Install Ghostscript
32-
run: |
33-
sudo apt-get update
34-
sudo apt-get install -y ghostscript
35-
which ghostscript
36-
37-
- name: Install dependencies
38-
run: |
39-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
40-
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
41-
42-
- name: Execute tests
43-
run: vendor/bin/phpunit
6+
test:
7+
runs-on: ubuntu-latest
8+
strategy:
9+
fail-fast: true
10+
matrix:
11+
php: [8.1, 8.0, 7.4]
12+
laravel: [9.*, 8.*]
13+
dependency-version: [prefer-lowest, prefer-stable]
14+
exclude:
15+
- laravel: 9.*
16+
php: 7.4
17+
include:
18+
- laravel: 9.*
19+
testbench: 7.*
20+
- laravel: 8.*
21+
testbench: 6.*
22+
23+
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
24+
25+
steps:
26+
- name: Checkout code
27+
uses: actions/checkout@v2
28+
29+
- name: Setup PHP
30+
uses: shivammathur/setup-php@v2
31+
with:
32+
php-version: ${{ matrix.php }}
33+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, mysql, mysqli, pdo_mysql
34+
coverage: none
35+
36+
- name: Install Ghostscript
37+
run: |
38+
sudo apt-get update
39+
sudo apt-get install -y ghostscript
40+
which ghostscript
41+
42+
- name: Install dependencies
43+
run: |
44+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
45+
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
46+
47+
- name: Execute tests
48+
run: vendor/bin/phpunit

.scrutinizer.yml

-25
This file was deleted.

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
All notable changes to `laravel-mixins` will be documented in this file.
44

5+
## 3.2.0 - 2022-02-04
6+
7+
- Added supprt for Laravel 9
8+
59
## 3.1.0 - 2021-12-19
610

711
- Added supprt for PHP 8.1

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ We proudly support the community by developing Laravel packages and giving them
1616

1717
## Installation
1818

19-
Only the master branch and version 3.0 of this package are compatible with Laravel 8.0. If you're still using an older version of Laravel (or PHP < 7.4), please use the 2.x branch. Mind that older versions are no longer supported.
19+
Only the master branch and version 3.0 of this package are compatible with Laravel 8.0 ad 9.0. If you're still using an older version of Laravel (or PHP < 7.4), please use the 2.x branch. Mind that older versions are no longer supported.
2020

2121
You can install the package via composer:
2222

composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
],
1818
"require": {
1919
"php": "^7.4 || ^8.0 || ^8.1",
20-
"illuminate/support": "^8.67"
20+
"illuminate/support": "^8.67 || ^9.0"
2121
},
2222
"require-dev": {
2323
"html2text/html2text": "^4.3",
2424
"jeremykendall/php-domain-parser": "^6.0",
2525
"laravel/ui": "^2.0 || ^3.0",
2626
"mockery/mockery": "^1.3.3",
2727
"moneyphp/money": "^3.3",
28-
"orchestra/testbench": "^6.23",
28+
"orchestra/testbench": "^6.23 || ^7.0",
2929
"phpunit/phpunit": "^9.4",
30-
"spatie/laravel-sitemap": "^5.7",
31-
"symfony/process": "^5.1"
30+
"spatie/laravel-sitemap": "^5.7 || ^6.0",
31+
"symfony/process": "^5.1 || ^6.0"
3232
},
3333
"suggest": {
3434
"html2text/html2text": "To convert HTML to formatted plain text",

0 commit comments

Comments
 (0)