From f5fad1aa0215ade3adca97410890dc437127c5f4 Mon Sep 17 00:00:00 2001 From: Jan Nedbal Date: Fri, 13 Jun 2025 17:23:13 +0200 Subject: [PATCH] PlatformTest: drop MSSQL database asserts --- .github/workflows/platform-test.yml | 10 ----- ...eryResultTypeWalkerFetchTypeMatrixTest.php | 40 ------------------- tests/Platform/docker/Dockerfile80 | 12 ------ tests/Platform/docker/Dockerfile81 | 12 ------ tests/Platform/docker/Dockerfile84 | 12 ------ tests/Platform/docker/docker-compose.yml | 14 +------ tests/Platform/docker/docker-setup.sh | 2 +- 7 files changed, 2 insertions(+), 100 deletions(-) diff --git a/.github/workflows/platform-test.yml b/.github/workflows/platform-test.yml index 38110353..e86f8704 100644 --- a/.github/workflows/platform-test.yml +++ b/.github/workflows/platform-test.yml @@ -15,7 +15,6 @@ jobs: env: MYSQL_HOST: '127.0.0.1' PGSQL_HOST: '127.0.0.1' - MSSQL_HOST: '127.0.0.1' strategy: fail-fast: false @@ -83,12 +82,3 @@ jobs: MYSQL_DATABASE: foo ports: - "3306:3306" - - mssql: - image: mcr.microsoft.com/mssql/server:latest - env: - ACCEPT_EULA: Y - SA_PASSWORD: 'Secret.123' - MSSQL_PID: Developer - ports: - - 1433:1433 diff --git a/tests/Platform/QueryResultTypeWalkerFetchTypeMatrixTest.php b/tests/Platform/QueryResultTypeWalkerFetchTypeMatrixTest.php index 48846980..ff21a4b5 100644 --- a/tests/Platform/QueryResultTypeWalkerFetchTypeMatrixTest.php +++ b/tests/Platform/QueryResultTypeWalkerFetchTypeMatrixTest.php @@ -541,46 +541,6 @@ public function testPgsql( ); } - /** - * @param array $data - * @param mixed $mysqlExpectedResult - * @param mixed $sqliteExpectedResult - * @param mixed $pdoPgsqlExpectedResult - * @param mixed $pgsqlExpectedResult - * @param mixed $mssqlExpectedResult - * @param self::STRINGIFY_* $stringify - * - * @dataProvider provideCases - */ - public function testUnsupportedDriver( - array $data, - string $dqlTemplate, - Type $mysqlExpectedType, - ?Type $sqliteExpectedType, - ?Type $pdoPgsqlExpectedType, - ?Type $pgsqlExpectedType, - ?Type $mssqlExpectedType, - $mysqlExpectedResult, - $sqliteExpectedResult, - $pdoPgsqlExpectedResult, - $pgsqlExpectedResult, - $mssqlExpectedResult, - string $stringify - ): void - { - $this->performDriverTest( - 'sqlsrv', - self::CONFIG_DEFAULT, - $data, - $dqlTemplate, - (string) $this->dataName(), - PHP_VERSION_ID, - $mssqlExpectedType, - $mssqlExpectedResult, - $stringify, - ); - } - /** * @param array $data * @param mixed $mysqlExpectedResult diff --git a/tests/Platform/docker/Dockerfile80 b/tests/Platform/docker/Dockerfile80 index b5312737..37b6694c 100644 --- a/tests/Platform/docker/Dockerfile80 +++ b/tests/Platform/docker/Dockerfile80 @@ -1,17 +1,5 @@ FROM php:8.0-cli -# MSSQL -RUN apt update \ - && apt install -y gnupg2 \ - && apt install -y unixodbc-dev unixodbc \ - && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ - && curl https://packages.microsoft.com/config/debian/11/prod.list > /etc/apt/sources.list.d/mssql-release.list \ - && apt update \ - && ACCEPT_EULA=Y apt install -y msodbcsql17 \ - && pecl install sqlsrv-5.11.1 \ - && pecl install pdo_sqlsrv-5.11.1 \ - && docker-php-ext-enable sqlsrv pdo_sqlsrv - COPY ./docker-setup.sh /opt/src/scripts/setup.sh RUN /opt/src/scripts/setup.sh diff --git a/tests/Platform/docker/Dockerfile81 b/tests/Platform/docker/Dockerfile81 index 650c65f9..4ef5c3df 100644 --- a/tests/Platform/docker/Dockerfile81 +++ b/tests/Platform/docker/Dockerfile81 @@ -1,17 +1,5 @@ FROM php:8.1-cli -# MSSQL -RUN apt update \ - && apt install -y gnupg2 \ - && apt install -y unixodbc-dev unixodbc \ - && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ - && curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | tee /etc/apt/sources.list.d/mssql-tools.list \ - && apt update \ - && ACCEPT_EULA=Y apt install -y msodbcsql17 \ - && pecl install sqlsrv \ - && pecl install pdo_sqlsrv \ - && docker-php-ext-enable sqlsrv pdo_sqlsrv - COPY ./docker-setup.sh /opt/src/scripts/setup.sh RUN /opt/src/scripts/setup.sh diff --git a/tests/Platform/docker/Dockerfile84 b/tests/Platform/docker/Dockerfile84 index 30b47ed2..442415a5 100644 --- a/tests/Platform/docker/Dockerfile84 +++ b/tests/Platform/docker/Dockerfile84 @@ -1,17 +1,5 @@ FROM php:8.4-cli -# MSSQL -RUN apt update \ - && apt install -y gnupg2 \ - && apt install -y unixodbc-dev unixodbc \ - && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ - && curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | tee /etc/apt/sources.list.d/mssql-tools.list \ - && apt update \ - && ACCEPT_EULA=Y apt install -y msodbcsql17 \ - && pecl install sqlsrv \ - && pecl install pdo_sqlsrv \ - && docker-php-ext-enable sqlsrv pdo_sqlsrv - COPY ./docker-setup.sh /opt/src/scripts/setup.sh RUN /opt/src/scripts/setup.sh diff --git a/tests/Platform/docker/docker-compose.yml b/tests/Platform/docker/docker-compose.yml index 4a3b0f48..f9203806 100644 --- a/tests/Platform/docker/docker-compose.yml +++ b/tests/Platform/docker/docker-compose.yml @@ -27,24 +27,14 @@ services: type: tmpfs target: /var/lib/postgresql/data - mssql: - image: mcr.microsoft.com/mssql/server:latest - environment: - ACCEPT_EULA: Y - SA_PASSWORD: 'Secret.123' - MSSQL_PID: Developer - ports: - - 1433:1433 - php80: - depends_on: [mysql, pgsql, mssql] + depends_on: [mysql, pgsql] build: context: . dockerfile: ./Dockerfile80 environment: MYSQL_HOST: mysql PGSQL_HOST: pgsql - MSSQL_HOST: mssql working_dir: /app user: ${UID:-1000}:${GID:-1000} volumes: @@ -58,7 +48,6 @@ services: environment: MYSQL_HOST: mysql PGSQL_HOST: pgsql - MSSQL_HOST: mssql working_dir: /app user: ${UID:-1000}:${GID:-1000} volumes: @@ -72,7 +61,6 @@ services: environment: MYSQL_HOST: mysql PGSQL_HOST: pgsql - MSSQL_HOST: mssql working_dir: /app user: ${UID:-1000}:${GID:-1000} volumes: diff --git a/tests/Platform/docker/docker-setup.sh b/tests/Platform/docker/docker-setup.sh index 6fb71310..d482fc89 100755 --- a/tests/Platform/docker/docker-setup.sh +++ b/tests/Platform/docker/docker-setup.sh @@ -2,7 +2,7 @@ set -ex \ && apt update \ && apt install -y bash zip libpq-dev libsqlite3-dev \ - && pecl install xdebug mongodb \ + && pecl install xdebug mongodb-1.19.4 \ && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \ && docker-php-ext-install pdo mysqli pgsql pdo_mysql pdo_pgsql pdo_sqlite \ && docker-php-ext-enable xdebug mongodb