Skip to content

Commit

Permalink
Fix conflict with Laravel/Scout v10.11.6 and newer (#348)
Browse files Browse the repository at this point in the history
* fix conflict with Laravel Scout v10.11.6+

* cherry pick  #f319b644dff9595888eb017c24d0737803879e32

* fix version as suggested

* chore(dependencies): update laravel/scout version constraint

• Corrected a faulty version constraint in `composer.json`.
• Allowed for compatibility with Laravel Scout versions 9.0, 10.0, and up to 10.11.5.

* tweak scout version

---------

Co-authored-by: Marius Cucuruz <[email protected]>
  • Loading branch information
mariuscucuruz and mariuscucuruz authored Nov 22, 2024
1 parent 74d8c73 commit 052f7dd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"illuminate/database": "^9.0|^10.0|^11.0",
"illuminate/filesystem": "^9.0|^10.0|^11.0",
"illuminate/support": "^9.0|^10.0|^11.0",
"laravel/scout": "^9.0|^10.0",
"laravel/scout": "^9.0|^10.0 <10.11.6",
"riimu/kit-phpencoder": "^2.4"
},
"suggest": {
Expand Down
1 change: 0 additions & 1 deletion phpstan.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ parameters:
checkMissingIterableValueType: false
ignoreErrors:
- '#Illuminate\\Database\\Eloquent\\Model::(searchableAs|searchableUsing)\(\)#'
- '#Algolia\\ScoutExtended\\ScoutExtendedServiceProvider::getModel\(\)#'
- '#Unsafe usage of new static#'

0 comments on commit 052f7dd

Please sign in to comment.