Merge branch 'mongodb:4.2' into DOCSP-37057-eloquent-schema-builder

Author: Chris Cho

.github/workflows/build-ci.yml

@@ -8,7 +8,7 @@ jobs:
     build:
         runs-on: "${{ matrix.os }}"
 
-        name: "PHP v${{ matrix.php }} with MongoDB ${{ matrix.mongodb }} ${{ matrix.mode }}"
+        name: "PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }} MongoDB ${{ matrix.mongodb }} ${{ matrix.mode }}"
 
         strategy:
             matrix:
@@ -23,10 +23,17 @@ jobs:
                     - "8.1"
                     - "8.2"
                     - "8.3"
+                laravel:
+                    - "10.*"
+                    - "11.*"
                 include:
                     - php: "8.1"
+                      laravel: "10.*"
                       mongodb: "5.0"
                       mode: "low-deps"
+                exclude:
+                    - php: "8.1"
+                      laravel: "11.*"
 
         steps:
             -   uses: "actions/checkout@v4"
@@ -58,6 +65,9 @@ jobs:
                 if: ${{ runner.debug }}
                 run: "docker version && env"
 
+            -   name: "Restrict Laravel version"
+                run: "composer require --dev --no-update 'laravel/framework:${{ matrix.laravel }}'"
+
             -   name: "Download Composer cache dependencies from cache"
                 id: "composer-cache"
                 run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
@@ -70,8 +80,7 @@ jobs:
                     restore-keys: "${{ matrix.os }}-composer-"
 
             -   name: "Install dependencies"
-                run: composer update --no-interaction $([[ "${{ matrix.mode }}" == low-deps ]] && echo ' --prefer-lowest --prefer-stable')
-
+                run: composer update --no-interaction $([[ "${{ matrix.mode }}" == low-deps ]] && echo ' --prefer-lowest')
             -   name: "Run tests"
                 run: "./vendor/bin/phpunit --coverage-clover coverage.xml"
                 env:

.github/workflows/merge-up.yml

