From 2ef70f1d0ad6fc91d466ce761a7255008cf20825 Mon Sep 17 00:00:00 2001
From: yitam <v-yitam@microsoft.com>
Date: Tue, 2 May 2017 12:29:40 -0700
Subject: [PATCH] docker and appveyor to use MsSetup

---
 Dockerfile-msphpsql         | 12 ++++++++----
 appveyor.yml                |  8 ++++----
 test/pdo_sqlsrv/MsSetup.inc |  8 ++++----
 test/sqlsrv/MsSetup.inc     |  8 ++++----
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/Dockerfile-msphpsql b/Dockerfile-msphpsql
index bd0e5d85..18fda160 100644
--- a/Dockerfile-msphpsql
+++ b/Dockerfile-msphpsql
@@ -68,12 +68,16 @@ RUN phpize && ./configure LDFLAGS="-lgcov" CXXFLAGS="-O0 --coverage" && make &&
 
 # set name of sql server host to use
 WORKDIR $PHPSQLDIR/test/pdo_sqlsrv
-RUN sed -i -e 's/localhost/sql/g' autonomous_setup.php
-RUN sed -i -e 's/<YourStrong!Passw0rd>/'"$TEST_PHP_SQL_PWD"'/g' autonomous_setup.php
+RUN sed -i -e 's/TARGET_SERVER/sql/g' MsSetup.inc
+RUN sed -i -e 's/TARGET_SERVER/msphpsql_pdosqlsrv/g' MsSetup.inc
+RUN sed -i -e 's/USERNAME/'"$TEST_PHP_SQL_UID"'/g' MsSetup.inc
+RUN sed -i -e 's/PASSWORD/'"$TEST_PHP_SQL_PWD"'/g' MsSetup.inc
 
 WORKDIR $PHPSQLDIR/test/sqlsrv
-RUN sed -i -e 's/localhost/sql/g' autonomous_setup.php
-RUN sed -i -e 's/<YourStrong!Passw0rd>/'"$TEST_PHP_SQL_PWD"'/g' autonomous_setup.php
+RUN sed -i -e 's/TARGET_SERVER/sql/g' MsSetup.inc
+RUN sed -i -e 's/TARGET_SERVER/msphpsql_sqlsrv/g' MsSetup.inc
+RUN sed -i -e 's/USERNAME/'"$TEST_PHP_SQL_UID"'/g' MsSetup.inc
+RUN sed -i -e 's/PASSWORD/'"$TEST_PHP_SQL_PWD"'/g' MsSetup.inc
 
 ENV REPORT_EXIT_STATUS 1
 ENV TEST_PHP_EXECUTABLE /usr/bin/php
diff --git a/appveyor.yml b/appveyor.yml
index 5690bc5e..83ba0421 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -122,10 +122,10 @@ install:
     - 7z x -y php-sdk-binary-tools-20110915.zip -o%PHP_SDK%
     - 7z x -y php.zip -o%PHP_SDK_DIR%
     - echo update SQL connection string
