Skip to content

Commit 68d5fc1

Browse files
marcreichelmarcreichel
authored
Merge pull request #85 from laravel-shift/l11-compatibility
Laravel 11.x Compatibility
2 parents f4934fa + 5d3074b commit 68d5fc1

File tree

4 files changed

+120
-84
lines changed

4 files changed

+120
-84
lines changed

‎.github/workflows/codecov.yml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,52 @@ name: Code coverage
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches:
6+
- main
67
paths-ignore:
7-
- 'LICENSE'
8-
- 'README.md'
8+
- LICENSE
9+
- README.md
910

1011
jobs:
1112
build:
1213
runs-on: ${{ matrix.os }}
14+
1315
strategy:
1416
fail-fast: true
1517
matrix:
16-
os: [ ubuntu-latest ]
17-
php: [ 8.2 ]
18-
laravel: [ 10.* ]
19-
stability: [ prefer-lowest ]
18+
os: [ubuntu-latest]
19+
php: [8.2]
20+
laravel: ['10.*', '11.*']
21+
stability: [prefer-lowest]
2022
include:
2123
- laravel: 10.*
2224
testbench: 8.*
25+
- laravel: 11.*
26+
testbench: 9.*
27+
2328
steps:
2429
- uses: actions/checkout@v2
30+
2531
- name: Setup PHP
2632
uses: shivammathur/setup-php@v2
2733
with:
2834
php-version: ${{ matrix.php }}
2935
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
3036
coverage: xdebug
37+
3138
- name: Setup problem matchers
3239
run: |
3340
echo "::add-matcher::${{ runner.tool_cache }}/php.json"
3441
echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
42+
3543
- name: Install dependencies
3644
run: |
3745
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
3846
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
47+
3948
- name: Run tests
4049
run: vendor/bin/phpunit --coverage-clover coverage.xml
50+
4151
- name: Upload
4252
uses: codecov/codecov-action@v1
4353
with:

‎.github/workflows/tests-pr.yml

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,57 @@ name: Tests (PR)
22

33
on:
44
pull_request:
5-
branches: [ main ]
5+
branches:
6+
- main
67
paths-ignore:
7-
- 'LICENSE'
8-
- 'README.md'
8+
- LICENSE
9+
- README.md
910

1011
jobs:
1112
run-tests-pr:
1213
runs-on: ${{ matrix.os }}
14+
1315
strategy:
1416
fail-fast: true
1517
matrix:
16-
os: [ ubuntu-latest ]
17-
php: [ 8.3, 8.2, 8.1 ]
18-
laravel: [ 8.*, 9.*, 10.* ]
19-
stability: [ prefer-stable ]
18+
os: [ubuntu-latest]
19+
php: [8.3, 8.2, 8.1]
20+
laravel: ['8.*', '9.*', '10.*', '11.*']
21+
stability: [prefer-stable]
2022
include:
2123
- laravel: 10.*
2224
testbench: 8.*
2325
- laravel: 9.*
2426
testbench: 7.*
2527
- laravel: 8.*
2628
testbench: 6.*
29+
- laravel: 11.*
30+
testbench: 9.*
31+
exclude:
32+
- laravel: 11.*
33+
php: 8.1
34+
2735
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
36+
2837
steps:
2938
- name: Checkout code
3039
uses: actions/checkout@v2
40+
3141
- name: Setup PHP
3242
uses: shivammathur/setup-php@v2
3343
with:
3444
php-version: ${{ matrix.php }}
3545
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
46+
3647
- name: Setup problem matchers
3748
run: |
3849
echo "::add-matcher::${{ runner.tool_cache }}/php.json"
3950
echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
51+
4052
- name: Install dependencies
4153
run: |
4254
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
4355
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
56+
4457
- name: Execute tests
4558
run: vendor/bin/phpunit

‎.github/workflows/tests.yml

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,57 @@ name: Tests
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches:
6+
- main
67
paths-ignore:
7-
- 'LICENSE'
8-
- 'README.md'
8+
- LICENSE
9+
- README.md
910

1011
jobs:
1112
run-tests:
1213
runs-on: ${{ matrix.os }}
14+
1315
strategy:
1416
fail-fast: true
1517
matrix:
16-
os: [ ubuntu-latest ]
17-
php: [ 8.3, 8.2, 8.1 ]
18-
laravel: [ 10.*, 9.*, 8.* ]
19-
stability: [ prefer-stable ]
18+
os: [ubuntu-latest]
19+
php: [8.3, 8.2, 8.1]
20+
laravel: ['8.*', '9.*', '10.*', '11.*']
21+
stability: [prefer-stable]
2022
include:
2123
- laravel: 10.*
2224
testbench: 8.*
2325
- laravel: 9.*
2426
testbench: 7.*
2527
- laravel: 8.*
2628
testbench: 6.*
29+
- laravel: 11.*
30+
testbench: 9.*
31+
exclude:
32+
- laravel: 11.*
33+
php: 8.1
34+
2735
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
36+
2837
steps:
2938
- name: Checkout code
3039
uses: actions/checkout@v2
40+
3141
- name: Setup PHP
3242
uses: shivammathur/setup-php@v2
3343
with:
3444
php-version: ${{ matrix.php }}
3545
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
46+
3647
- name: Setup problem matchers
3748
run: |
3849
echo "::add-matcher::${{ runner.tool_cache }}/php.json"
3950
echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
51+
4052
- name: Install dependencies
4153
run: |
4254
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
4355
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
56+
4457
- name: Execute tests
4558
run: vendor/bin/phpunit

