Skip to content

Commit

Permalink
Merge pull request #20 from worksome/feature/laravel-11
Browse files Browse the repository at this point in the history
feat: add support for Laravel 11
  • Loading branch information
owenvoke authored Feb 16, 2024
2 parents d31e57e + 9f75f3d commit d370605
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: phpstan
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,25 @@ jobs:
test:
runs-on: ${{ matrix.os }}
env:
PREVENT_OUTPUT: true
FIXER_ACCESS_KEY: ${{ secrets.FIXER_ACCESS_KEY }}
strategy:
fail-fast: true
matrix:
os: [ubuntu-latest, windows-latest]
php: [8.2]
laravel: [10.*]
php: [8.2, 8.3]
laravel: [10.*, 11.*]
stability: [prefer-lowest, prefer-stable]
include:
- laravel: 10.*
testbench: 8.*
- laravel: 11.*
testbench: 9.*

name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@
],
"require": {
"php": "^8.2",
"illuminate/contracts": "^10.0",
"nunomaduro/termwind": "^1.15",
"spatie/laravel-package-tools": "^1.14"
"illuminate/contracts": "^10.0 || ^11.0",
"nunomaduro/termwind": "^1.15 || ^2.0",
"spatie/laravel-package-tools": "^1.16"
},
"require-dev": {
"guzzlehttp/guzzle": "^7.5",
"nunomaduro/collision": "^7.0",
"nunomaduro/larastan": "^2.4",
"orchestra/testbench": "^8.0",
"pestphp/pest": "^2.0",
"pestphp/pest-plugin-laravel": "^2.0",
"worksome/coding-style": "^2.3"
"nunomaduro/collision": "^7.0 || ^8.1",
"larastan/larastan": "^2.6",
"orchestra/testbench": "^8.0 || ^9.0",
"pestphp/pest": "^2.33",
"pestphp/pest-plugin-laravel": "^2.2",
"worksome/coding-style": "^2.8"
},
"autoload": {
"psr-4": {
Expand Down
1 change: 0 additions & 1 deletion ecs.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use Symplify\EasyCodingStandard\Config\ECSConfig;
use Worksome\CodingStyle\WorksomeEcsConfig;


return static function (ECSConfig $ecsConfig): void {
$ecsConfig->paths([
__DIR__ . '/src',
Expand Down
31 changes: 0 additions & 31 deletions phpcs.xml

This file was deleted.

26 changes: 26 additions & 0 deletions phpstan-baseline.neon
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
parameters:
ignoreErrors:
-
message: "#^Illuminate\\\\Support\\\\Facades\\\\Blade facade should not be used\\.$#"
count: 1
path: src/Commands/ViewLatestRatesCommand.php

-
message: "#^Parameter \\#1 \\$value of function intval expects array\\|bool\\|float\\|int\\|resource\\|string\\|null, mixed given\\.$#"
count: 1
path: src/ExchangeRateProviders/FixerProvider.php

-
message: "#^Worksome\\\\Exchange\\\\Facades\\\\Exchange facade should not be used\\.$#"
count: 1
path: src/Facades/Exchange.php

-
message: "#^Parameter \\#1 \\$value of function intval expects array\\|bool\\|float\\|int\\|resource\\|string\\|null, mixed given\\.$#"
count: 1
path: src/Support/ExchangeRateManager.php

-
message: "#^Parameter \\#1 \\$value of function strval expects bool\\|float\\|int\\|resource\\|string\\|null, mixed given\\.$#"
count: 2
path: src/Support/ExchangeRateManager.php
9 changes: 0 additions & 9 deletions renovate.json

This file was deleted.

0 comments on commit d370605

Please sign in to comment.