Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 153af6c

Browse files
Merge 5.2 into 5.x (#3300)
2 parents 824e2fc + 3d8d095 commit 153af6c

File tree

8 files changed

+25
-30
lines changed

8 files changed

+25
-30
lines changed

‎docs/compatibility.txt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Compatibility
1515
:class: singlecol
1616

1717
.. meta::
18-
:keywords: laravel 9, laravel 10, laravel 11, 4.0, 4.1, 4.2, 5.0, 5.1
18+
:keywords: laravel 9, laravel 10, laravel 11, laravel 12, 4.0, 4.1, 4.2, 5.0, 5.1, 5.2
1919

2020
Laravel Compatibility
2121
---------------------
@@ -28,3 +28,9 @@ the {+odm-short+} that you can use together.
2828
To find compatibility information for unmaintained versions of the {+odm-short+},
2929
see `Laravel Version Compatibility <{+mongodb-laravel-gh+}/blob/3.9/README.md#installation>`__
3030
on GitHub.
31+
32+
PHP Driver Compatibility
33+
------------------------
34+
35+
To use {+odm-long+} v5.2 or later, you must install v1.21 of the
36+
{+php-library+} and {+php-extension+}.

‎docs/filesystems.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ You can configure the following settings in ``config/filesystems.php``:
7979

8080
* - ``throw``
8181
- If ``true``, exceptions are thrown when an operation cannot be performed. If ``false``,
82-
operations return ``true`` on success and ``false`` on error. Defaults to ``false``.
82+
operations return ``true`` on success and ``false`` on error. Defaults to ``false``.
8383

8484
You can also use a factory or a service name to create an instance of ``MongoDB\GridFS\Bucket``.
8585
In this case, the options ``connection`` and ``database`` are ignored:
@@ -133,7 +133,7 @@ metadata, including the file name and a unique ObjectId. If multiple documents
133133
share the same file name, they are considered "revisions" and further
134134
distinguished by creation timestamps.
135135

136-
The Laravel MongoDB integration uses the GridFS Flysystem adapter. It interacts
136+
{+odm-long+} uses the GridFS Flysystem adapter. It interacts
137137
with file revisions in the following ways:
138138

139139
- Reading a file reads the last revision of this file name

‎docs/fundamentals/aggregation-builder.txt‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ The {+odm-long+} aggregation builder lets you build aggregation stages and
3737
aggregation pipelines. The following sections show examples of how to use the
3838
aggregation builder to create the stages of an aggregation pipeline:
3939

40-
- :ref:`laravel-add-aggregation-dependency`
4140
- :ref:`laravel-build-aggregation`
4241
- :ref:`laravel-aggregation-examples`
4342
- :ref:`laravel-create-custom-operator-factory`
@@ -49,27 +48,6 @@ aggregation builder to create the stages of an aggregation pipeline:
4948
aggregation builder, see :ref:`laravel-query-builder-aggregations` in the
5049
Query Builder guide.
5150

52-
.. _laravel-add-aggregation-dependency:
53-
54-
Add the Aggregation Builder Dependency
55-
--------------------------------------
56-
57-
The aggregation builder is part of the {+agg-builder-package-name+} package.
58-
You must add this package as a dependency to your project to use it. Run the
59-
following command to add the aggregation builder dependency to your
60-
application:
61-
62-
.. code-block:: bash
63-
64-
composer require {+agg-builder-package-name+}:{+agg-builder-version+}
65-
66-
When the installation completes, verify that the ``composer.json`` file
67-
includes the following line in the ``require`` object:
68-
69-
.. code-block:: json
70-
71-
"{+agg-builder-package-name+}": "{+agg-builder-version+}",
72-
7351
.. _laravel-build-aggregation:
7452

7553
Create Aggregation Stages

‎docs/includes/framework-compatibility-laravel.rst‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,31 @@
33
:stub-columns: 1
44

55
* - {+odm-long+} Version
6+
- Laravel 12.x
67
- Laravel 11.x
78
- Laravel 10.x
89
- Laravel 9.x
910

11+
* - 5.2
12+
- ✓
13+
- ✓
14+
- ✓
15+
-
16+
1017
* - 4.2 to 5.1
18+
-
1119
- ✓
1220
- ✓
1321
-
1422

1523
* - 4.1
24+
-
1625
-
1726
- ✓
1827
-
1928

2029
* - 4.0
30+
-
2131
-
2232
- ✓
2333
-

‎docs/query-builder.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ value greater than ``8.5`` and a ``year`` value of less than
227227

228228
.. tip::
229229

230-
For compatibility with Laravel, Laravel MongoDB v5.1 supports both arrow
230+
For compatibility with Laravel, {+odm-long+} v5.1 supports both arrow
231231
(``->``) and dot (``.``) notation to access nested fields in a query
232232
filter. The preceding example uses dot notation to query the ``imdb.rating``
233233
nested field, which is the recommended syntax.

‎docs/quick-start.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ read and write operations on the data.
4747
MongoDB University Learning Byte.
4848

4949
If you prefer to connect to MongoDB by using the {+php-library+} without
50-
Laravel, see `Connecting to MongoDB <https://www.mongodb.com/docs/php-library/current/tutorial/connecting/>`__
50+
Laravel, see `Connect to MongoDB <https://www.mongodb.com/docs/php-library/current/connect/>`__
5151
in the {+php-library+} documentation.
5252

5353
The {+odm-short+} extends the Laravel Eloquent and Query Builder syntax to

‎docs/quick-start/download-and-install.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ to a Laravel web application.
3131
.. tip::
3232

3333
As an alternative to the following installation steps, you can use Laravel Herd
34-
to install MongoDB and configure a Laravel MongoDB development environment. For
34+
to install MongoDB and configure a development environment for {+odm-long+}. For
3535
more information about using Laravel Herd with MongoDB, see the following resources:
3636

3737
- `Installing MongoDB via Herd Pro

‎docs/user-authentication.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ to the ``guards`` array:
224224
],
225225
],
226226

227-
Use Laravel Passport with Laravel MongoDB
227+
Use Laravel Passport with {+odm-long+}
228228
`````````````````````````````````````````
229229

230230
After installing Laravel Passport, you must enable Passport compatibility with MongoDB by
@@ -300,4 +300,5 @@ Additional Information
300300
To learn more about user authentication, see `Authentication <https://laravel.com/docs/{+laravel-docs-version+}/authentication>`__
301301
in the Laravel documentation.
302302

303-
To learn more about Eloquent models, see the :ref:`laravel-eloquent-model-class` guide.
303+
To learn more about Eloquent models, see the
304+
:ref:`laravel-eloquent-model-class` guide.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /