From afa217f002e29665214ee5c1e56b1b71f533d8a1 Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Wed, 4 Dec 2019 17:08:52 -0800
Subject: [PATCH] Updated appveyor yml to build 7.3 and 7.4 (#1065)

---
 appveyor.yml                                       | 14 +++++++-------
 .../pdo_ae_azure_key_vault_keywords.phpt           |  2 +-
 .../sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index ef9870ef..a473ab3f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,22 +24,22 @@ environment:
         SQL_INSTANCE: SQL2017
         PHP_VC: 15
         PHP_MAJOR_VER: 7.3
-        PHP_MINOR_VER: 11
+        PHP_MINOR_VER: latest
         PHP_EXE_PATH: x64\Release_TS
         THREAD: ts
         platform: x64
-      - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
         BUILD_PLATFORM: x86
         TEST_PHP_SQL_SERVER: (local)\SQL2016
         SQL_INSTANCE: SQL2016
-        PHP_VC: 14
-        PHP_MAJOR_VER: 7.1
+        PHP_VC: 15
+        PHP_MAJOR_VER: 7.4
         PHP_MINOR_VER: latest
         PHP_EXE_PATH: Release
         THREAD: nts
         platform: x86
 
-# PHP_MAJOR_VER is PHP major version to build (7.2, 7.3)
+# PHP_MAJOR_VER is PHP major version to build (7.4, 7.3)
 # PHP_MINOR_VER is PHP point release number (or latest for latest release)
 # PHP_VC is the Visual C++ version
 # PHP_EXE_PATH is the relative path from php src folder to php executable
@@ -75,9 +75,9 @@ install:
     - ps: | 
         $client = New-Object Net.WebClient;
         $client.Headers.Add("user-agent", "appveyor-ci-build2");
-        $client.DownloadFile("http://windows.php.net/downloads/releases/sha1sum.txt", "c:\projects\sha1sum.txt");
+        $client.DownloadFile("http://windows.php.net/downloads/releases/sha256sum.txt", "c:\projects\sha256sum.txt");
         If ($env:PHP_MINOR_VER -Match "latest") {
-            $env:PHP_VERSION=type c:\projects\sha1sum.txt | where { $_ -match "php-($env:PHP_MAJOR_VER\.\d+)-src" } | foreach { $matches[1] }  ;
+            $env:PHP_VERSION=type c:\projects\sha256sum.txt | where { $_ -match "php-($env:PHP_MAJOR_VER\.\d+)-src" } | foreach { $matches[1] }  ;
         } Else {
             $env:PHP_VERSION=$env:PHP_MAJOR_VER + '.' + $env:PHP_MINOR_VER;
         }
diff --git a/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt b/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt
index 2e22a203..188bb176 100644
--- a/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt
@@ -59,7 +59,7 @@ if (!$conn) {
     $query = "SELECT [name], [value], [value_in_use] FROM sys.configurations WHERE [name] = 'column encryption enclave type';";
     $stmt = $conn->query($query);
     $info = $stmt->fetch();
-    if ($info['value'] == 1 and $info['value_in_use'] == 1) {
+    if (!empty($info) and $info['value'] == 1 and $info['value_in_use'] == 1) {
         $isEnclaveEnabled = true;
     }
 
diff --git a/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt b/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt
index e6f03d27..77e459d7 100644
--- a/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt
+++ b/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt
@@ -62,7 +62,7 @@ if (!$conn) {
     $query = "SELECT [name], [value], [value_in_use] FROM sys.configurations WHERE [name] = 'column encryption enclave type';";
     $stmt = sqlsrv_query($conn, $query);
     $info = sqlsrv_fetch_array($stmt);
-    if ($info['value'] == 1 and $info['value_in_use'] == 1) {
+    if (!empty($info) and $info['value'] == 1 and $info['value_in_use'] == 1) {
         $isEnclaveEnabled = true;
     }