Skip to content

Commit 0ed3bb4

Browse files
authored
Laravel 9 (#2)
1 parent 3f35e3f commit 0ed3bb4

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

.github/workflows/run-tests.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
os: [ubuntu-latest]
16-
php: [8.0]
17-
laravel: [^8.14]
18-
elasticsearch: ["7.12.1", "7.13.0"]
16+
php: [8.0, 8.1]
17+
laravel: [^8.67, ^9.0]
18+
elasticsearch: ["7.17.0"]
1919
stability: [prefer-lowest, prefer-stable]
2020
include:
21-
- laravel: ^8.14
21+
- laravel: ^8.67
2222
testbench: ^6.6
23+
- laravel: ^9.0
24+
testbench: ^7.0
2325

2426
name: P${{ matrix.php }} - L${{ matrix.laravel }} - E${{ matrix.elasticsearch }} - ${{ matrix.stability }} - ${{ matrix.os }}
2527

composer.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@
1717
],
1818
"require": {
1919
"php": "^8.0",
20-
"laravel/framework": "^8.14",
20+
"laravel/framework": "^8.67 || ^9.0",
2121
"ruflin/elastica": "^7.1",
2222
"spatie/laravel-package-tools": "^1.4.3"
2323
},
2424
"require-dev": {
2525
"brianium/paratest": "^6.2",
26-
"nunomaduro/collision": "^5.3",
2726
"orchestra/testbench": "^6.15",
2827
"phpunit/phpunit": "^9.3",
2928
"vimeo/psalm": "^4.4"
@@ -48,7 +47,10 @@
4847
"code-swift": "docker exec -it --user=laradock -w /var/www/$(git rev-parse --show-toplevel | xargs basename | cat) $(docker ps -q --filter name=laradock_workspace-8.0_) zsh"
4948
},
5049
"config": {
51-
"sort-packages": true
50+
"sort-packages": true,
51+
"allow-plugins": {
52+
"composer/package-versions-deprecated": true
53+
}
5254
},
5355
"extra": {
5456
"laravel": {

src/Index/IndexInterface.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ public function getModelInstance(Document $document): Model;
142142
/**
143143
* Given a Laravel model, return the corresponding Elastica document.
144144
*
145-
* @param Model|ElasticsearchableInterface $model
146145
*
147146
* @return Document
148147
*/

0 commit comments

Comments
 (0)