Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions tests/JobCreatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ public function provideCreateJson(): array
],
[
'installer_version' => $highestMajor . '.x-dev',
'php' => $phpHighestMajor[0],
'php' => $phpHighestMajor[1],
'db' => DB_MYSQL_80,
'composer_require_extra' => '',
'composer_args' => '',
Expand All @@ -476,11 +476,11 @@ public function provideCreateJson(): array
'js' => 'false',
'doclinting' => 'false',
'needs_full_setup' => 'true',
'name' => $phpHighestMajor[0]. ' mysql80 phpunit all',
'name' => $phpHighestMajor[1]. ' mysql80 phpunit all',
],
[
'installer_version' => $highestMajor . '.x-dev',
'php' => $phpHighestMajor[1],
'php' => $phpHighestMajor[2],
'db' => DB_MYSQL_84,
'composer_require_extra' => '',
'composer_args' => '',
Expand All @@ -496,7 +496,7 @@ public function provideCreateJson(): array
'js' => 'false',
'doclinting' => 'false',
'needs_full_setup' => 'true',
'name' => $phpHighestMajor[1]. ' mysql84 phpunit all',
'name' => $phpHighestMajor[2]. ' mysql84 phpunit all',
],
[
'installer_version' => $highestMajor . '.x-dev',
Expand All @@ -520,7 +520,7 @@ public function provideCreateJson(): array
],
[
'installer_version' => $highestMajor . '.x-dev',
'php' => $phpHighestMajor[1],
'php' => $phpHighestMajor[2],
'db' => DB_MYSQL_84,
'composer_require_extra' => '',
'composer_args' => '',
Expand All @@ -536,7 +536,7 @@ public function provideCreateJson(): array
'js' => 'false',
'doclinting' => 'false',
'needs_full_setup' => 'true',
'name' => $phpHighestMajor[1]. ' mysql84 endtoend root',
'name' => $phpHighestMajor[2]. ' mysql84 endtoend root',
],
]
],
Expand Down Expand Up @@ -859,7 +859,7 @@ public function provideCreateJson(): array
],
[
'installer_version' => $highestMajor . '.x-dev',
'php' => $phpHighestMajor[0],
'php' => $phpHighestMajor[1],
'db' => DB_MYSQL_80,
'composer_require_extra' => '',
'composer_args' => '',
Expand All @@ -875,11 +875,11 @@ public function provideCreateJson(): array
'js' => 'false',
'doclinting' => 'false',
'needs_full_setup' => 'true',
'name' => $phpHighestMajor[0]. ' mysql80 phpunit all',
'name' => $phpHighestMajor[1]. ' mysql80 phpunit all',
],
[
'installer_version' => $highestMajor . '.x-dev',
'php' => $phpHighestMajor[1],
'php' => $phpHighestMajor[2],
'db' => DB_MYSQL_84,
'composer_require_extra' => '',
'composer_args' => '',
Expand All @@ -895,7 +895,7 @@ public function provideCreateJson(): array
'js' => 'false',
'doclinting' => 'false',
'needs_full_setup' => 'true',
'name' => $phpHighestMajor[1]. ' mysql84 phpunit all',
'name' => $phpHighestMajor[2]. ' mysql84 phpunit all',
],
]
],
Expand Down Expand Up @@ -1598,7 +1598,7 @@ public function provideCreateJsonForConfig(): array
],
[
'installer_version' => '',
'php' => $phpHighestMajor[0],
'php' => $phpHighestMajor[1],
'db' => DB_MYSQL_80,
'composer_require_extra' => '',
'composer_args' => '',
Expand All @@ -1614,11 +1614,11 @@ public function provideCreateJsonForConfig(): array
'js' => 'false',
'doclinting' => 'false',
'needs_full_setup' => 'false',
'name' => $phpHighestMajor[0] . ' mysql80 phpunit all',
'name' => $phpHighestMajor[1] . ' mysql80 phpunit all',
],
[
'installer_version' => '',
'php' => $phpHighestMajor[1],
'php' => $phpHighestMajor[2],
'db' => DB_MYSQL_84,
'composer_require_extra' => '',
'composer_args' => '',
Expand All @@ -1634,7 +1634,7 @@ public function provideCreateJsonForConfig(): array
'js' => 'false',
'doclinting' => 'false',
'needs_full_setup' => 'false',
'name' => $phpHighestMajor[1] . ' mysql84 phpunit all',
'name' => $phpHighestMajor[2] . ' mysql84 phpunit all',
],
],
],
Expand Down Expand Up @@ -2273,8 +2273,8 @@ public function provideComposerInstall(): array
'silverstripe-vendormodule',
[
$phpHighestMajor[0] . ' prf-low mariadb phpunit all',
$phpHighestMajor[0] . ' mysql80 phpunit all',
$phpHighestMajor[1] . ' mysql84 phpunit all',
$phpHighestMajor[1] . ' mysql80 phpunit all',
$phpHighestMajor[2] . ' mysql84 phpunit all',
]
],
'composerupgrade_definedphpversion_framework lowest' => [
Expand Down Expand Up @@ -2308,8 +2308,8 @@ public function provideComposerInstall(): array
'silverstripe-theme',
[
$phpHighestMajor[0] . ' prf-low mariadb phpunit all',
$phpHighestMajor[0] . ' mysql80 phpunit all',
$phpHighestMajor[1] . ' mysql84 phpunit all',
$phpHighestMajor[1] . ' mysql80 phpunit all',
$phpHighestMajor[2] . ' mysql84 phpunit all',
]
],
'composerupgrade_nophpversion_framework lowest with minor' => [
Expand Down Expand Up @@ -2476,8 +2476,8 @@ public function providePhpFallbackDoorman(): array
'exception' => false,
'expected' => [
$phpHighestMajor[0] . ' prf-low mariadb phpunit all',
$phpHighestMajor[0] . ' mysql80 phpunit all',
$phpHighestMajor[1] . ' mysql84 phpunit all',
$phpHighestMajor[1] . ' mysql80 phpunit all',
$phpHighestMajor[2] . ' mysql84 phpunit all',
],
],
'none' => [
Expand Down