Add more test coverage for ext/odbc

.cirrus.yml

@@ -1,186 +1,6 @@
 env:
   CIRRUS_CLONE_DEPTH: 1
 
-asan_task:
-  name: ASAN_DEBUG_NTS
-  container:
-    image: gcc:latest
-    additional_containers:
-      - name: mysql
-        image: mysql:8
-        port: 3306
-        cpu: 1.0
-        memory: 1G
-        env:
-          MYSQL_ROOT_PASSWORD: "root"
-          MYSQL_DATABASE: "test"
-  install_script:
-    - apt-get update -y
-    - >-
-        apt-get install -y
-        bison
-        re2c
-        locales
-        locales-all
-        `#ldap-utils`
-        openssl
-        `slapd`
-        libgmp-dev
-        libicu-dev
-        `#libtidy-dev`
-        `#libenchant-dev`
-        libaspell-dev
-        libpspell-dev
-        libsasl2-dev
-        libxpm-dev
-        libzip-dev
-        `#libsqlite3-dev`
-        libwebp-dev
-        libonig-dev
-        libkrb5-dev
-        libgssapi-krb5-2
-        libcurl4-openssl-dev
-        libxml2-dev
-        libxslt1-dev
-        libpq-dev
-        libreadline-dev
-        `#libldap2-dev`
-        libsodium-dev
-        libargon2-0-dev
-        libmm-dev
-        `#libsnmp-dev`
-        `#postgresql`
-        `#postgresql-contrib`
-        `#snmpd`
-        `#snmp-mibs-downloader`
-        `#freetds-dev`
-        `#unixodbc-dev`
-        llvm
-        clang
-        libc-client-dev
-        dovecot-core
-        dovecot-pop3d
-        dovecot-imapd
-        `#sendmail`
-        `#firebird-dev`
-        liblmdb-dev
-        libtokyocabinet-dev
-        libdb-dev
-        libqdbm-dev
-        libjpeg-dev
-        libpng-dev
-        libfreetype6-dev
-  build_script:
-    - ./buildconf -f
-    - >-
-        ./configure
-        --enable-debug
-        --enable-zts
-        --enable-option-checking=fatal
-        --prefix=/usr
-        --enable-phpdbg
-        --enable-fpm
-        --enable-opcache
-        --disable-opcache-jit
-        --with-pdo-mysql=mysqlnd
-        --with-mysqli=mysqlnd
-        `#--with-pgsql`
-        `#--with-pdo-pgsql`
-        `#--with-pdo-sqlite`
-        --enable-intl
-        --without-pear
-        --enable-gd
-        --with-jpeg
-        --with-webp
-        --with-freetype
-        --with-xpm
-        --enable-exif
-        --with-zip
-        --with-zlib
-        --with-zlib-dir=/usr
-        --enable-soap
-        --enable-xmlreader
-        --with-xsl
-        `#--with-tidy`
-        --enable-sysvsem
-        --enable-sysvshm
-        --enable-shmop
-        --enable-pcntl
-        --with-readline
-        --enable-mbstring
-        --with-curl
-        --with-gettext
-        --enable-sockets
-        --with-bz2
-        --with-openssl
-        --with-gmp
-        --enable-bcmath
-        --enable-calendar
-        --enable-ftp
-        --with-pspell=/usr
-        `#--with-enchant=/usr`
-        --with-kerberos
-        --enable-sysvmsg
-        --with-ffi
-        --enable-zend-test
-        `#--enable-dl-test=shared`
-        `#--with-ldap`
-        `#--with-ldap-sasl`
-        --with-password-argon2
-        --with-mhash
-        --with-sodium
-        --enable-dba
-        --with-cdb
-        --enable-flatfile
-        --enable-inifile
-        --with-tcadb
-        --with-lmdb
-        --with-qdbm
-        `#--with-snmp`
-        `#--with-unixODBC`
-        `#--with-imap`
-        --with-kerberos
-        --with-imap-ssl
-        `#--with-pdo-odbc=unixODBC,/usr`
-        `#--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient`
-        `#--with-oci8=shared,instantclient,/opt/oracle/instantclient`
-        --with-config-file-path=/etc
-        --with-config-file-scan-dir=/etc/php.d
-        `#--with-pdo-firebird`
-        `#--with-pdo-dblib`
-        --enable-werror
-        CFLAGS='-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC' LDFLAGS='-fsanitize=undefined,address'
-        CC=clang
-        CXX=clang++
-    - make -j2
-    - make install
-    - mkdir -p /etc/php.d
-    - echo opcache.enable_cli=1 > /etc/php.d/opcache.ini
-    - echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
-    # Specify opcache.preload_user as we're running as root.
-    - echo opcache.preload_user=root >> /etc/php.d/opcache.ini
-  tests_script:
-    - export SKIP_IO_CAPTURE_TESTS=1
-    - export CI_NO_IPV6=1
-    - export MYSQL_TEST_HOST=127.0.0.1
-    - export MYSQL_TEST_USER=root
-    - export MYSQL_TEST_PASSWD=root
-    - export PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=test"
-    - export PDO_MYSQL_TEST_USER=root
-    - export PDO_MYSQL_TEST_PASS=root
-    - >-
-        sapi/cli/php run-tests.php
-        -P -q -x -j2
-        -g FAIL,BORK,LEAK,XLEAK
-        --no-progress
-        --offline
-        --show-diff
-        --show-slow 1000
-        --set-timeout 120
-        -d zend_extension=opcache.so
-        -d opcache.enable_cli=1
-        --asan
-
 freebsd_task:
   name: FREEBSD_DEBUG_NTS
   freebsd_instance:

