Skip to content

Commit d805e14

Browse files
janedbalondrejmirtes
authored andcommitted
PlatformTest: drop MSSQL database asserts
1 parent adf1826 commit d805e14

File tree

7 files changed

+2
-100
lines changed

7 files changed

+2
-100
lines changed

.github/workflows/platform-test.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
env:
1616
MYSQL_HOST: '127.0.0.1'
1717
PGSQL_HOST: '127.0.0.1'
18-
MSSQL_HOST: '127.0.0.1'
1918

2019
strategy:
2120
fail-fast: false
@@ -83,12 +82,3 @@ jobs:
8382
MYSQL_DATABASE: foo
8483
ports:
8584
- "3306:3306"
86-
87-
mssql:
88-
image: mcr.microsoft.com/mssql/server:latest
89-
env:
90-
ACCEPT_EULA: Y
91-
SA_PASSWORD: 'Secret.123'
92-
MSSQL_PID: Developer
93-
ports:
94-
- 1433:1433

tests/Platform/QueryResultTypeWalkerFetchTypeMatrixTest.php

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -541,46 +541,6 @@ public function testPgsql(
541541
);
542542
}
543543

544-
/**
545-
* @param array<string, mixed> $data
546-
* @param mixed $mysqlExpectedResult
547-
* @param mixed $sqliteExpectedResult
548-
* @param mixed $pdoPgsqlExpectedResult
549-
* @param mixed $pgsqlExpectedResult
550-
* @param mixed $mssqlExpectedResult
551-
* @param self::STRINGIFY_* $stringify
552-
*
553-
* @dataProvider provideCases
554-
*/
555-
public function testUnsupportedDriver(
556-
array $data,
557-
string $dqlTemplate,
558-
Type $mysqlExpectedType,
559-
?Type $sqliteExpectedType,
560-
?Type $pdoPgsqlExpectedType,
561-
?Type $pgsqlExpectedType,
562-
?Type $mssqlExpectedType,
563-
$mysqlExpectedResult,
564-
$sqliteExpectedResult,
565-
$pdoPgsqlExpectedResult,
566-
$pgsqlExpectedResult,
567-
$mssqlExpectedResult,
568-
string $stringify
569-
): void
570-
{
571-
$this->performDriverTest(
572-
'sqlsrv',
573-
self::CONFIG_DEFAULT,
574-
$data,
575-
$dqlTemplate,
576-
(string) $this->dataName(),
577-
PHP_VERSION_ID,
578-
$mssqlExpectedType,
579-
$mssqlExpectedResult,
580-
$stringify,
581-
);
582-
}
583-
584544
/**
585545
* @param array<string, mixed> $data
586546
* @param mixed $mysqlExpectedResult

tests/Platform/docker/Dockerfile80

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
FROM php:8.0-cli
22

3-
# MSSQL
4-
RUN apt update \
5-
&& apt install -y gnupg2 \
6-
&& apt install -y unixodbc-dev unixodbc \
7-
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
8-
&& curl https://packages.microsoft.com/config/debian/11/prod.list > /etc/apt/sources.list.d/mssql-release.list \
9-
&& apt update \
10-
&& ACCEPT_EULA=Y apt install -y msodbcsql17 \
11-
&& pecl install sqlsrv-5.11.1 \
12-
&& pecl install pdo_sqlsrv-5.11.1 \
13-
&& docker-php-ext-enable sqlsrv pdo_sqlsrv
14-
153
COPY ./docker-setup.sh /opt/src/scripts/setup.sh
164
RUN /opt/src/scripts/setup.sh
175

tests/Platform/docker/Dockerfile81

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
FROM php:8.1-cli
22

3-
# MSSQL
4-
RUN apt update \
5-
&& apt install -y gnupg2 \
6-
&& apt install -y unixodbc-dev unixodbc \
7-
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
8-
&& curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | tee /etc/apt/sources.list.d/mssql-tools.list \
9-
&& apt update \
10-
&& ACCEPT_EULA=Y apt install -y msodbcsql17 \
11-
&& pecl install sqlsrv \
12-
&& pecl install pdo_sqlsrv \
13-
&& docker-php-ext-enable sqlsrv pdo_sqlsrv
14-
153
COPY ./docker-setup.sh /opt/src/scripts/setup.sh
164
RUN /opt/src/scripts/setup.sh
175

tests/Platform/docker/Dockerfile84

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
FROM php:8.4-cli
22

3-
# MSSQL
4-
RUN apt update \
5-
&& apt install -y gnupg2 \
6-
&& apt install -y unixodbc-dev unixodbc \
7-
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
8-
&& curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | tee /etc/apt/sources.list.d/mssql-tools.list \
9-
&& apt update \
10-
&& ACCEPT_EULA=Y apt install -y msodbcsql17 \
11-
&& pecl install sqlsrv \
12-
&& pecl install pdo_sqlsrv \
13-
&& docker-php-ext-enable sqlsrv pdo_sqlsrv
14-
153
COPY ./docker-setup.sh /opt/src/scripts/setup.sh
164
RUN /opt/src/scripts/setup.sh
175

tests/Platform/docker/docker-compose.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,14 @@ services:
2727
type: tmpfs
2828
target: /var/lib/postgresql/data
2929

30-
mssql:
31-
image: mcr.microsoft.com/mssql/server:latest
32-
environment:
33-
ACCEPT_EULA: Y
34-
SA_PASSWORD: 'Secret.123'
35-
MSSQL_PID: Developer
36-
ports:
37-
- 1433:1433
38-
3930
php80:
40-
depends_on: [mysql, pgsql, mssql]
31+
depends_on: [mysql, pgsql]
4132
build:
4233
context: .
4334
dockerfile: ./Dockerfile80
4435
environment:
4536
MYSQL_HOST: mysql
4637
PGSQL_HOST: pgsql
47-
MSSQL_HOST: mssql
4838
working_dir: /app
4939
user: ${UID:-1000}:${GID:-1000}
5040
volumes:
@@ -58,7 +48,6 @@ services:
5848
environment:
5949
MYSQL_HOST: mysql
6050
PGSQL_HOST: pgsql
61-
MSSQL_HOST: mssql
6251
working_dir: /app
6352
user: ${UID:-1000}:${GID:-1000}
6453
volumes:
@@ -72,7 +61,6 @@ services:
7261
environment:
7362
MYSQL_HOST: mysql
7463
PGSQL_HOST: pgsql
75-
MSSQL_HOST: mssql
7664
working_dir: /app
7765
user: ${UID:-1000}:${GID:-1000}
7866
volumes:

tests/Platform/docker/docker-setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -ex \
33
&& apt update \
44
&& apt install -y bash zip libpq-dev libsqlite3-dev \
5-
&& pecl install xdebug mongodb \
5+
&& pecl install xdebug mongodb-1.19.4 \
66
&& docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
77
&& docker-php-ext-install pdo mysqli pgsql pdo_mysql pdo_pgsql pdo_sqlite \
88
&& docker-php-ext-enable xdebug mongodb

0 commit comments

Comments
 (0)