From adc5c84d080959b23706dc9b794dfedc6ea1a6c6 Mon Sep 17 00:00:00 2001
From: Greg Anderson <greg.1.anderson@greenknowe.org>
Date: Wed, 14 Jun 2023 07:37:39 -0700
Subject: [PATCH 1/2] Fixes #5655: Ensure that Drush 11 is tested on PHP 7.4

---
 .circleci/config.yml                          | 12 ++++++++++++
 src/Drupal/Commands/config/ConfigCommands.php |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0ea861d02d..3094246178 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -68,6 +68,18 @@ jobs:
       - image: cimg/mysql:5.7.38
     <<: *test80steps
 
+  # PHP 7.4 test:
+  #   Checks the most common configuration.
+  test_74_drupal9_mysql:
+    <<: *defaults
+    docker:
+      - image: wodby/php:7.4
+        environment:
+          - MYSQL_HOST=127.0.0.1
+          - UNISH_DB_URL=mysql://root:@127.0.0.1
+      - image: cimg/mysql:5.7.38
+    <<: *test80steps
+
   test_80_drupal9_sqlite:
     <<: *defaults
     docker:
diff --git a/src/Drupal/Commands/config/ConfigCommands.php b/src/Drupal/Commands/config/ConfigCommands.php
index 1ef962ed19..f6a4b1a6d9 100644
--- a/src/Drupal/Commands/config/ConfigCommands.php
+++ b/src/Drupal/Commands/config/ConfigCommands.php
@@ -390,7 +390,7 @@ public function status($options = ['state' => 'Only in DB,Only in sync dir,Diffe
      * @param mixed $directory
      *   A configuration directory. Note; can be boolean.
      */
-    public static function getDirectory(mixed $directory = null): string
+    public static function getDirectory($directory = null): string
     {
         $return = null;
         // If the user provided a directory, use it.

From 616e83b02b8a7afbe28875433eaa8e111a659562 Mon Sep 17 00:00:00 2001
From: Greg Anderson <greg.1.anderson@greenknowe.org>
Date: Wed, 14 Jun 2023 07:48:53 -0700
Subject: [PATCH 2/2] We should actually turn on the PHP 7.4 tests in Circle

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3094246178..f0a06add1e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -153,6 +153,8 @@ workflows:
     jobs:
       - code_style
       - check_mergable
+      - test_74_drupal9_mysql:
+          <<: *requires
       - test_80_drupal92_security:
           <<: *requires
       - test_80_drupal9_mysql: