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 0629d11

Browse files
authored
Merge v1.21 into v1.x (#1815)
2 parents dab02e5 + 94b1dd1 commit 0629d11

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

‎.github/workflows/arginfo-files.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
jobs:
1717
check-arginfo:
1818
name: "Check generated arginfo files"
19-
runs-on: "ubuntu-20.04"
19+
runs-on: "ubuntu-24.04"
2020

2121
steps:
2222
- name: "Checkout"

‎.github/workflows/clang-format.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
jobs:
1717
coding-standards:
1818
name: "Coding Standards"
19-
runs-on: "ubuntu-20.04"
19+
runs-on: "ubuntu-24.04"
2020

2121
steps:
2222
- name: "Checkout"

‎.github/workflows/tests.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,32 @@ jobs:
1919
fail-fast: true
2020
matrix:
2121
os:
22-
- "ubuntu-20.04"
22+
- "ubuntu-22.04"
2323
php-version:
2424
- "8.1"
2525
- "8.2"
2626
- "8.3"
2727
- "8.4"
2828
mongodb-version:
29-
- "4.4"
29+
- "6.0"
3030
topology:
3131
- "server"
3232
include:
33-
- os: "ubuntu-20.04"
33+
- os: "ubuntu-24.04"
3434
php-version: "8.1"
35-
mongodb-version: "6.0"
35+
mongodb-version: "8.0"
3636
topology: "replica_set"
37-
- os: "ubuntu-20.04"
37+
- os: "ubuntu-24.04"
3838
php-version: "8.1"
39-
mongodb-version: "6.0"
39+
mongodb-version: "8.0"
4040
topology: "sharded_cluster"
41-
- os: "ubuntu-20.04"
41+
- os: "ubuntu-22.04"
4242
php-version: "8.1"
43-
mongodb-version: "4.4"
43+
mongodb-version: "6.0"
4444
topology: "replica_set"
45-
- os: "ubuntu-20.04"
45+
- os: "ubuntu-22.04"
4646
php-version: "8.1"
47-
mongodb-version: "4.4"
47+
mongodb-version: "6.0"
4848
topology: "sharded_cluster"
4949

5050
steps:

‎scripts/clang-format.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if [ -z "$CLANG_FORMAT" ]; then
2929
exit
3030
fi
3131

32-
VERSION=`$CLANG_FORMAT -version | cut -d "" -f 3`
32+
VERSION=`$CLANG_FORMAT -version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+'`
3333
VERSION_MAJOR=`echo $VERSION | cut -d "." -f 1`
3434

3535
if [ $VERSION_MAJOR -lt 6 ]; then

‎src/phongo_client.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,7 @@ static mongoc_client_t* php_phongo_make_mongo_client(const mongoc_uri_t* uri, zv
11281128
#ifdef HAVE_SYSTEM_LIBBSON
11291129
bson_version = bson_get_version();
11301130
#else
1131-
bson_version = "bundled";
1131+
bson_version = "bundled";
11321132
#endif
11331133

11341134
MONGOC_DEBUG(

‎src/phongo_compat.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
#define PHONGO_PARSE_PARAMETERS_END() \
173173
ZEND_PARSE_PARAMETERS_END_EX( \
174174
zend_restore_error_handling(&error_handling); \
175-
return ); \
175+
return); \
176176
zend_restore_error_handling(&error_handling); \
177177
} \
178178
while (0)

0 commit comments

Comments
(0)

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