Skip to content

Commit 03634d7

Browse files
committed
Revert "Skip pdo_sqlsrv ext for PHP 8.5 until fixed"
1 parent 7dc8186 commit 03634d7

File tree

8 files changed

+7
-7
lines changed

8 files changed

+7
-7
lines changed

data/8.5-alpine/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
3131
pdo_mysql \
3232
php/pecl-database-pdo_oci@e7a355e097 \
3333
pdo_pgsql \
34+
pdo_sqlsrv \
3435
$(realpath phpredis) \
3536
sockets \
3637
tidy \

data/8.5-debian/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
3232
pdo_mysql \
3333
php/pecl-database-pdo_oci@e7a355e097 \
3434
pdo_pgsql \
35+
pdo_sqlsrv \
3536
$(realpath phpredis) \
3637
sockets \
3738
tidy \

data/8.5-debug-alpine/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
3131
pdo_mysql \
3232
php/pecl-database-pdo_oci@e7a355e097 \
3333
pdo_pgsql \
34+
pdo_sqlsrv \
3435
$(realpath phpredis) \
3536
sockets \
3637
tidy \

data/8.5-debug-debian/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
3232
pdo_mysql \
3333
php/pecl-database-pdo_oci@e7a355e097 \
3434
pdo_pgsql \
35+
pdo_sqlsrv \
3536
$(realpath phpredis) \
3637
sockets \
3738
tidy \

data/8.5-zts-alpine/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
3131
pdo_mysql \
3232
php/pecl-database-pdo_oci@e7a355e097 \
3333
pdo_pgsql \
34+
pdo_sqlsrv \
3435
$(realpath phpredis) \
3536
sockets \
3637
tidy \

data/8.5-zts-debian/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
3232
pdo_mysql \
3333
php/pecl-database-pdo_oci@e7a355e097 \
3434
pdo_pgsql \
35+
pdo_sqlsrv \
3536
$(realpath phpredis) \
3637
sockets \
3738
tidy \

make.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
'pdo_mysql',
142142
in_array($phpVersion, ['7.4', '8.0', '8.1', '8.2'], true) ? 'pdo_oci' : 'php/pecl-database-pdo_oci@e7a355e097',
143143
'pdo_pgsql',
144-
...(in_array($phpVersion, ['8.5'], true) ? [] : ['pdo_sqlsrv']), // https://github.com/microsoft/msphpsql/issues/1523#issuecomment-2763338116
144+
'pdo_sqlsrv',
145145
in_array($phpVersion, ['8.5'], true) ? '$(realpath phpredis)' : 'redis', // TODO waiting for 6.2.1 release https://github.com/phpredis/phpredis/pull/2676
146146
'sockets',
147147
'tidy',

test.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@
3636
'zip',
3737
], $loadedExts);
3838

39-
if (PHP_MAJOR_VERSION === 8 && PHP_MINOR_VERSION === 5) { // TODO remove once the extensions can be installed
40-
$missingExts = array_diff($missingExts, [
41-
'pdo_sqlsrv',
42-
]);
43-
}
44-
4539
if (count($missingExts) > 0) {
4640
echo 'TEST FAILED - missing php extensions: ' . implode(', ', $missingExts) . "\n";
4741

0 commit comments

Comments
 (0)