‎composer.json

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
11
{
2-
"name": "marcreichel/igdb-laravel",
3-
"description": "A Laravel wrapper for version 4 of the IGDB API (Apicalypse) including webhook handling",
4-
"keywords": [
5-
"laravel",
6-
"api-wrapper",
7-
"igdb",
8-
"igdb-api",
9-
"apicalypse",
10-
"wrapper"
11-
],
12-
"type": "library",
13-
"minimum-stability": "dev",
14-
"require": {
15-
"php": "^8.1",
16-
"ext-json": "*",
17-
"illuminate/support": "^8.40.0|^9.0|^10.0",
18-
"guzzlehttp/guzzle": "~6.0|~7.0",
19-
"nesbot/carbon": "^2.53.1"
20-
},
21-
"require-dev": {
22-
"phpunit/phpunit": "^9.5.4 || ^10.0.0",
23-
"orchestra/testbench": "^6.23|^7.0|^8.0",
24-
"nunomaduro/collision": "^5.3|^6.1|^7.0",
25-
"roave/security-advisories": "dev-latest",
26-
"nunomaduro/larastan": "^1.0|^2.0",
27-
"laravel/pint": "^1.13"
28-
},
29-
"license": "MIT",
30-
"authors": [
31-
{
32-
"name": "Marc Reichel",
33-
"email": "[email protected]"
34-
}
35-
],
36-
"scripts": {
37-
"pint": "./vendor/bin/pint --test -v",
38-
"test": "./vendor/bin/testbench package:test",
39-
"stan": "./vendor/bin/phpstan analyse -c phpstan.neon",
40-
"stan-2g": "./vendor/bin/phpstan analyse -c phpstan.neon --memory-limit=2G",
41-
"test:coverage": [
42-
"@putenv XDEBUG_MODE=coverage",
43-
"./vendor/bin/phpunit --coverage-clover=\"build/clover.xml\""
2+
"name": "marcreichel/igdb-laravel",
3+
"description": "A Laravel wrapper for version 4 of the IGDB API (Apicalypse) including webhook handling",
4+
"keywords": [
5+
"laravel",
6+
"api-wrapper",
7+
"igdb",
8+
"igdb-api",
9+
"apicalypse",
10+
"wrapper"
4411
],
45-
"test:coverage-html": [
46-
"@putenv XDEBUG_MODE=coverage",
47-
"./vendor/bin/phpunit --color=always --coverage-html=\"report\""
48-
]
49-
},
50-
"autoload": {
51-
"psr-4": {
52-
"MarcReichel\\IGDBLaravel\\": "src"
53-
}
54-
},
55-
"autoload-dev": {
56-
"psr-4": {
57-
"MarcReichel\\IGDBLaravel\\Tests\\": "tests"
58-
}
59-
},
60-
"extra": {
61-
"laravel": {
62-
"providers": [
63-
"MarcReichel\\IGDBLaravel\\IGDBLaravelServiceProvider"
64-
]
12+
"type": "library",
13+
"minimum-stability": "dev",
14+
"require": {
15+
"php": "^8.1",
16+
"ext-json": "*",
17+
"illuminate/support": "^8.40.0|^9.0|^10.0|^11.0",
18+
"guzzlehttp/guzzle": "~6.0|~7.0",
19+
"nesbot/carbon": "^2.53.1|^3.0"
20+
},
21+
"require-dev": {
22+
"phpunit/phpunit": "^9.5.4 || ^10.0.0",
23+
"orchestra/testbench": "^6.23|^7.0|^8.0|^9.0",
24+
"nunomaduro/collision": "^5.3|^6.1|^7.0|^8.0",
25+
"roave/security-advisories": "dev-latest",
26+
"nunomaduro/larastan": "^1.0|^2.0",
27+
"laravel/pint": "^1.13"
28+
},
29+
"license": "MIT",
30+
"authors": [
31+
{
32+
"name": "Marc Reichel",
33+
"email": "[email protected]"
34+
}
35+
],
36+
"scripts": {
37+
"pint": "./vendor/bin/pint --test -v",
38+
"test": "./vendor/bin/testbench package:test",
39+
"stan": "./vendor/bin/phpstan analyse -c phpstan.neon",
40+
"stan-2g": "./vendor/bin/phpstan analyse -c phpstan.neon --memory-limit=2G",
41+
"test:coverage": [
42+
"@putenv XDEBUG_MODE=coverage",
43+
"./vendor/bin/phpunit --coverage-clover=\"build/clover.xml\""
44+
],
45+
"test:coverage-html": [
46+
"@putenv XDEBUG_MODE=coverage",
47+
"./vendor/bin/phpunit --color=always --coverage-html=\"report\""
48+
]
49+
},
50+
"autoload": {
51+
"psr-4": {
52+
"MarcReichel\\IGDBLaravel\\": "src"
53+
}
54+
},
55+
"autoload-dev": {
56+
"psr-4": {
57+
"MarcReichel\\IGDBLaravel\\Tests\\": "tests"
58+
}
59+
},
60+
"extra": {
61+
"laravel": {
62+
"providers": [
63+
"MarcReichel\\IGDBLaravel\\IGDBLaravelServiceProvider"
64+
]
65+
}
6566
}
66-
}
6767
}

0 commit comments

Comments
 (0)