Fixes suggested by Semmle (#1068)

* Fixes suggested by Semmle * Updated azure-pipelines
microsoft · Dec 18, 2019 · eeec2f8 · eeec2f8
1 parent afa217f
commit eeec2f8
Show file tree

Hide file tree

Showing 4 changed files with 286 additions and 293 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -2,7 +2,7 @@
 # https://aka.ms/yaml
 
 variables:
-  phpVersion: 7.3
+  phpVersion: 7.4
   server: 'localhost,1433'
   host: 'sql1'
   sqlsrv_db: 'sqlsrv_testdb'
@@ -70,7 +70,7 @@ jobs:
     inputs:
       versionSpec: '3.6'
       architecture: 'x64'
-      
+
   - script: |
       sudo update-alternatives --set php /usr/bin/php$(phpVersion)
       sudo update-alternatives --set phar /usr/bin/phar$(phpVersion)
@@ -109,13 +109,13 @@ jobs:
       sudo sed -i 's/# en_US ISO-8859-1/en_US ISO-8859-1/g' /etc/locale.gen
       sudo locale-gen en_US
       sudo locale-gen en_US.UTF-8
-      export LANG='en_US.UTF-8' 
-      export LANGUAGE='en_US:en' 
+      export LANG='en_US.UTF-8'
+      export LANGUAGE='en_US:en'
       export LC_ALL='en_US.UTF-8'
     displayName: 'Generate locales for testing'
 
   - script: |
-      echo setting env variables 
+      echo setting env variables
       export TEST_PHP_SQL_SERVER='$(server)'
       export TEST_PHP_SQL_UID='$(uid)'
       export TEST_PHP_SQL_PWD='$(pwd)'
@@ -132,7 +132,7 @@ jobs:
       ./packagize.sh
 
       dest=`php --ini | grep "Scan for additional .ini files" | sudo sed -e "s|.*:\s*||"`/
-      
+
       cd $(Build.SourcesDirectory)/source/sqlsrv
       ls -al
       phpize && ./configure && make && sudo make install
@@ -141,7 +141,7 @@ jobs:
 
       echo copying sqlsrv to $dest
       sudo cp 20-sqlsrv.ini $dest
-      
+
       cd $(Build.SourcesDirectory)/source/pdo_sqlsrv
       ls -al
       phpize && ./configure && make && sudo make install
@@ -160,7 +160,7 @@ jobs:
       sed -i -e 's/TARGET_SERVER/'"$(server)"'/g' MsSetup.inc
       sed -i -e 's/TARGET_DATABASE/'"$(sqlsrv_db)"'/g' MsSetup.inc
       sed -i -e 's/TARGET_USERNAME/'"$(uid)"'/g' MsSetup.inc
-      sed -i -e 's/TARGET_PASSWORD/'"$(pwd)"'/g' MsSetup.inc 
+      sed -i -e 's/TARGET_PASSWORD/'"$(pwd)"'/g' MsSetup.inc
 
       php run-tests.php -P ./*.phpt 2>&1 | tee ../sqlsrv.log
     displayName: 'Run sqlsrv functional tests'
@@ -170,7 +170,7 @@ jobs:
       sed -i -e 's/TARGET_SERVER/'"$(server)"'/g' MsSetup.inc
       sed -i -e 's/TARGET_DATABASE/'"$(pdo_sqlsrv_db)"'/g' MsSetup.inc
       sed -i -e 's/TARGET_USERNAME/'"$(uid)"'/g' MsSetup.inc
-      sed -i -e 's/TARGET_PASSWORD/'"$(pwd)"'/g' MsSetup.inc 
+      sed -i -e 's/TARGET_PASSWORD/'"$(pwd)"'/g' MsSetup.inc
 
       php run-tests.php -P ./*.phpt 2>&1 | tee ../pdo_sqlsrv.log
     displayName: 'Run pdo_sqlsrv functional tests'
@@ -194,7 +194,7 @@ jobs:
       docker stop $(host)
       docker rm $(host)
     displayName: 'Stop SQL Server for Linux'
-    condition: always() 
+    condition: always()
 
 - job: Windows
   pool:
@@ -249,7 +249,7 @@ jobs:
   - script: msiexec /i "msodbcsql_13.1.msi" /q IACCEPTMSODBCSQLLICENSETERMS=YES ADDLOCAL=ALL
     condition: false
 
-  # FOR SOME REASON the set up did not set the PATH 
+  # FOR SOME REASON the set up did not set the PATH
   - script: |
       msiexec /i "MsSqlCmdLnUtils.msi" /qn IACCEPTMSSQLCMDLNUTILSLICENSETERMS=YES
     displayName: 'Install SQL command line utilities version 15'
@@ -260,7 +260,7 @@ jobs:
       $client.Headers.Add("user-agent", "azure pipeline build")
       $client.DownloadFile("https://windows.php.net/downloads/releases/sha256sum.txt", "sha256sum.txt")
       $env:VERSION=type sha256sum.txt | where { $_ -match "php-($(phpVersion)\.\d+)-src" } | foreach { $matches[1] }
-      Write-Host "Latest PHP $(phpVersion) is ${env:VERSION}" 
+      Write-Host "Latest PHP $(phpVersion) is ${env:VERSION}"
       cd $(Build.SourcesDirectory)/buildscripts/
       python builddrivers.py --PHPVER=${env:VERSION} --DRIVER=sqlsrv --ARCH=x64 --THREAD=nts --SOURCE=$(Build.SourcesDirectory)/source --TESTING --NO_RENAME
       dir *sqlsrv*.dll
@@ -270,7 +270,7 @@ jobs:
       dir *sqlsrv*.dll
       cp *sqlsrv*.dll C:\tools\php\ext\
     displayName: 'Build drivers (separately) for the latest version of PHP $(phpVersion)'
-  
+
   - script: |
       echo extension=php_sqlsrv.dll >> C:\tools\php\php.ini
       echo extension=php_pdo_sqlsrv.dll >> C:\tools\php\php.ini
@@ -285,7 +285,7 @@ jobs:
     displayName: 'Run SQL Server for Windows Server'
     condition: false
 
-  - script: | 
+  - script: |
       set path=C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;%path%
       sqlcmd -S $(host) -U $(uid) -P $(pwd) -Q "SELECT @@Version"
       set TEST_PHP_SQL_SERVER=$(host)
@@ -309,4 +309,4 @@ jobs:
       docker stop sqlcontainer
       docker rm sqlcontainer
     displayName: 'Stop SQL Server for Windows Server'
-    condition: false
+    condition: false