From aeb086f26f3ecaf28efa3e9ad90b362fb54fa3d2 Mon Sep 17 00:00:00 2001
From: Dariusz Ruminski <dariusz.ruminski@gmail.com>
Date: Sat, 11 Dec 2021 16:36:22 +0000
Subject: [PATCH] CI: update used PHP version

---
 .github/workflows/ci.yml                 | 18 +++++++++---------
 .github/workflows/sca.yml                |  2 +-
 tests/AutoReview/CiConfigurationTest.php |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a0b9a71f7c1..ac4642ad666 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,18 +25,13 @@ jobs:
             job-description: 'with Sf ^5'
             execute-flex-with-symfony-version: '^5' # Explicit check for Sf 5.x compatibility
 
-          - operating-system: 'ubuntu-20.04'
-            php-version: '8.0'
-            job-description: 'with Sf ^6'
-            execute-flex-with-symfony-version: '^6' # Explicit check for Sf 6.x compatibility
-
           - operating-system: 'ubuntu-20.04'
             php-version: '7.4'
-            job-description: 'with deployment'
-            execute-deployment: 'yes'
 
           - operating-system: 'ubuntu-20.04'
             php-version: '8.0'
+            job-description: 'with Sf ^6'
+            execute-flex-with-symfony-version: '^6' # Explicit check for Sf 6.x compatibility
 
           - operating-system: 'ubuntu-20.04'
             php-version: '8.1'
@@ -49,13 +44,18 @@ jobs:
             calculate-code-coverage: 'yes'
             phpunit-flags: '--testsuite coverage --exclude-group covers-nothing --coverage-clover build/logs/clover.xml'
 
+          - operating-system: 'ubuntu-20.04'
+            php-version: '8.1'
+            job-description: 'with deployment'
+            execute-deployment: 'yes'
+
           - operating-system: 'windows-latest'
-            php-version: '7.4'
+            php-version: '8.1'
             job-description: 'on Windows'
             FAST_LINT_TEST_CASES: 1
 
           - operating-system: 'macos-latest'
-            php-version: '7.4'
+            php-version: '8.1'
             job-description: 'on macOS'
 
     name: PHP ${{ matrix.php-version }} ${{ matrix.job-description }}
diff --git a/.github/workflows/sca.yml b/.github/workflows/sca.yml
index 3d6cfe7f98e..eb9fee02c6b 100644
--- a/.github/workflows/sca.yml
+++ b/.github/workflows/sca.yml
@@ -12,7 +12,7 @@ jobs:
         operating-system:
           - ubuntu-20.04
         php-version:
-          - 8.0
+          - 8.1
 
     name: Static Code Analysis
 
diff --git a/tests/AutoReview/CiConfigurationTest.php b/tests/AutoReview/CiConfigurationTest.php
index c9e932e370d..9a433c6031f 100644
--- a/tests/AutoReview/CiConfigurationTest.php
+++ b/tests/AutoReview/CiConfigurationTest.php
@@ -63,7 +63,7 @@ public function testDeploymentJobsRunOnLatestStablePhpThatIsSupportedByTool(): v
     {
         $ciVersionsForDeployments = $this->getAllPhpVersionsUsedByCiForDeployments();
         $ciVersions = $this->getAllPhpVersionsUsedByCiForTests();
-        $expectedPhp = '7.4'; // can't run dev-tools on 8.0 yet; $this->getMaxPhpVersionFromEntryFile();
+        $expectedPhp = $this->getMaxPhpVersionFromEntryFile();
 
         if (\in_array($expectedPhp.'snapshot', $ciVersions, true)) {
             // last version of used PHP is snapshot. we should test against previous one, that is stable