From 7a997dd6e919f5d2a09f15581e9d91d114cd6c53 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Mon, 26 Aug 2024 14:01:12 +1200 Subject: [PATCH] MNT Fix unit tests to match CMS 6 only using PHP 8.3 --- tests/JobCreatorTest.php | 40 +++++++++------------------------------- 1 file changed, 9 insertions(+), 31 deletions(-) diff --git a/tests/JobCreatorTest.php b/tests/JobCreatorTest.php index 07d3f19..e88273b 100644 --- a/tests/JobCreatorTest.php +++ b/tests/JobCreatorTest.php @@ -716,7 +716,7 @@ public function provideCreateJson(): array [ [ 'installer_version' => '6.x-dev', - 'php' => '8.1', + 'php' => '8.3', 'db' => DB_MYSQL_57, 'composer_require_extra' => '', 'composer_args' => '--prefer-lowest', @@ -732,32 +732,12 @@ public function provideCreateJson(): array 'js' => 'false', 'doclinting' => 'false', 'needs_full_setup' => 'true', - 'name' => '8.1 prf-low mysql57 phpunit all', - ], - [ - 'installer_version' => '6.x-dev', - 'php' => '8.2', - 'db' => DB_MARIADB, - 'composer_require_extra' => '', - 'composer_args' => '', - 'name_suffix' => '', - 'phpunit' => 'true', - 'phpunit_suite' => 'all', - 'phplinting' => 'false', - 'phpcoverage' => 'false', - 'endtoend' => 'false', - 'endtoend_suite' => 'root', - 'endtoend_config' => '', - 'endtoend_tags' => '', - 'js' => 'false', - 'doclinting' => 'false', - 'needs_full_setup' => 'true', - 'name' => '8.2 mariadb phpunit all', + 'name' => '8.3 prf-low mysql57 phpunit all', ], [ 'installer_version' => '6.x-dev', 'php' => '8.3', - 'db' => DB_MYSQL_80, + 'db' => DB_MARIADB, 'composer_require_extra' => '', 'composer_args' => '', 'name_suffix' => '', @@ -772,7 +752,7 @@ public function provideCreateJson(): array 'js' => 'false', 'doclinting' => 'false', 'needs_full_setup' => 'true', - 'name' => '8.3 mysql80 phpunit all', + 'name' => '8.3 mariadb phpunit all', ], ] ], @@ -1431,7 +1411,7 @@ public function provideComposerInstall(): array '6.x-dev', 'silverstripe-vendormodule', [ - '8.1 mysql57 phpunit all' + '8.3 mysql57 phpunit all' ] ], 'composerinstall_definedphpversion_framework5' => [ @@ -1480,9 +1460,8 @@ public function provideComposerInstall(): array '6.x-dev', 'silverstripe-vendormodule', [ - '8.1 prf-low mysql57 phpunit all', - '8.2 mariadb phpunit all', - '8.3 mysql80 phpunit all', + '8.3 prf-low mysql57 phpunit all', + '8.3 mariadb phpunit all', ] ], 'composerupgrade_definedphpversion_framework5' => [ @@ -1513,9 +1492,8 @@ public function provideComposerInstall(): array '6.x-dev', 'silverstripe-theme', [ - '8.1 prf-low mysql57 phpunit all', - '8.2 mariadb phpunit all', - '8.3 mysql80 phpunit all', + '8.3 prf-low mysql57 phpunit all', + '8.3 mariadb phpunit all', ] ], 'composerupgrade_nophpversion_framework51' => [