.gitattributes

@@ -19,11 +19,11 @@
 *.php diff=php
 *.[ch] diff=cpp
 
-# Collapse generated files within a pull request.
-**/*_arginfo.h linguist-generated
-/Zend/zend_vm_execute.h linguist-generated
-/Zend/zend_vm_handlers.h linguist-generated
-/Zend/zend_vm_opcodes.[ch] linguist-generated
+# Collapse generated files within git and pull request diff.
+**/*_arginfo.h linguist-generated -diff
+/Zend/zend_vm_execute.h linguist-generated -diff
+/Zend/zend_vm_handlers.h linguist-generated -diff
+/Zend/zend_vm_opcodes.[ch] linguist-generated -diff
 
 # The OSS fuzz files are bunary
 /ext/date/tests/ossfuzz*.txt binary

.github/actions/apt-x64/action.yml

@@ -46,6 +46,7 @@ runs:
           freetds-dev \
           unixodbc-dev \
           llvm \
+          clang \
           libc-client-dev \
           dovecot-core \
           dovecot-pop3d \

.github/actions/configure-x64/action.yml

@@ -3,6 +3,9 @@ inputs:
   configurationParameters:
     default: ''
     required: false
+  skipSlow:
+    default: false
+    required: false
 runs:
   using: composite
   steps:
@@ -17,9 +20,9 @@ runs:
           --enable-fpm \
           --with-pdo-mysql=mysqlnd \
           --with-mysqli=mysqlnd \
-          --with-pgsql \
-          --with-pdo-pgsql \
-          --with-pdo-sqlite \
+          ${{ inputs.skipSlow == 'false' && '--with-pgsql' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-pdo-pgsql' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-pdo-sqlite' || '' }} \
           --enable-intl \
           --without-pear \
           --enable-gd \
@@ -34,7 +37,7 @@ runs:
           --enable-soap \
           --enable-xmlreader \
           --with-xsl \
-          --with-tidy \
+          ${{ inputs.skipSlow == 'false' && '--with-tidy' || '' }} \
           --enable-sysvsem \
           --enable-sysvshm \
           --enable-shmop \
@@ -51,14 +54,14 @@ runs:
           --enable-calendar \
           --enable-ftp \
           --with-pspell=/usr \
-          --with-enchant=/usr \
+          ${{ inputs.skipSlow == 'false' && '--with-enchant=/usr' || '' }} \
           --with-kerberos \
           --enable-sysvmsg \
           --with-ffi \
           --enable-zend-test \
-          --enable-dl-test=shared \
-          --with-ldap \
-          --with-ldap-sasl \
+          ${{ inputs.skipSlow == 'false' && '--enable-dl-test=shared' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-ldap' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-ldap-sasl' || '' }} \
           --with-password-argon2 \
           --with-mhash \
           --with-sodium \
@@ -69,16 +72,16 @@ runs:
           --with-tcadb \
           --with-lmdb \
           --with-qdbm \
-          --with-snmp \
-          --with-unixODBC \
-          --with-imap \
-          --with-imap-ssl \
-          --with-pdo-odbc=unixODBC,/usr \
-          --with-pdo-oci=shared,instantclient,/opt/oracle/instantclient \
-          --with-oci8=shared,instantclient,/opt/oracle/instantclient \
+          ${{ inputs.skipSlow == 'false' && '--with-snmp' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-unixODBC' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-imap' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-imap-ssl' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-pdo-odbc=unixODBC,/usr' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-oci8=shared,instantclient,/opt/oracle/instantclient' || '' }} \
           --with-config-file-path=/etc \
           --with-config-file-scan-dir=/etc/php.d \
-          --with-pdo-firebird \
-          --with-pdo-dblib \
+          ${{ inputs.skipSlow == 'false' && '--with-pdo-firebird' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-pdo-dblib' || '' }} \
           --enable-werror \
           ${{ inputs.configurationParameters }}

