diff --git a/__tests__/devenv-e2e/001-create.spec.js b/__tests__/devenv-e2e/001-create.spec.js index f347d826f..e20038cb2 100644 --- a/__tests__/devenv-e2e/001-create.spec.js +++ b/__tests__/devenv-e2e/001-create.spec.js @@ -69,7 +69,7 @@ describe( 'vip dev-env create', () => { it( 'should use sane defaults', async () => { const slug = getProjectSlug(); const expectedMultisite = false; - const expectedPhpVersion = '8.0'; + const expectedPhpVersion = '8.2'; const expectedElasticsearch = false; const expectedPhpMyAdmin = false; const expectedXDebug = false; @@ -109,7 +109,7 @@ describe( 'vip dev-env create', () => { const slug = getProjectSlug(); const expectedTitle = 'Test'; const expectedMultisite = true; - const expectedPhpVersion = '8.0'; + const expectedPhpVersion = '8.2'; const expectedWordPressVersion = '6.1'; const expectedElasticsearch = true; const expectedPhpMyAdmin = true; diff --git a/__tests__/devenv-e2e/011-configuration-file.spec.js b/__tests__/devenv-e2e/011-configuration-file.spec.js index 3a5fbc612..38f947ede 100644 --- a/__tests__/devenv-e2e/011-configuration-file.spec.js +++ b/__tests__/devenv-e2e/011-configuration-file.spec.js @@ -119,7 +119,7 @@ describe( 'vip dev-env configuration file', () => { const expectedSlug = getProjectSlug(); const expectedTitle = 'Test'; const expectedMultisite = true; - const expectedPhpVersion = '8.0'; + const expectedPhpVersion = '8.2'; const expectedWordPressVersion = '6.1'; const expectedElasticsearch = true; const expectedPhpMyAdmin = true; diff --git a/__tests__/lib/dev-environment/dev-environment-cli.js b/__tests__/lib/dev-environment/dev-environment-cli.js index e28a94dbd..288e4ef6c 100644 --- a/__tests__/lib/dev-environment/dev-environment-cli.js +++ b/__tests__/lib/dev-environment/dev-environment-cli.js @@ -584,8 +584,6 @@ describe( 'lib/dev-environment/dev-environment-cli', () => { describe( 'resolvePhpVersion', () => { it.each( [ - [ '7.4', DEV_ENVIRONMENT_PHP_VERSIONS[ '7.4' ].image ], - [ '8.0', DEV_ENVIRONMENT_PHP_VERSIONS[ '8.0' ].image ], [ '8.1', DEV_ENVIRONMENT_PHP_VERSIONS[ '8.1' ].image ], [ '8.2', DEV_ENVIRONMENT_PHP_VERSIONS[ '8.2' ].image ], [ '8.3', DEV_ENVIRONMENT_PHP_VERSIONS[ '8.3' ].image ], diff --git a/src/lib/constants/dev-environment.ts b/src/lib/constants/dev-environment.ts index 438a60cc8..9a9e0f3fd 100644 --- a/src/lib/constants/dev-environment.ts +++ b/src/lib/constants/dev-environment.ts @@ -41,15 +41,7 @@ export const DEV_ENVIRONMENT_PHP_VERSIONS: Record< string, PhpImage > = { 8.1: { image: 'ghcr.io/automattic/vip-container-images/php-fpm:8.1', label: '8.1' }, 8.3: { image: 'ghcr.io/automattic/vip-container-images/php-fpm:8.3', - label: '8.3 (experimental, not supported)', - }, - '8.0': { - image: 'ghcr.io/automattic/vip-container-images/php-fpm:8.0', - label: '8.0 (EOL soon)', - }, - 7.4: { - image: 'ghcr.io/automattic/vip-container-images/php-fpm:7.4', - label: '7.4 (EOL; not supported)', + label: '8.3', }, } as const;