Commit 095076b

authored

Merge 4.8 into 5.0 (#3186)

2 parents b51aeff + 25f7e8c commit 095076bCopy full SHA for 095076b

File tree

-8

lines changed

-8

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -190,8 +190,8 @@ retrieving data by using a casting helper. This helper is a convenient`
`190`	`190`	`alternative to defining equivalent accessor and mutator methods on your model.`
`191`	`191`
`192`	`192`	In the following example, the casting helper converts the ``discovery_dt``
`193`		-model attribute, stored in MongoDB as a `MongoDB\\BSON\\UTCDateTime <https://www.php.net/manual/en/class.mongodb-bson-utcdatetime.php>`__
`194`		-type, to the Laravel ``datetime`` type.
	`193`	+model attribute, stored in MongoDB as a :php:`MongoDB\\BSON\\UTCDateTime
	`194`	+<class.mongodb-bson-utcdatetime>` type, to the Laravel ``datetime`` type.
`195`	`195`
`196`	`196`	`.. literalinclude:: /includes/eloquent-models/PlanetDate.php`
`197`	`197`	`:language: php`
@@ -216,8 +216,8 @@ type, to the Laravel ``datetime`` type.
`216`	`216`	To learn more, see `Attribute Casting <https://laravel.com/docs/{+laravel-docs-version+}/eloquent-mutators#attribute-casting>`__
`217`	`217`	`in the Laravel documentation.`
`218`	`218`
`219`		-This conversion lets you use the PHP `DateTime
`220`		-<https://www.php.net/manual/en/class.datetime.php>`__ class to work with dates
	`219`	+This conversion lets you use the PHP :php:`DateTime
	`220`	+<class.datetime>` class to work with dates
`221`	`221`	`in this field. The following example shows a Laravel query that uses the`
`222`	`222`	casting helper on the model to query for planets with a ``discovery_dt`` of
`223`	`223`	`less than three years ago:`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -188,8 +188,9 @@ The following example configures a connection with TLS enabled:`
`188`	`188`	`Additional Information`
`189`	`189`	`----------------------`
`190`	`190`
`191`		-To learn more about setting URI options, see the `MongoDB\Driver\Manager::__construct()
`192`		-<https://www.php.net/manual/en/mongodb-driver-manager.construct.php>`__
	`191`	`+To learn more about setting URI options, see the`
	`192`	+:php:`MongoDB\\Driver\\Manager::__construct()
	`193`	+<mongodb-driver-manager.construct>`
`193`	`194`	`API documentation.`
`194`	`195`
`195`	`196`	`To learn more about enabling TLS on a connection, see the`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ to a Laravel web application.`
`35`	`35`
`36`	`36`	`{+odm-long+} requires the {+php-extension+} to manage MongoDB`
`37`	`37`	`connections and commands.`
`38`		- Follow the `Installing the MongoDB PHP Driver with PECL <https://www.php.net/manual/en/mongodb.installation.pecl.php>`__
`39`		`- guide to install the {+php-extension+}.`
	`38`	+ Follow the :php:`Installing the MongoDB PHP Driver with PECL
	`39`	+ <mongodb.installation>` guide to install the {+php-extension+}.
`40`	`40`
`41`	`41`	`.. step:: Install Laravel`
`42`	`42`

Comments

(0)