-    - ps: (Get-Content ${env:APPVEYOR_BUILD_FOLDER}\test\pdo_sqlsrv\autonomous_setup.php) | ForEach-Object { $_ -replace "localhost",  ${env:TEST_PHP_SQL_SERVER} -replace "<YourStrong!Passw0rd>",  ${env:TEST_PHP_SQL_PWD} } | Set-Content ${env:APPVEYOR_BUILD_FOLDER}\test\pdo_sqlsrv\autonomous_setup.php
-    - ps: Get-Content ${env:APPVEYOR_BUILD_FOLDER}\test\pdo_sqlsrv\autonomous_setup.php
-    - ps: (Get-Content ${env:APPVEYOR_BUILD_FOLDER}\test\sqlsrv\autonomous_setup.php) | ForEach-Object { $_ -replace "localhost",  ${env:TEST_PHP_SQL_SERVER} -replace "<YourStrong!Passw0rd>",  ${env:TEST_PHP_SQL_PWD} } | Set-Content ${env:APPVEYOR_BUILD_FOLDER}\test\sqlsrv\autonomous_setup.php
-    - ps: Get-Content ${env:APPVEYOR_BUILD_FOLDER}\test\sqlsrv\autonomous_setup.php
+    - ps: (Get-Content ${env:APPVEYOR_BUILD_FOLDER}\test\pdo_sqlsrv\MsSetup.inc) | ForEach-Object { $_ -replace "TARGET_SERVER", ${env:TEST_PHP_SQL_SERVER} -replace "TARGET_DATABASE", ${env:PDOSQLSRV_DBNAME} -replace "USERNAME",  ${env:TEST_PHP_SQL_UID} -replace "PASSWORD",  ${env:TEST_PHP_SQL_PWD} } | Set-Content ${env:APPVEYOR_BUILD_FOLDER}\test\pdo_sqlsrv\MsSetup.inc
+    - ps: Get-Content ${env:APPVEYOR_BUILD_FOLDER}\test\pdo_sqlsrv\MsSetup.inc
+    - ps: (Get-Content ${env:APPVEYOR_BUILD_FOLDER}\test\sqlsrv\MsSetup.inc) | ForEach-Object { $_ -replace "TARGET_SERVER", ${env:TEST_PHP_SQL_SERVER} -replace "TARGET_DATABASE", ${env:SQLSRV_DBNAME} -replace "USERNAME",  ${env:TEST_PHP_SQL_UID} -replace "PASSWORD",  ${env:TEST_PHP_SQL_PWD} } | Set-Content ${env:APPVEYOR_BUILD_FOLDER}\test\sqlsrv\MsSetup.inc
+    - ps: Get-Content ${env:APPVEYOR_BUILD_FOLDER}\test\sqlsrv\MsSetup.inc
         
 build_script:
     - '"C:\\Program Files (x86)\\Microsoft Visual Studio %PHP_VC%.0\\VC\\vcvarsall.bat" %BUILD_PLATFORM%'
diff --git a/test/pdo_sqlsrv/MsSetup.inc b/test/pdo_sqlsrv/MsSetup.inc
index 83da1943..9be16295 100644
--- a/test/pdo_sqlsrv/MsSetup.inc
+++ b/test/pdo_sqlsrv/MsSetup.inc
@@ -14,10 +14,10 @@ if (isset($_ENV['MSSQL_SERVER']) || isset($_ENV['MSSQL_USER']) || isset($_ENV['M
     $databaseName = $_ENV['MSSQL_DATABASE_NAME'];
     $DriverName = $_ENV['MSSQL_DRIVER_NAME'];
 } else {
-    $server = 'SQL-2K12-SP3-1.galaxy.ad';
-    $uid = 'sa';
-    $pwd = 'Moonshine4me';
-    $databaseName = 'test_win123';
+    $server = 'TARGET_SERVER';
+    $uid = 'USERNAME';
+    $pwd = 'PASSWORD';
+    $databaseName = 'TARGET_DATABASE';
     $DriverName = "ODBC Driver 11 for SQL Server";
 }
 
diff --git a/test/sqlsrv/MsSetup.inc b/test/sqlsrv/MsSetup.inc
index 3a8dbbe7..718ad4c4 100644
--- a/test/sqlsrv/MsSetup.inc
+++ b/test/sqlsrv/MsSetup.inc
@@ -9,10 +9,10 @@
 */
 $PhpDriver = "Microsoft SQL Server Driver for PHP";
 
-$server = 'SQL-2K12-SP3-1.galaxy.ad';
-$database = 'test_win123';
-$userName = 'sa';
-$userPassword = 'Moonshine4me';
+$server = 'TARGET_SERVER';
+$dbName = 'TARGET_DATABASE';
+$userName = 'USERNAME';
+$userPassword = 'PASSWORD';
 
 $tableName = "php_test_table";
 $tableIndex = "php_test_table_index";