Skip to content

Merge v1.x into v2.x #1671

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 3 commits into from
Sep 19, 2024
Merged

Merge v1.x into v2.x #1671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f176b3
Remove usage of deprecated E_STRICT (#1668)
alcaeus Sep 19, 2024
8d0323e
Bump version to 1.21-dev (#1661)
alcaeus Sep 19, 2024
637ea48
Merge v1.20 into v1.x (#1669)
mongodb-php-bot Sep 19, 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
4 changes: 2 additions & 2 deletions phongo_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
* publishing a release. */

/* clang-format off */
#define PHP_MONGODB_VERSION "1.20.0dev"
#define PHP_MONGODB_VERSION "1.21.0dev"
#define PHP_MONGODB_STABILITY "devel"
#define PHP_MONGODB_VERSION_DESC 1,20,0,0
#define PHP_MONGODB_VERSION_DESC 1,21,0,0
/* clang-format on */

#endif /* PHONGO_VERSION_H */
2 changes: 1 addition & 1 deletion tests/utils/tools.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ function severityToString(int $severity): string {
'E_USER_ERROR' => E_USER_ERROR,
'E_USER_WARNING' => E_USER_WARNING,
'E_USER_NOTICE' => E_USER_NOTICE,
'E_STRICT' => E_STRICT,
'E_STRICT' => 2048, // E_STRICT was deprecated in PHP 8.4
'E_RECOVERABLE_ERROR' => E_RECOVERABLE_ERROR,
'E_DEPRECATED' => E_DEPRECATED,
'E_USER_DEPRECATED' => E_USER_DEPRECATED,
Expand Down