Merge v1.21 into v1.x (#1815)

Author: alcaeus

Diff for: .github/workflows/arginfo-files.yml

@@ -16,7 +16,7 @@ env:
 jobs:
   check-arginfo:
     name: "Check generated arginfo files"
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-24.04"
 
     steps:
       - name: "Checkout"

Diff for: .github/workflows/clang-format.yml

@@ -16,7 +16,7 @@ env:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-24.04"
 
     steps:
       - name: "Checkout"

Diff for: .github/workflows/tests.yml

@@ -19,32 +19,32 @@ jobs:
       fail-fast: true
       matrix:
         os:
-          - "ubuntu-20.04"
+          - "ubuntu-22.04"
         php-version:
           - "8.1"
           - "8.2"
           - "8.3"
           - "8.4"
         mongodb-version:
-          - "4.4"
+          - "6.0"
         topology:
           - "server"
         include:
-          - os: "ubuntu-20.04"
+          - os: "ubuntu-24.04"
             php-version: "8.1"
-            mongodb-version: "6.0"
+            mongodb-version: "8.0"
             topology: "replica_set"
-          - os: "ubuntu-20.04"
+          - os: "ubuntu-24.04"
             php-version: "8.1"
-            mongodb-version: "6.0"
+            mongodb-version: "8.0"
             topology: "sharded_cluster"
-          - os: "ubuntu-20.04"
+          - os: "ubuntu-22.04"
             php-version: "8.1"
-            mongodb-version: "4.4"
+            mongodb-version: "6.0"
             topology: "replica_set"
-          - os: "ubuntu-20.04"
+          - os: "ubuntu-22.04"
             php-version: "8.1"
-            mongodb-version: "4.4"
+            mongodb-version: "6.0"
             topology: "sharded_cluster"
 
     steps:

Diff for: scripts/clang-format.sh

@@ -29,7 +29,7 @@ if [ -z "$CLANG_FORMAT" ]; then
 	exit
 fi
 
-VERSION=`$CLANG_FORMAT -version | cut -d " " -f 3`
+VERSION=`$CLANG_FORMAT -version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+'`
 VERSION_MAJOR=`echo $VERSION | cut -d "." -f 1`
 
 if [ $VERSION_MAJOR -lt 6 ]; then

Diff for: src/phongo_client.c

@@ -1128,7 +1128,7 @@ static mongoc_client_t* php_phongo_make_mongo_client(const mongoc_uri_t* uri, zv
 #ifdef HAVE_SYSTEM_LIBBSON
 	bson_version = bson_get_version();
 #else
-	bson_version   = "bundled";
+	bson_version = "bundled";
 #endif
 
 	MONGOC_DEBUG(

Diff for: src/phongo_compat.h

@@ -172,7 +172,7 @@
 #define PHONGO_PARSE_PARAMETERS_END()                 \
 	ZEND_PARSE_PARAMETERS_END_EX(                     \
 		zend_restore_error_handling(&error_handling); \
-		return );                                     \
+		return);                                      \
 	zend_restore_error_handling(&error_handling);     \
 	}                                                 \
 	while (0)