Merge remote-tracking branch 'upstream/5.0' into DOCSP-43530-result-id-field

Author: norareidy

.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

@@ -3,7 +3,6 @@ All notable changes to this project will be documented in this file.
 
 ## [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"

docs/compatibility.txt

@@ -15,7 +15,7 @@ Compatibility
    :class: singlecol
 
 .. meta::
-   :keywords: laravel 9, laravel 10, laravel 11, 4.0, 4.1, 4.2
+   :keywords: laravel 9, laravel 10, laravel 11, 4.0, 4.1, 4.2, 5.0
 
 Laravel Compatibility
 ---------------------

docs/includes/framework-compatibility-laravel.rst

@@ -7,7 +7,7 @@
      - Laravel 10.x
      - Laravel 9.x
 
-   * - 4.2 to 4.8
+   * - 4.2 to 5.0
      - ✓
      - ✓
      -

docs/index.txt

@@ -14,8 +14,9 @@
    :maxdepth: 1
 
    /quick-start
-   /usage-examples
    Release Notes <https://github.com/mongodb/laravel-mongodb/releases/>
+   /upgrade
+   /usage-examples
    /fundamentals
    /eloquent-models
    /query-builder
@@ -27,7 +28,6 @@
    /issues-and-help
    /feature-compatibility
    /compatibility
-   /upgrade
 
 Introduction
 ------------
@@ -52,6 +52,17 @@ Learn how to add the {+odm-short+} to a Laravel web application, connect to
 MongoDB hosted on MongoDB Atlas, and begin working with data in the
 :ref:`laravel-quick-start` section.
 
+Upgrade Versions
+----------------
+
+.. important::
+
+   {+odm-long+} v5.0 introduces breaking changes that might affect how you
+   upgrade your application from a v4.x version.
+
+Learn what changes you must make to your application to upgrade between
+major versions in the :ref:`laravel-upgrading` section.
+
 Usage Examples
 --------------
 
@@ -94,10 +105,3 @@ Compatibility
 
 To learn more about which versions of {+odm-long+} and Laravel are
 compatible, see the :ref:`laravel-compatibility` section.
-
-Upgrade Versions
-----------------
-
-Learn what changes you must make to your application to upgrade versions in
-the :ref:`laravel-upgrading` section.
-

docs/upgrade.txt

@@ -125,41 +125,41 @@ This library version introduces the following breaking changes:
   older versions compared to v5.0:
 
   .. code-block:: php
-    :emphasize-lines: 10-11
-
-    use MongoDB\Laravel\Eloquent\Model;
-
-    class User extends Model
-    {
-        protected $keyType = 'string';
-
-        // older versions
-        protected $collection = 'app_user';
-
-        // v5.0
-        protected $table = 'app_user';
-
-        ...
-    }
+     :emphasize-lines: 10-11
+ 
+     use MongoDB\Laravel\Eloquent\Model;
+ 
+     class User extends Model
+     {
+         protected $keyType = 'string';
+ 
+         // older versions
+         protected $collection = 'app_user';
+ 
+         // v5.0
+         protected $table = 'app_user';
+ 
+         ...
+     }
 
   This release also modifies the associated ``DB`` and ``Schema`` methods for
   accessing a MongoDB collection. The following code shows how to access the
   ``app_user`` collection in older versions compared to v5.0:
 
   .. code-block:: php
-    :emphasize-lines: 9-11
-
-    use Illuminate\Support\Facades\Schema;
-    use Illuminate\Support\Facades\DB;
-    use MongoDB\Laravel\Schema\Blueprint;
-      
-      // older versions
-      Schema::collection('app_user', function (Blueprint $collection) { ... });
-      DB::collection('app_user')->find($id);
-
-      // v5.0
-      Schema::table('app_user', function (Blueprint $table) { ... });
-      DB::table('app_user')->find($id);
+     :emphasize-lines: 9-11
+ 
+     use Illuminate\Support\Facades\Schema;
+     use Illuminate\Support\Facades\DB;
+     use MongoDB\Laravel\Schema\Blueprint;
+       
+     // older versions
+     Schema::collection('app_user', function (Blueprint $collection) { ... });
+     DB::collection('app_user')->find($id);
+ 
+     // v5.0
+     Schema::table('app_user', function (Blueprint $table) { ... });
+     DB::table('app_user')->find($id);
 
 .. _laravel-breaking-changes-v4.x: