Skip to content

Commit 7d84028

Browse files
author
Robert Allport
authored
Drop legacy support, Support Laravel 11 (#7)
* Drop legacy support, Support Laravel 11
1 parent 683dba1 commit 7d84028

File tree

5 files changed

+52
-107
lines changed

5 files changed

+52
-107
lines changed

‎.github/workflows/run-tests-laravel-8.yml‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎.github/workflows/run-tests-laravel-7.yml‎ renamed to ‎.github/workflows/run-tests.yml‎

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: run-tests-laravel-7
1+
name: "Run Tests - Current"
22

33
on: [push, pull_request]
44

@@ -9,33 +9,39 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
php: [8.0, 7.4, 7.2]
13-
laravel: [7.*, 6.*, 5.8.*]
12+
php: [8.3, 8.2, 8.1, 8.0]
13+
laravel: ["^11.0", "^10.0", "^9.0", "^8.12"]
1414
dependency-version: [prefer-lowest, prefer-stable]
1515
include:
16-
- laravel: 7.*
17-
testbench: 5.*
18-
- laravel: 6.*
19-
testbench: 4.*
20-
- laravel: 5.8.*
21-
testbench: 3.8.*
16+
- laravel: ^11.0
17+
testbench: 9.*
18+
- laravel: ^10.0
19+
testbench: 8.*
20+
- laravel: ^9.0
21+
testbench: 7.*
22+
- laravel: ^8.12
23+
testbench: ^6.23
2224
exclude:
23-
- laravel: 5.8.*
24-
php: 8.0
25-
- laravel: 5.8.*
26-
php: 7.4
25+
- laravel: ^10.0
26+
php: 8.0
27+
- laravel: ^8.12
28+
php: 8.3
29+
- laravel: ^11.0
30+
php: 8.1
31+
- laravel: ^11.0
32+
php: 8.0
2733

2834
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
2935

3036
steps:
3137
- name: Checkout code
32-
uses: actions/checkout@v2
38+
uses: actions/checkout@v4
3339

3440
- name: Cache dependencies
35-
uses: actions/cache@v2
41+
uses: actions/cache@v4
3642
with:
3743
path: ~/.composer/cache/files
38-
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
44+
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
3945

4046
- name: Setup PHP
4147
uses: shivammathur/setup-php@v2
@@ -48,5 +54,9 @@ jobs:
4854
run: |
4955
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "symfony/console:>=4.3.4" "mockery/mockery:^1.3.2" --no-interaction --no-update
5056
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
57+
58+
- name: Display PHP version
59+
run: php -v | grep ^PHP | cut -d' ' -f2
60+
5161
- name: Execute tests
52-
run: vendor/bin/phpunit --color=always tests
62+
run: vendor/bin/phpunit

‎README.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ Some super useful redirect response macros to simplify your Laravel application.
1212

1313
## Requirements
1414

15-
Laravel `>=5.8 | 6.x | 7.x | 8.x | 9.x | 10.x` supported
15+
- PHP `^8.0`
16+
- Laravel `^8.12`, `^9.0`, `^10.0` or `^11.0`
17+
18+
### Legacy Support
19+
20+
For legacy PHP / Laravel support, use package version [`1.1.6`](https://github.com/f9webltd/laravel-redirect-response-macros/tree/1.1.6)
1621

1722
## Installation
1823

‎composer.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
"role": "Developer"
1818
}
1919
],
20-
"require": {
21-
"php": "^7.2|^8.0",
22-
"laravel/framework": "5.8.* || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0"
20+
"require": {
21+
"php": "^8.0",
22+
"illuminate/support": "^8.12|^9.0|^10.0|^11.0"
2323
},
2424
"require-dev": {
25-
"orchestra/testbench": ">=3.8",
26-
"phpunit/phpunit": "^7.0|^8.0|^9.3"
25+
"orchestra/testbench": "^6.23|^7.0|^8.0|^9.0",
26+
"phpunit/phpunit": "^9.4|^10.1"
2727
},
2828
"autoload": {
2929
"psr-4": {

‎phpunit.xml.dist‎

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit bootstrap="vendor/autoload.php"
3-
backupGlobals="false"
4-
backupStaticAttributes="false"
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
bootstrap="vendor/autoload.php"
54
colors="true"
6-
verbose="true"
7-
convertErrorsToExceptions="true"
8-
convertNoticesToExceptions="true"
9-
convertWarningsToExceptions="true"
10-
processIsolation="false"
11-
stopOnFailure="false">
12-
<testsuites>
13-
<testsuite name="Test Suite">
14-
<directory>tests</directory>
15-
</testsuite>
16-
</testsuites>
17-
<filter>
18-
<whitelist>
19-
<directory suffix=".php">src/</directory>
20-
</whitelist>
21-
</filter>
22-
<logging>
23-
<log type="tap" target="build/report.tap"/>
24-
<log type="junit" target="build/report.junit.xml"/>
25-
<log type="coverage-html" target="build/coverage"/>
26-
<log type="coverage-text" target="build/coverage.txt"/>
27-
<log type="coverage-clover" target="build/logs/clover.xml"/>
28-
</logging>
29-
<php>
30-
<server name="APP_NAME" value="Laravel Redirect Response Macros"/>
31-
</php>
5+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd"
6+
>
7+
<source>
8+
<include>
9+
<directory suffix=".php">src/</directory>
10+
</include>
11+
</source>
12+
<testsuites>
13+
<testsuite name="Test Suite">
14+
<directory>tests</directory>
15+
</testsuite>
16+
</testsuites>
3217
</phpunit>
33-

0 commit comments

Comments
 (0)