@@ -0,0 +1,30 @@
+name: Merge up
+
+on:
+  push:
+    branches:
+      - "[0-9]+.[0-9]+"
+
+env:
+  GH_TOKEN: ${{ secrets.MERGE_UP_TOKEN }}
+
+jobs:
+  merge-up:
+    name: Create merge up pull request
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        id: checkout
+        uses: actions/checkout@v4
+        with:
+          # fetch-depth 0 is required to fetch all branches, not just the branch being built
+          fetch-depth: 0
+          token: ${{ secrets.MERGE_UP_TOKEN }}
+
+      - name: Create pull request
+        id: create-pull-request
+        uses: alcaeus/automatic-merge-up-action@main
+        with:
+          ref: ${{ github.ref_name }}
+          branchNamePattern: '<major>.<minor>'

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [unreleased]
+
+
+## [4.2.0] - 2024-12-14
+
+* Add support for Laravel 11 by @GromNaN in [#2735](https://github.com/mongodb/laravel-mongodb/pull/2735)
+* Implement Model::createOrFirst() using findOneAndUpdate operation by @GromNaN in [#2742](https://github.com/mongodb/laravel-mongodb/pull/2742)
+
 ## [4.1.3] - 2024-03-05
 
 * Fix the timezone of `datetime` fields when they are read from the database. By @GromNaN in [#2739](https://github.com/mongodb/laravel-mongodb/pull/2739)

composer.json

@@ -24,20 +24,21 @@
     "require": {
         "php": "^8.1",
         "ext-mongodb": "^1.15",
-        "illuminate/support": "^10.0",
-        "illuminate/container": "^10.0",
-        "illuminate/database": "^10.30",
-        "illuminate/events": "^10.0",
+        "illuminate/support": "^10.0|^11",
+        "illuminate/container": "^10.0|^11",
+        "illuminate/database": "^10.30|^11",
+        "illuminate/events": "^10.0|^11",
         "mongodb/mongodb": "^1.15"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.3",
-        "orchestra/testbench": "^8.0",
+        "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"
     },
+    "minimum-stability": "dev",
     "replace": {
         "jenssegers/mongodb": "self.version"
     },
@@ -66,9 +67,6 @@
         "cs:fix": "phpcbf"
     },
     "config": {
-        "platform": {
-            "php": "8.1"
-        },
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
         }

docs/compatibility.txt

@@ -23,5 +23,5 @@ The following compatibility table specifies the versions of Laravel and
 .. include:: /includes/framework-compatibility-laravel.rst
 
 To find compatibility information for unmaintained versions of {+odm-short+},
-see `Laravel Version Compatibility <https://github.com/mongodb/laravel-mongodb/blob/3.9/README.md#installation>`__
+see `Laravel Version Compatibility <{+mongodb-laravel-gh+}/blob/3.9/README.md#installation>`__
 on GitHub.

docs/includes/framework-compatibility-laravel.rst

@@ -3,14 +3,22 @@
    :stub-columns: 1
 
    * - {+odm-short+} Version
+     - Laravel 11.x
      - Laravel 10.x
      - Laravel 9.x
 
+   * - 4.2
+     - ✓
+     - ✓
+     -
+
    * - 4.1
+     -
      - ✓
      -
 
    * - 4.0
+     -
      - ✓
      -
 

docs/index.txt

@@ -14,12 +14,14 @@ Laravel MongoDB
    :maxdepth: 1
 
    /quick-start
+   Release Notes <https://github.com/mongodb/laravel-mongodb/releases/>
    /retrieve
    /eloquent-models
    /query-builder
    /user-authentication
    /queues
    /transactions
+   /issues-and-help
    /compatibility
    /upgrade
 
@@ -58,6 +60,12 @@ see the following content:
 - :ref:`laravel-queues`
 - :ref:`laravel-transactions`
 
+Issues & Help
+-------------
+
+Learn how to report bugs, contribute to the library, and find
+more resources in the :ref:`laravel-issues-and-help` section.
+
 Compatibility
 -------------
 
@@ -70,57 +78,4 @@ Upgrade Versions
 Learn what changes you might need to make to your application to upgrade
 versions in the :ref:`laravel-upgrading` section.
 
-Reporting Issues
-----------------
-
-We are lucky to have a vibrant PHP community that includes users of varying
-experience with MongoDB PHP Library and {+odm-short+}. To get support for
-general questions, search or post in the
-:community-forum:`MongoDB Community Forums <>`.
-
-To learn more about MongoDB support options, see the
-`Technical Support <https://www.mongodb.org/about/support>`__ page.
-
-
-Bugs / Feature Requests
------------------------
-
-If you've found a bug or want to see a new feature in {+odm-short+},
-please report it in the GitHub issues section of the
-`mongodb/laravel-mongodb <https://github.com/mongodb/laravel-mongodb>`__
-repository.
-
-If you want to contribute code, see the following section for instructions on
-submitting pull requests.
-
-To report a bug or request a new feature, perform the following steps:
-
-1. Visit the `GitHub issues <https://github.com/mongodb/laravel-mongodb/issues>`__
-   section and search for any similar issues or bugs.
-#. If you find a matching issue, you can reply to the thread to report that
-   you have a similar issue or request.
-#. If you cannot find a matching issue, click :guilabel:`New issue` and select
-   the appropriate issue type.
-#. If you selected "Bug report" or "Feature request", please provide as much
-   information as possible about the issue. Click :guilabel:`Submit new issue`
-   to complete your submission.
-
-If you've identified a security vulnerability in any official MongoDB
-product, please report it according to the instructions found in the
-:manual:`Create a Vulnerability Report page </tutorial/create-a-vulnerability-report>`.
-
-For general questions and support requests, please use one of MongoDB's
-:manual:`Technical Support </support/>` channels.
-
-Pull Requests
--------------
-
-We are happy to accept contributions to help improve the {+odm-short+}.
-
-We track current development in `PHPORM <https://jira.mongodb.org/projects/PHPORM/summary>`__
-MongoDB JIRA project.
-
-To learn more about contributing to this project, see the
-`CONTRIBUTING.md <https://github.com/mongodb/laravel-mongodb/blob/4.1/CONTRIBUTING.md>`__
-guide on GitHub.
 

docs/issues-and-help.txt

@@ -0,0 +1,56 @@
+.. _laravel-issues-and-help:
+
+=============
+Issues & Help
+=============
+
+We are lucky to have a vibrant PHP community that includes users of varying
+experience with MongoDB PHP Library and {+odm-short+}. To get support for
+general questions, search or post in the
+:community-forum:`MongoDB PHP Community Forums </tag/php>`.
+
+To learn more about MongoDB support options, see the
+`Technical Support <https://www.mongodb.org/about/support>`__ page.
+
+Bugs / Feature Requests
+-----------------------
+
+If you find a bug or want to see a new feature in {+odm-short+},
+please report it as a GitHub issue in the `mongodb/laravel-mongodb
+<{+mongodb-laravel-gh+}>`__ repository.
+
+If you want to contribute code, see the :ref:`laravel-pull-requests` section
+for instructions on submitting pull requests.
+
+To report a bug or request a new feature, perform the following steps:
+
+1. Review the `GitHub issues list <{+mongodb-laravel-gh+}/issues>`__
+   in the source repository and search for any existing issues that address your concern.
+#. If you find a matching issue, you can reply to the thread to report that
+   you have a similar issue or request.
+#. If you cannot find a matching issue, click :guilabel:`New issue` and select
+   the appropriate issue type.
+#. If you select "Bug report" or "Feature request" as the issue type, please provide as
+   much information as possible about the issue. Click :guilabel:`Submit new issue`
+   to complete your submission.
+
+If you've identified a security vulnerability in any official MongoDB
+product, please report it according to the instructions found in the
+:manual:`Create a Vulnerability Report page </tutorial/create-a-vulnerability-report>`.
+
+For general questions and support requests, please use one of MongoDB's
+:manual:`Technical Support </support/>` channels.
+
+.. _laravel-pull-requests:
+
+Pull Requests
+-------------
+
+We are happy to accept contributions to help improve {+odm-short+}.
+
+We track current development in `PHPORM <https://jira.mongodb.org/projects/PHPORM/summary>`__
+MongoDB JIRA project.
+
+To learn more about contributing to this project, see the
+`CONTRIBUTING.md <{+mongodb-laravel-gh+}/blob/{+package-version+}/CONTRIBUTING.md>`__
+guide on GitHub.

docs/quick-start.txt

@@ -33,7 +33,7 @@ read and write operations on the data.
 
    You can learn how to set up a local Laravel development environment
    and perform CRUD operations by viewing the
-   :mdbu-course:`Getting Started with Laravel and MongoDB </getting-started-with-laravel-and-mongodb>`
+   :mdbu-course:`Getting Started with Laravel and MongoDB </courses/getting-started-with-laravel-and-mongodb>`
    MongoDB University Learning Byte.
 
    If you prefer to connect to MongoDB by using the PHP Library driver without