Merge 5.0 into 5.x (#3150)

.github/workflows/build-ci.yml

@@ -20,15 +20,15 @@ jobs:
  - "6.0"
  - "7.0"
  php:
+ - "8.1"
  - "8.2"
  - "8.3"
  laravel:
+ - "10.*"
  - "11.*"
- mode:
- - ""
  include:
- - php: "8.2"
- laravel: "11.*"
+ - php: "8.1"
+ laravel: "10.*"
  mongodb: "5.0"
  mode: "low-deps"
  os: "ubuntu-latest"
@@ -37,6 +37,9 @@ jobs:
  mongodb: "7.0"
  mode: "ignore-php-req"
  os: "ubuntu-latest"
+ exclude:
+ - php: "8.1"
+ laravel: "11.*"
 
  steps:
  - uses: "actions/checkout@v4"

.github/workflows/static-analysis.yml

@@ -21,6 +21,7 @@ jobs:
  strategy:
  matrix:
  php:
+ - '8.1'
  - '8.2'
  - '8.3'
  steps:

CHANGELOG.md

@@ -1,9 +1,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [5.0.1] - 2024-09-13
+
+* Restore support for Laravel 10 by @GromNaN in [#3148](https://github.com/mongodb/laravel-mongodb/pull/3148)
+
 ## [5.0.0] - 2024-09-12
 
-* Remove support for Laravel 10 by @GromNaN in [#3123](https://github.com/mongodb/laravel-mongodb/pull/3123)
 * **BREAKING CHANGE** Use `id` as an alias for `_id` in commands and queries for compatibility with Eloquent packages by @GromNaN in [#3040](https://github.com/mongodb/laravel-mongodb/pull/3040) and [#3136](https://github.com/mongodb/laravel-mongodb/pull/3136)
 * **BREAKING CHANGE** Make Query\Builder return objects instead of array to match Laravel behavior by @GromNaN in [#3107](https://github.com/mongodb/laravel-mongodb/pull/3107)
 * **BREAKING CHANGE** In DB query results, convert BSON `UTCDateTime` objects into `Carbon` date with the default timezone by @GromNaN in [#3119](https://github.com/mongodb/laravel-mongodb/pull/3119)

composer.json

@@ -22,28 +22,31 @@
  ],
  "license": "MIT",
  "require": {
- "php": "^8.2",
+ "php": "^8.1",
  "ext-mongodb": "^1.15",
  "composer-runtime-api": "^2.0.0",
- "illuminate/cache": "^11",
- "illuminate/container": "^11",
- "illuminate/database": "^11",
- "illuminate/events": "^11",
- "illuminate/support": "^11",
+ "illuminate/cache": "^10.36|^11",
+ "illuminate/container": "^10.0|^11",
+ "illuminate/database": "^10.30|^11",
+ "illuminate/events": "^10.0|^11",
+ "illuminate/support": "^10.0|^11",
  "mongodb/mongodb": "^1.18"
  },
  "require-dev": {
  "mongodb/builder": "^0.2",
  "league/flysystem-gridfs": "^3.28",
  "league/flysystem-read-only": "^3.0",
- "phpunit/phpunit": "^10.5",
- "orchestra/testbench": "^9.0",
+ "phpunit/phpunit": "^10.3",
+ "orchestra/testbench": "^8.0|^9.0",
  "mockery/mockery": "^1.4.4",
  "doctrine/coding-standard": "12.0.x-dev",
  "spatie/laravel-query-builder": "^5.6",
  "phpstan/phpstan": "^1.10",
  "rector/rector": "^1.2"
  },
+ "conflict": {
+ "illuminate/bus": "< 10.37.2"
+ },
  "suggest": {
  "league/flysystem-gridfs": "Filesystem storage in MongoDB with GridFS",
  "mongodb/builder": "Provides a fluent aggregation builder for MongoDB pipelines"