cleanup TSRMLS usage

.travis.yml

@@ -20,10 +20,10 @@ env:
   - TEST_PHP_SQL_PWD=Password123
 
 before_install:
-  - docker pull microsoft/mssql-server-linux:2017-latest
+  - docker pull mcr.microsoft.com/mssql/server:2019-latest
 
 install:
-  - docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=Password123' -p 1433:1433 --name=$TEST_PHP_SQL_SERVER -d microsoft/mssql-server-linux:2017-latest
+  - docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=Password123' -p 1433:1433 --name=$TEST_PHP_SQL_SERVER -d mcr.microsoft.com/mssql/server:2019-latest
   - docker build --build-arg PHPSQLDIR=$PHPSQLDIR -t msphpsql-dev -f Dockerfile-msphpsql .
 
 before_script:
@@ -43,7 +43,7 @@ script:
   - docker exec client bash -c 'for f in ./test/functional/pdo_sqlsrv/*.out; do ls $f 2>/dev/null; cat $f 2>/dev/null; done || true' 
   - docker exec client python ./test/functional/setup/cleanup_dbs.py -dbname $SQLSRV_DBNAME
   - docker exec client python ./test/functional/setup/cleanup_dbs.py -dbname $PDOSQLSRV_DBNAME
-  - docker exec client coveralls -e ./source/shared/ --gcov-options '\-lp'
+  - docker exec client coveralls -i ./source/ -e ./source/shared/ -e ./test/ --gcov-options '\-lp'
   - docker stop client
   - docker ps -a 
 

Dockerfile-msphpsql

@@ -1,55 +1,61 @@
-#Download base image ubuntu 16.04
+# Download base image ubuntu 18.04
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 # Update Ubuntu Software repository
 RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \
+    apt-get install -y software-properties-common && \
+    add-apt-repository ppa:ondrej/php -y && \
     apt-get -y install \
-    apt-transport-https     \
+    apt-transport-https \
     apt-utils \
     autoconf \
     curl \
-    libcurl3 \
+    libcurl4 \
     g++ \
     gcc    \
     git \
     lcov \
     libxml2-dev \
     locales \
     make \
-    php7.0 \
-    php7.0-dev \
+    php7.3 \
+    php7.3-dev \
+    php7.3-intl \
     python-pip \
     re2c \
     unixodbc-dev \
-    unzip && apt-get clean
-
+    unzip && apt-get clean && \
+    curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \
+    curl https://packages.microsoft.com/config/ubuntu/18.04/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
+    apt-get -y update && \
+    export ACCEPT_EULA=Y && apt-get -y install msodbcsql17 mssql-tools && \
+    update-alternatives --set php /usr/bin/php7.3
+
 ARG PHPSQLDIR=/REPO/msphpsql-dev
 ENV TEST_PHP_SQL_SERVER sql
 ENV TEST_PHP_SQL_UID sa
 ENV TEST_PHP_SQL_PWD Password123
 
-# add locale iso-8859-1
+# update PATH after ODBC driver and tools are installed
+ENV PATH="/opt/mssql-tools/bin:${PATH}"	
+
+# add locales for testing
 RUN sed -i 's/# en_US ISO-8859-1/en_US ISO-8859-1/g' /etc/locale.gen
-RUN locale-gen en_US
+RUN sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen
+RUN sed -i 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/g' /etc/locale.gen
+RUN locale-gen
 
 # set locale to utf-8
-RUN locale-gen en_US.UTF-8
+# RUN locale-gen en_US.UTF-8
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
-#install ODBC driver	
-RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -	
-RUN curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list > /etc/apt/sources.list.d/mssql-release.list	
-
-RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && ACCEPT_EULA=Y apt-get install -y msodbcsql17 mssql-tools
-ENV PATH="/opt/mssql-tools/bin:${PATH}"	
-
-#install coveralls (upgrade both pip and requests first)
+# install coveralls (upgrade both pip and requests first)
 RUN python -m pip install --upgrade pip
 RUN python -m pip install --upgrade requests
 RUN python -m pip install cpp-coveralls
 
-#Either Install git / download zip (One can see other strategies : https://ryanfb.github.io/etc/2015/07/29/git_strategies_for_docker.html )
+# Either Install git / download zip (One can see other strategies : https://ryanfb.github.io/etc/2015/07/29/git_strategies_for_docker.html )
 #One option is to get source from zip file of repository.
 #another option is to copy source to build directory on image
 RUN mkdir -p $PHPSQLDIR
@@ -59,14 +65,21 @@ WORKDIR $PHPSQLDIR/source/
 RUN chmod +x ./packagize.sh
 RUN /bin/bash -c "./packagize.sh"
 
-RUN echo "extension = pdo_sqlsrv.so" >> /etc/php/7.0/cli/conf.d/20-pdo_sqlsrv.ini
-RUN echo "extension = sqlsrv.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+RUN echo "; priority=20\nextension=sqlsrv.so\n" > /etc/php/7.3/mods-available/sqlsrv.ini
+RUN echo "; priority=30\nextension=pdo_sqlsrv.so\n" > /etc/php/7.3/mods-available/pdo_sqlsrv.ini
+
+# create a writable ini file for testing locales
+RUN echo '' > `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/99-overrides.ini
+RUN chmod 666 `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/99-overrides.ini
 
 WORKDIR $PHPSQLDIR/source/sqlsrv
-RUN phpize && ./configure LDFLAGS="-lgcov" CXXFLAGS="-O0 --coverage" && make && make install
+RUN /usr/bin/phpize && ./configure LDFLAGS="-lgcov" CXXFLAGS="-O0 --coverage" && make && make install
 
 WORKDIR $PHPSQLDIR/source/pdo_sqlsrv
-RUN phpize && ./configure LDFLAGS="-lgcov" CXXFLAGS="-O0 --coverage" && make && make install
+RUN /usr/bin/phpize && ./configure LDFLAGS="-lgcov" CXXFLAGS="-O0 --coverage" && make && make install
+
+RUN phpenmod sqlsrv pdo_sqlsrv
+RUN php --ri sqlsrv && php --ri pdo_sqlsrv
 
 # set name of sql server host to use
 WORKDIR $PHPSQLDIR/test/functional/pdo_sqlsrv

LICENSE

@@ -1,4 +1,4 @@
-Copyright(c) 2018 Microsoft Corporation
+Copyright(c) 2020 Microsoft Corporation
 All rights reserved.
 
 MIT License