Skip to content

Commit 1279f8c

Browse files
mechelonmechelon
authored
Merge pull request #55 from laravel-shift/l12-compatibility
Laravel 12.x Compatibility
2 parents 34e8d9c + 5c02e29 commit 1279f8c

File tree

4 files changed

+72
-43
lines changed

4 files changed

+72
-43
lines changed

‎.github/workflows/test.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ on:
77
jobs:
88
tests:
99
runs-on: ${{ matrix.os }}
10+
1011
strategy:
1112
fail-fast: true
1213
matrix:
1314
os: [ubuntu-latest]
14-
php: ['8.0', 8.1, 8.2, 8.3]
15-
laravel: [9.*, 10.*, 11.*]
15+
php: [8.2, 8.3, 8.4]
16+
laravel: ['10.*', '11.*', '12.*']
1617
dependency-version: [prefer-lowest, prefer-stable]
1718
exclude:
1819
- laravel: 9.*
@@ -27,6 +28,10 @@ jobs:
2728
php: '8.0'
2829
- laravel: 11.*
2930
php: 8.1
31+
- laravel: 12.*
32+
php: '8.0'
33+
- laravel: 12.*
34+
php: 8.1
3035

3136
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
3237

@@ -46,5 +51,6 @@ jobs:
4651
run: |
4752
composer require "illuminate/console:${{ matrix.laravel }}" "illuminate/mail:${{ matrix.laravel }}" "illuminate/view:${{ matrix.laravel }}" --no-interaction --no-update
4853
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-progress
54+
4955
- name: Execute tests
5056
run: vendor/bin/pest

‎composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
],
1717
"homepage": "https://github.com/beyondcode/helo-laravel",
1818
"require": {
19-
"php": "^8.0 || ^8.1 || ^8.2",
20-
"illuminate/console": "^8.0 || ^9.0 || ^10.0 || ^11.0",
21-
"illuminate/mail": "^8.0 || ^9.0 || ^10.0 || ^11.0",
22-
"illuminate/view": "^8.0 || ^9.0 || ^10.0 || ^11.0"
19+
"php": "^8.2",
20+
"illuminate/console": "^10.0 || ^11.0 || ^12.0",
21+
"illuminate/mail": "^10.0 || ^11.0 || ^12.0",
22+
"illuminate/view": "^10.0 || ^11.0 || ^12.0"
2323
},
2424
"require-dev": {
25-
"orchestra/testbench": "^7.0 || ^8.0 || ^9.0",
26-
"pestphp/pest": "1.x-dev || 2.x-dev"
25+
"orchestra/testbench": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
26+
"pestphp/pest": "1.x-dev || 2.x-dev || ^3.7"
2727
},
2828
"minimum-stability": "dev",
2929
"autoload": {

‎phpunit.xml.dist

Lines changed: 21 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
4-
bootstrap="vendor/autoload.php"
5-
cacheDirectory=".phpunit.cache"
6-
executionOrder="depends,defects"
7-
beStrictAboutCoverageMetadata="true"
8-
beStrictAboutOutputDuringTests="true"
9-
colors="true"
10-
backupGlobals="false"
11-
backupStaticProperties="false"
12-
stopOnError="false"
13-
stopOnFailure="false">
14-
<testsuites>
15-
<testsuite name="BeyondCode Test Suite">
16-
<directory>tests</directory>
17-
</testsuite>
18-
</testsuites>
19-
20-
<source restrictDeprecations="true" restrictNotices="true" restrictWarnings="true">
21-
<include>
22-
<directory>src</directory>
23-
</include>
24-
</source>
25-
26-
<logging>
27-
<junit outputFile="build/report.junit.xml"/>
28-
</logging>
29-
30-
<coverage>
31-
<report>
32-
<html outputDirectory="build/html-coverage" />
33-
<text outputFile="build/coverage.txt" />
34-
<clover outputFile="build/clover.xml" />
35-
</report>
36-
</coverage>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd" bootstrap="vendor/autoload.php" cacheDirectory=".phpunit.cache" executionOrder="depends,defects" beStrictAboutCoverageMetadata="true" beStrictAboutOutputDuringTests="true" colors="true" backupGlobals="false" backupStaticProperties="false" stopOnError="false" stopOnFailure="false">
3+
<testsuites>
4+
<testsuite name="BeyondCode Test Suite">
5+
<directory>tests</directory>
6+
</testsuite>
7+
</testsuites>
8+
<source restrictNotices="true" restrictWarnings="true" ignoreIndirectDeprecations="true">
9+
<include>
10+
<directory>src</directory>
11+
</include>
12+
</source>
13+
<logging>
14+
<junit outputFile="build/report.junit.xml"/>
15+
</logging>
16+
<coverage>
17+
<report>
18+
<html outputDirectory="build/html-coverage"/>
19+
<text outputFile="build/coverage.txt"/>
20+
<clover outputFile="build/clover.xml"/>
21+
</report>
22+
</coverage>
3723
</phpunit>

‎phpunit.xml.dist.bak

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
4+
bootstrap="vendor/autoload.php"
5+
cacheDirectory=".phpunit.cache"
6+
executionOrder="depends,defects"
7+
beStrictAboutCoverageMetadata="true"
8+
beStrictAboutOutputDuringTests="true"
9+
colors="true"
10+
backupGlobals="false"
11+
backupStaticProperties="false"
12+
stopOnError="false"
13+
stopOnFailure="false">
14+
<testsuites>
15+
<testsuite name="BeyondCode Test Suite">
16+
<directory>tests</directory>
17+
</testsuite>
18+
</testsuites>
19+
20+
<source restrictDeprecations="true" restrictNotices="true" restrictWarnings="true">
21+
<include>
22+
<directory>src</directory>
23+
</include>
24+
</source>
25+
26+
<logging>
27+
<junit outputFile="build/report.junit.xml"/>
28+
</logging>
29+
30+
<coverage>
31+
<report>
32+
<html outputDirectory="build/html-coverage" />
33+
<text outputFile="build/coverage.txt" />
34+
<clover outputFile="build/clover.xml" />
35+
</report>
36+
</coverage>
37+
</phpunit>

0 commit comments

Comments
 (0)