Skip to content

Commit 82cf868

Browse files
committed
Merge branch '2.0-dev' of https://github.com/joomla-framework/database into 3.x-dev
# Conflicts: # .drone.jsonnet # .drone.yml # Tests/AbstractDatabaseDriverTestCase.php # Tests/Mysql/MysqlDriverTest.php # Tests/Mysqli/MysqliDriverTest.php # Tests/Pgsql/PgsqlDriverTest.php # Tests/Sqlite/SqliteDriverTest.php # Tests/Sqlsrv/SqlsrvDriverTest.php # ruleset.xml # src/Command/ExportCommand.php # src/DatabaseDriver.php # src/DatabaseExporter.php # src/DatabaseImporter.php # src/Mysql/MysqlDriver.php # src/Mysql/MysqlImporter.php # src/Mysqli/MysqliDriver.php # src/Mysqli/MysqliImporter.php # src/Pgsql/PgsqlDriver.php # src/Sqlite/SqliteDriver.php
2 parents 2acd0fb + 3e05b12 commit 82cf868

18 files changed

Lines changed: 1302 additions & 808 deletions

.drone.jsonnet

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,10 @@ local phpunit_sqlsrv(phpversion) = {
6363
'echo "deb [arch=amd64,armhf,arm64] https://packages.microsoft.com/ubuntu/22.04/prod jammy main" >> /etc/apt/sources.list',
6464
'apt-get update',
6565
'ACCEPT_EULA=Y apt-get install -y msodbcsql18 unixodbc-dev',
66-
'pecl install sqlsrv && docker-php-ext-enable sqlsrv',
67-
'pecl install pdo_sqlsrv && docker-php-ext-enable pdo_sqlsrv',
66+
if phpversion < '8.0' then 'pecl install sqlsrv-5.10.1 && docker-php-ext-enable sqlsrv'
67+
else 'pecl install sqlsrv && docker-php-ext-enable sqlsrv' ,
68+
if phpversion < '8.0' then 'pecl install pdo_sqlsrv-5.10.1 && docker-php-ext-enable pdo_sqlsrv'
69+
else 'pecl install pdo_sqlsrv && docker-php-ext-enable pdo_sqlsrv',
6870
'php --ri sqlsrv',
6971
'php --ri pdo_sqlsrv',
7072
'vendor/bin/phpunit --configuration phpunit.sqlsrv.xml.dist --testdox',
@@ -252,15 +254,6 @@ local pipeline_sqlsrv(phpversion, driver, dbversion, params) = {
252254
'phploc src',
253255
],
254256
},
255-
{
256-
name: 'phpcpd',
257-
image: 'joomlaprojects/docker-images:php8.1',
258-
depends: [ 'composer' ],
259-
failure: 'ignore',
260-
commands: [
261-
'phpcpd src',
262-
],
263-
},
264257
],
265258
},
266259
pipeline_sqlite('8.1', 'sqlite', '--prefer-stable'),

0 commit comments

Comments
 (0)