From 2c05ac0a5c3e1474208aaf134fa2d231d056302f Mon Sep 17 00:00:00 2001
From: TavoNiievez <ganieves@outlook.com>
Date: Mon, 30 May 2022 09:39:59 -0500
Subject: [PATCH] Improved support for Codeception 5/PHP 8

Co-authored-by: Dan Barrett <dan@danbarrett.com.au>
---
 .github/workflows/main.yml         | 13 ++++++++++++-
 composer.json                      | 18 +++++++++++-------
 readme.md                          |  2 +-
 src/Codeception/Module/Symfony.php |  3 +++
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f9ef116b..be8e3c2f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,7 +9,10 @@ jobs:
     strategy:
       matrix:
         php: [8.0, 8.1]
-        symfony: ["4.4.*", "5.4.*", "6.0.*"]
+        symfony: ["4.4.*", "5.4.*", "6.0.*", "6.1.*"]
+        exclude:
+          - php: 8.0
+            symfony: "6.1.*"
 
     steps:
       - name: Checkout code
@@ -47,6 +50,14 @@ jobs:
           path: framework-tests
           ref: "6.0"
 
+      - name: Checkout Symfony 6.1 Sample
+        if: "matrix.symfony == '6.1.*' && matrix.php == '8.1'"
+        uses: actions/checkout@v2
+        with:
+          repository: Codeception/symfony-module-tests
+          path: framework-tests
+          ref: "6.1"
+
       - name: Get composer cache directory
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
diff --git a/composer.json b/composer.json
index 0363fe31..74e19855 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,12 @@
 {
     "name": "codeception/module-symfony",
     "description": "Codeception module for Symfony framework",
-    "keywords": ["codeception", "symfony"],
-    "homepage": "https://codeception.com/",
-    "type": "library",
     "license": "MIT",
+    "type": "library",
+    "keywords": [
+        "codeception",
+        "symfony"
+    ],
     "authors": [
         {
             "name": "Michael Bodnarchuk"
@@ -14,12 +16,12 @@
             "homepage": "https://medium.com/@ganieves"
         }
     ],
-    "minimum-stability": "dev",
+    "homepage": "https://codeception.com/",
     "require": {
         "php": "^8.0",
         "ext-json": "*",
-        "codeception/lib-innerbrowser": "^3.1.1",
-        "codeception/codeception": "^5.0.0-RC3"
+        "codeception/codeception": "^5.0.0-RC3",
+        "codeception/lib-innerbrowser": "^3.1.1"
     },
     "require-dev": {
         "codeception/module-asserts": "^3.0",
@@ -38,10 +40,12 @@
         "codeception/module-asserts": "Include traditional PHPUnit assertions in your tests",
         "symfony/web-profiler-bundle": "Tool that gives information about the execution of requests"
     },
+    "minimum-stability": "RC",
     "autoload": {
         "classmap": ["src/"]
     },
     "config": {
-        "classmap-authoritative": true
+        "classmap-authoritative": true,
+        "sort-packages": true
     }
 }
diff --git a/readme.md b/readme.md
index 26b930c6..c832d43a 100644
--- a/readme.md
+++ b/readme.md
@@ -9,7 +9,7 @@ A Codeception module for Symfony framework.
 
 ## Requirements
 
-* `Symfony 4.4` or higher.
+* `Symfony` `4.4.x`, `5.4.x`, `6.x` or higher, as per the [Symfony supported versions](https://symfony.com/releases).
 * `PHP 8.0` or higher.
 
 ## Installation
diff --git a/src/Codeception/Module/Symfony.php b/src/Codeception/Module/Symfony.php
index cdb206cc..018f8710 100644
--- a/src/Codeception/Module/Symfony.php
+++ b/src/Codeception/Module/Symfony.php
@@ -154,6 +154,9 @@ class Symfony extends Framework implements DoctrineProvider, PartedModule
      */
     public ?AbstractBrowser $client = null;
 
+    /**
+     * @var array<string, mixed>
+     */
     public array $config = [
         'app_path' => 'app',
         'kernel_class' => 'App\Kernel',