Skip to content

Commit

Permalink
[1.x] Merges develop (#84)
Browse files Browse the repository at this point in the history
* [develop] Adds L11 support (#78)

* Adds L11 support

* Roolback migration change

* Uses `publishesMigrations`

* Finishes Laravel 11 support

* Excludes Laravel 11 with PHP 8.1

* Uses stable version of Octane
  • Loading branch information
nunomaduro authored Jan 15, 2024
1 parent 48dc2cb commit c1c49cb
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 14 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [8.1, 8.2]
laravel: [10]
php: [8.1, 8.2, 8.3]
laravel: [10, 11]
exclude:
- php: 8.1
laravel: 11

name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}

Expand All @@ -43,4 +46,4 @@ jobs:
composer update --prefer-dist --no-interaction --no-progress
- name: Execute tests
run: vendor/bin/phpunit --verbose
run: vendor/bin/phpunit
20 changes: 10 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
],
"require": {
"php": "^8.1",
"illuminate/console": "^10.0",
"illuminate/container": "^10.0",
"illuminate/contracts": "^10.0",
"illuminate/database": "^10.0",
"illuminate/queue": "^10.0",
"illuminate/support": "^10.0",
"symfony/finder": "^6.0"
"illuminate/console": "^10.0|^11.0",
"illuminate/container": "^10.0|^11.0",
"illuminate/contracts": "^10.0|^11.0",
"illuminate/database": "^10.0|^11.0",
"illuminate/queue": "^10.0|^11.0",
"illuminate/support": "^10.0|^11.0",
"symfony/finder": "^6.0|^7.0"
},
"require-dev": {
"laravel/octane": "^1.4",
"orchestra/testbench": "^8.0",
"laravel/octane": "^1.4|^2.0",
"orchestra/testbench": "^8.0|^9.0",
"phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^9.0"
"phpunit/phpunit": "^9.0|^10.4"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 3 additions & 1 deletion src/PennantServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ protected function offerPublishing()
__DIR__.'/../config/pennant.php' => config_path('pennant.php'),
], 'pennant-config');

$this->publishes([
$method = method_exists($this, 'publishesMigrations') ? 'publishesMigrations' : 'publishes';

$this->{$method}([
__DIR__.'/../database/migrations' => $this->app->databasePath('migrations'),
], 'pennant-migrations');
}
Expand Down

0 comments on commit c1c49cb

Please sign in to comment.