Merge branch 'v1.6'

Author: jmikola

.appveyor.yml

@@ -13,26 +13,36 @@ environment:
   SDK_BRANCH: php-sdk-2.1.1
 
   matrix:
-    - PHP_REL: 7.3
+    - PHP_REL: 7.4
       ARCHITECTURE: x64
       ZTS_STATE: enable
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       PHP_BUILD_CRT: vc15
-    - PHP_REL: 7.3
+    - PHP_REL: 7.4
       ARCHITECTURE: x64
       ZTS_STATE: disable
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       PHP_BUILD_CRT: vc15
-    - PHP_REL: 7.3
+    - PHP_REL: 7.4
       ARCHITECTURE: x86
       ZTS_STATE: enable
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       PHP_BUILD_CRT: vc15
-    - PHP_REL: 7.3
+    - PHP_REL: 7.4
       ARCHITECTURE: x86
       ZTS_STATE: disable
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       PHP_BUILD_CRT: vc15
+    - PHP_REL: 7.3
+      ARCHITECTURE: x64
+      ZTS_STATE: enable
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      PHP_BUILD_CRT: vc15
+    - PHP_REL: 7.3
+      ARCHITECTURE: x64
+      ZTS_STATE: disable
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      PHP_BUILD_CRT: vc15
     - PHP_REL: 7.2
       ARCHITECTURE: x64
       ZTS_STATE: enable
@@ -48,6 +58,16 @@ environment:
       ZTS_STATE: enable
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       PHP_BUILD_CRT: vc14
+    - PHP_REL: 7.1
+      ARCHITECTURE: x64
+      ZTS_STATE: disable
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      PHP_BUILD_CRT: vc14
+    - PHP_REL: 7.1
+      ARCHITECTURE: x86
+      ZTS_STATE: enable
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      PHP_BUILD_CRT: vc14
     - PHP_REL: 7.1
       ARCHITECTURE: x86
       ZTS_STATE: disable

config.w32

@@ -248,8 +248,10 @@ if (PHP_MONGODB != "no") {
 
   if (typeof COMPILER_NAME === 'string') {
     mongoc_opts.MONGOC_CC = COMPILER_NAME;
-  } else if (typeof VC_VERSIONS[VCVERS] === 'string') {
+  } else if (typeof VC_VERSIONS === 'array' && typeof VC_VERSIONS[VCVERS] === 'string') {
     mongoc_opts.MONGOC_CC = VC_VERSIONS[VCVERS];
+  } else if (typeof COMPILER_NAME_LONG === 'string') {
+    mongoc_opts.MONGOC_CC = COMPILER_NAME_LONG;
   }
 
   /* MONGOC_USER_SET_CFLAGS and MONGOC_USER_SET_LDFLAGS can be left blank, as we