Skip to content

Merge 4.2 into 4.3 #2915

New issue

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

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

Already on GitHub? # to your account

Merged
merged 2 commits into from
Apr 25, 2024
Merged

Merge 4.2 into 4.3 #2915

merged 2 commits into from
Apr 25, 2024

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from 4.2 into 4.3.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge 4.3

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to 4.3 and manually merge using the `ours` merge strategy:
git reset --hard 4.3
git merge --strategy=ours 4.2

Then, push the temporary branch to upate the pull request.

…recation warnings (#2913)

Using $model::firstOrCreate(...)
currently results in deprecation warnings.  
Can be addressed by adding `void` return type.

Warnings: 
```
   DEPRECATED  Return type of MongoDB\Laravel\Internal\FindAndModifyCommandSubscriber::commandStarted(MongoDB\Driver\Monitoring\CommandStartedEvent $event) should either be compatible with MongoDB\Driver\Monitoring\CommandSubscriber::commandStarted(MongoDB\Driver\Monitoring\CommandStartedEvent $event): void, or the #[\ReturnTypeWillChange] attribute should be used to temporarily suppress the notice in vendor/mongodb/laravel-mongodb/src/Internal/FindAndModifyCommandSubscriber.php on line 26.


   DEPRECATED  Return type of MongoDB\Laravel\Internal\FindAndModifyCommandSubscriber::commandSucceeded(MongoDB\Driver\Monitoring\CommandSucceededEvent $event) should either be compatible with MongoDB\Driver\Monitoring\CommandSubscriber::commandSucceeded(MongoDB\Driver\Monitoring\CommandSucceededEvent $event): void, or the #[\ReturnTypeWillChange] attribute should be used to temporarily suppress the notice in vendor/mongodb/laravel-mongodb/src/Internal/FindAndModifyCommandSubscriber.php on line 30.


   DEPRECATED  Return type of MongoDB\Laravel\Internal\FindAndModifyCommandSubscriber::commandFailed(MongoDB\Driver\Monitoring\CommandFailedEvent $event) should either be compatible with MongoDB\Driver\Monitoring\CommandSubscriber::commandFailed(MongoDB\Driver\Monitoring\CommandFailedEvent $event): void, or the #[\ReturnTypeWillChange] attribute should be used to temporarily suppress the notice in vendor/mongodb/laravel-mongodb/src/Internal/FindAndModifyCommandSubscriber.php on line 22.
```
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner April 25, 2024 14:05
@mongodb-php-bot mongodb-php-bot requested a review from jmikola April 25, 2024 14:05
@mongodb-php-bot mongodb-php-bot merged commit f95eb66 into 4.3 Apr 25, 2024
@mongodb-php-bot mongodb-php-bot deleted the merge-4.2-into-4.3-1714053945137 branch April 25, 2024 14:30
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants