Skip to content

Merge 4.8 into 5.0 #3086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 31, 2024
Merged

Merge 4.8 into 5.0 #3086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
432456b
Fix wrong name for driver options in docs (#3074)
alcaeus Jul 30, 2024
7ea9dc1
Merge 4.7 into 4.8 (#3085)
mongodb-php-bot Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/fundamentals/connection/connect-to-mongodb.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ For a MongoDB database connection, you can specify the following details:
connection behavior. To learn more about connection options, see
:ref:`laravel-connection-auth-options`.

* - ``driverOptions``
* - ``driver_options``
- Specifies options specific to pass to the {+php-library+} that
determine the driver behavior for that connection. To learn more about
driver options, see :ref:`laravel-driver-options`.
Expand All @@ -170,7 +170,7 @@ For a MongoDB database connection, you can specify the following details:
- ``host``
- ``username``
- ``password``
- ``options`` and ``driverOptions``, which are specified by the option name
- ``options`` and ``driver_options``, which are specified by the option name

The following example shows how you can specify your MongoDB connection details
in the ``connections`` array item:
Expand All @@ -187,7 +187,7 @@ in the ``connections`` array item:
'maxPoolSize' => 20,
'w' => 'majority',
],
'driverOptions' => [
'driver_options' => [
'serverApi' => 1,
],
],
Expand Down
6 changes: 3 additions & 3 deletions docs/fundamentals/connection/connection-options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Connection Options
:values: reference

.. meta::
:keywords: code example, data source name, dsn, authentication, configuration, options, driverOptions
:keywords: code example, data source name, dsn, authentication, configuration, options, driver_options

.. contents:: On this page
:local:
Expand Down Expand Up @@ -329,7 +329,7 @@ connections and all operations between a Laravel application and MongoDB.

You can specify driver options in your Laravel web application's
``config/database.php`` configuration file. To add driver options,
add the setting and value as an array item in the ``driverOptions`` array
add the setting and value as an array item in the ``driver_options`` array
item, as shown in the following example:

.. code-block:: php
Expand All @@ -340,7 +340,7 @@ item, as shown in the following example:
'dsn' => 'mongodb+srv://mongodb0.example.com/',
'driver' => 'mongodb',
'database' => 'sample_mflix',
'driverOptions' => [
'driver_options' => [
'serverApi' => 1,
'allow_invalid_hostname' => false,
],
Expand Down
Loading