Merge remote-tracking branch 'origin/fix-static-tests' into MCLOUD-12779

Author: tomreece

src/Test/Integration/_files/cloud_base/.magento.app.yaml

@@ -1,6 +1,6 @@
 name: magento
 
-type: php:7.3
+type: php:8.0
 build:
   flavor: composer
 

src/Test/Integration/_files/cloud_base/docker-compose.exp.yml

@@ -83,7 +83,7 @@ services:
           - opensearch.magento2.docker
   fpm:
     hostname: fpm.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-fpm-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-fpm-1.2.0'
     extends: generic
     volumes:
       - '.:/app:ro,delegated'
@@ -156,14 +156,14 @@ services:
         condition: service_started
   generic:
     hostname: generic.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-cli-1.2.0'
     env_file: ./.docker/config.env
     environment:
       - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl sodium redis'
       - 'SENDMAIL_PATH=/usr/local/bin/mhsendmail --smtp-addr=mailhog:1025'
   build:
     hostname: build.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-cli-1.2.0'
     extends: generic
     volumes:
       - '.:/app:rw,delegated'
@@ -185,7 +185,7 @@ services:
         condition: service_healthy
   deploy:
     hostname: deploy.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-cli-1.2.0'
     extends: generic
     volumes:
       - '.:/app:ro,delegated'

src/Test/Integration/_files/cloud_base_developer/.magento.app.yaml

@@ -1,6 +1,6 @@
 name: magento
 
-type: php:7.3
+type: php:8.0
 build:
   flavor: composer
 

src/Test/Integration/_files/cloud_base_developer/docker-compose.exp.yml

@@ -83,7 +83,7 @@ services:
           - opensearch.magento2.docker
   fpm:
     hostname: fpm.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-fpm-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-fpm-1.2.0'
     extends: generic
     volumes:
       - '.:/app:delegated'
@@ -142,15 +142,15 @@ services:
         condition: service_started
   generic:
     hostname: generic.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-cli-1.2.0'
     env_file: ./.docker/config.env
     environment:
       - MAGENTO_RUN_MODE=developer
       - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl sodium redis'
       - 'SENDMAIL_PATH=/usr/local/bin/mhsendmail --smtp-addr=mailhog:1025'
   build:
     hostname: build.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-cli-1.2.0'
     extends: generic
     volumes:
       - '.:/app:delegated'
@@ -169,7 +169,7 @@ services:
         condition: service_healthy
   deploy:
     hostname: deploy.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-cli-1.2.0'
     extends: generic
     volumes:
       - '.:/app:delegated'

src/Test/Integration/_files/cloud_base_developer_manual/.magento.app.yaml

@@ -1,6 +1,6 @@
 name: magento
 
-type: php:7.3
+type: php:8.0
 build:
   flavor: composer
 

src/Test/Integration/_files/cloud_base_developer_manual/docker-compose.exp.yml

@@ -63,7 +63,7 @@ services:
           - elasticsearch.magento2.docker
   fpm:
     hostname: fpm.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-fpm-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-fpm-1.2.0'
     extends: generic
     volumes:
       - 'magento-app:/app'
@@ -122,15 +122,15 @@ services:
         condition: service_started
   generic:
     hostname: generic.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-cli-1.2.0'
     env_file: ./.docker/config.env
     environment:
       - MAGENTO_RUN_MODE=developer
       - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl sodium redis'
       - 'SENDMAIL_PATH=/usr/local/bin/mhsendmail --smtp-addr=mailhog:1025'
   build:
     hostname: build.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-cli-1.2.0'
     extends: generic
     volumes:
       - 'magento-app:/app'
@@ -147,7 +147,7 @@ services:
         condition: service_healthy
   deploy:
     hostname: deploy.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-cli-1.2.0'
     extends: generic
     volumes:
       - 'magento-app:/app'

src/Test/Integration/_files/cloud_base_mftf/.magento.app.yaml

@@ -1,6 +1,6 @@
 name: magento
 
-type: php:7.3
+type: php:8.0
 build:
   flavor: composer
 

src/Test/Integration/_files/cloud_base_mftf/docker-compose.exp.yml

@@ -51,7 +51,7 @@ services:
           - redis.magento2.docker
   fpm:
     hostname: fpm.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-fpm-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-fpm-1.2.0'
     extends: generic
     volumes:
       - './magento2ce:/app:ro,delegated'
@@ -140,7 +140,7 @@ services:
         condition: service_started
   test:
     hostname: test.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-cli-1.2.0'
     extends: generic
     volumes:
       - './magento2ce:/app:rw,delegated'
@@ -164,7 +164,7 @@ services:
         condition: service_healthy
   fpm_xdebug:
     hostname: fpm_xdebug.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-fpm-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-fpm-1.2.0'
     extends: generic
     volumes:
       - './magento2ce:/app:ro,delegated'
@@ -187,13 +187,13 @@ services:
         condition: service_started
   generic:
     hostname: generic.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-cli-1.2.0'
     env_file: ./.docker/config.env
     environment:
       - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl sodium redis'
   build:
     hostname: build.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-cli-1.2.0'
     extends: generic
     volumes:
       - './magento2ce:/app:rw,delegated'
@@ -211,7 +211,7 @@ services:
         condition: service_healthy
   deploy:
     hostname: deploy.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-cli-1.2.0'
     extends: generic
     volumes:
       - './magento2ce:/app:ro,delegated'
@@ -234,7 +234,7 @@ services:
         condition: service_healthy
   cron:
     hostname: cron.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-cli-1.2.0'
     extends: generic
     command: run-cron
     environment:

src/Test/Integration/_files/cloud_base_os_2.3_cli/.magento.app.yaml

@@ -1,6 +1,6 @@
 name: magento
 
-type: php:7.3
+type: php:8.0
 build:
   flavor: composer
 

src/Test/Integration/_files/cloud_base_os_2.3_cli/docker-compose.exp.yml

@@ -83,7 +83,7 @@ services:
           - opensearch.magento2.docker
   fpm:
     hostname: fpm.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-fpm-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-fpm-1.2.0'
     extends: generic
     volumes:
       - '.:/app:ro,delegated'
@@ -156,14 +156,14 @@ services:
         condition: service_started
   generic:
     hostname: generic.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-cli-1.2.0'
     env_file: ./.docker/config.env
     environment:
       - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl sodium redis'
       - 'SENDMAIL_PATH=/usr/local/bin/mhsendmail --smtp-addr=mailhog:1025'
   build:
     hostname: build.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-cli-1.2.0'
     extends: generic
     volumes:
       - '.:/app:rw,delegated'
@@ -185,7 +185,7 @@ services:
         condition: service_healthy
   deploy:
     hostname: deploy.magento2.docker
-    image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
+    image: 'magento/magento-cloud-docker-php:8.0-cli-1.2.0'
     extends: generic
     volumes:
       - '.:/app:ro,delegated'