.github/actions/install-linux/action.yml

@@ -1,4 +1,8 @@
 name: Install
+inputs:
+  withOci:
+    default: true
+    required: false
 runs:
   using: composite
   steps:
@@ -10,5 +14,5 @@ runs:
         sudo chmod 777 /etc/php.d
         echo mysqli.default_socket=/var/run/mysqld/mysqld.sock    > /etc/php.d/mysqli.ini
         echo pdo_mysql.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/pdo_mysql.ini
-        echo extension=oci8.so    > /etc/php.d/oci8.ini
-        echo extension=pdo_oci.so > /etc/php.d/pdo_oci.ini
+        ${{ inputs.withOci == 'true' && 'echo extension=oci8.so > /etc/php.d/oci8.ini' || '' }}
+        ${{ inputs.withOci == 'true' && 'echo extension=pdo_oci.so > /etc/php.d/pdo_oci.ini' || '' }}

.github/actions/setup-windows/action.yml

@@ -0,0 +1,18 @@
+name: Setup
+runs:
+  using: composite
+  steps:
+    - name: Setup MySQL
+      shell: pwsh
+      run: |
+        choco install mysql -y --no-progress --params="/port:3306"
+        mysql.exe --port=3306 --user=root --password="" -e "ALTER USER 'root'@'localhost' IDENTIFIED BY 'Password12!'; FLUSH PRIVILEGES;"
+    - name: Setup MSSQL
+      shell: pwsh
+      run: |
+        choco install sql-server-express -y --no-progress --install-arguments="/SECURITYMODE=SQL /SAPWD=Password12!"
+    - name: Setup PostgreSQL
+      shell: pwsh
+      run: |
+        Set-Service -Name "postgresql-x64-14" -StartupType manual -Status Running
+        pwsh -Command { $env:PGPASSWORD="root"; & "$env:PGBIN\psql" -U postgres -c "ALTER USER postgres WITH PASSWORD 'Password12!';" }

.github/actions/setup-x64/action.yml

@@ -12,6 +12,8 @@ runs:
         # Ensure local_infile tests can run.
         mysql -uroot -proot -e "SET GLOBAL local_infile = true"
         docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;"
+        docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "create login odbc_test with password='password', check_policy=off; create user odbc_test for login odbc_test; grant alter, control, delete to odbc_test;"
+        docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "ALTER SERVER ROLE sysadmin ADD MEMBER odbc_test;"
         sudo locale-gen de_DE
 
         ./.github/scripts/setup-slapd.sh

.github/actions/test-linux/action.yml

@@ -30,6 +30,10 @@ runs:
         export PDO_OCI_TEST_DSN="oci:dbname=localhost/XEPDB1;charset=AL32UTF8"
         export PGSQL_TEST_CONNSTR="host=postgres dbname=test port=5432 user=postgres password=postgres"
         export PDO_PGSQL_TEST_DSN="host=postgres dbname=test port=5432 user=postgres password=postgres"
+        export ODBC_TEST_USER="odbc_test"
+        export ODBC_TEST_PASS="password"
+        export ODBC_TEST_DSN="Driver={ODBC Driver 17 for SQL Server};Server=127.0.0.1;Database=master;uid=$ODBC_TEST_USER;pwd=$ODBC_TEST_PASS"
+        export PDO_ODBC_TEST_DSN="odbc:$ODBC_TEST_DSN"
         export SKIP_IO_CAPTURE_TESTS=1
         export TEST_PHP_JUNIT=junit.out.xml
         export STACK_LIMIT_DEFAULTS_CHECK=1

.github/workflows/nightly.yml

@@ -836,3 +836,38 @@ jobs:
         uses: ./.github/actions/notify-slack
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
+  WINDOWS:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - x64: true
+            zts: true
+            opcache: true
+          - x64: false
+            zts: false
+            opcache: false
+    name: "WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
+    runs-on: windows-2019
+    env:
+      PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
+      PHP_BUILD_OBJ_DIR: C:\obj
+      PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
+      PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0
+      PHP_BUILD_CRT: vs16
+      PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
+      THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"
+      INTRINSICS: "${{ matrix.zts && 'AVX2' || '' }}"
+      PARALLEL: -j2
+      OPCACHE: "${{ matrix.opcache && '1' || '0' }}"
+    steps:
+      - name: git config
+        run: git config --global core.autocrlf false && git config --global core.eol lf
+      - name: git checkout
+        uses: actions/checkout@v3
+      - name: Setup
+        uses: ./.github/actions/setup-windows
+      - name: Build
+        run: .github/scripts/windows/build.bat
+      - name: Test
+        run: .github/scripts/windows/test.bat