Add symfony 7 support

robertfausk · Mar 20, 2024 · 4e6f741 · 4e6f741
1 parent 4fb3d47
commit 4e6f741
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 4 deletions.
diff --git a/.scenarios.lock/symfony6/composer.json b/.scenarios.lock/symfony6/composer.json
@@ -32,7 +32,7 @@
     "require-dev": {
         "dbrekelmans/bdi": "^1.0",
         "g1a/composer-test-scenarios": "^3.0",
-        "matthiasnoback/symfony-config-test": "^4.1",
+        "matthiasnoback/symfony-config-test": "^4.1|^5.1",
         "phpunit/phpunit": "~7.5|~9.3",
         "roave/security-advisories": "dev-master"
     },

diff --git a/.scenarios.lock/symfony7/composer.json b/.scenarios.lock/symfony7/composer.json
@@ -0,0 +1,62 @@
+{
+    "name": "robertfausk/behat-panther-extension",
+    "type": "behat-extension",
+    "description": "Symfony Panther extension for Behat",
+    "keywords": [
+        "behat",
+        "gherkin",
+        "cucumber",
+        "symfony",
+        "panther",
+        "web",
+        "test",
+        "browser",
+        "chrome",
+        "firefox",
+        "gui"
+    ],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Robert Freigang",
+            "email": "[email protected]"
+        }
+    ],
+    "require": {
+        "symfony/config": "^7.0",
+        "php": ">=7.2",
+        "behat/behat": "^3.0.5",
+        "robertfausk/mink-panther-driver": "^1.0",
+        "friends-of-behat/mink-extension": "^2.3.0"
+    },
+    "require-dev": {
+        "dbrekelmans/bdi": "^1.0",
+        "g1a/composer-test-scenarios": "^3.0",
+        "matthiasnoback/symfony-config-test": "^4.1",
+        "phpunit/phpunit": "~7.5|~9.3",
+        "roave/security-advisories": "dev-master"
+    },
+    "autoload": {
+        "psr-4": {
+            "Robertfausk\\Behat\\PantherExtension\\": "../../src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "../../tests/"
+        }
+    },
+    "config": {
+        "sort-packages": true,
+        "allow-plugins": {
+            "g1a/composer-test-scenarios": true,
+            "pyrech/composer-changelogs": true
+        },
+        "vendor-dir": "../../vendor"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-main": "1.1.x-dev"
+        }
+    }
+}
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "php": ">=7.2",
         "behat/behat": "^3.0.5",
         "robertfausk/mink-panther-driver": "^1.0",
-        "symfony/config": "^3.4|^4.0|^5.0|^6.0",
+        "symfony/config": "^3.4|^4.0|^5.0|^6.0|^7.0",
         "friends-of-behat/mink-extension": "^2.3.0"
     },
     "require-dev": {
@@ -58,6 +58,11 @@
             "dev-main": "1.1.x-dev"
         },
         "scenarios": {
+            "symfony7": {
+                "require": {
+                    "symfony/config": "^7.0"
+                }
+            },
             "symfony6": {
                 "require": {
                     "symfony/config": "^6.0"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -51,6 +51,15 @@ services:
     build:
       context: .
       args:
-        - PHP_VERSION=8.2-rc
+        - PHP_VERSION=8.2
+    volumes:
+      - .:/var/www/html
+
+  php8.3:
+    tty: true
+    build:
+      context: .
+      args:
+        - PHP_VERSION=8.3
     volumes:
       - .:/var/www/html
diff --git a/src/ServiceContainer/PantherConfiguration.php b/src/ServiceContainer/PantherConfiguration.php
@@ -15,7 +15,7 @@ class PantherConfiguration implements ConfigurationInterface
     /**
      * @inheritDoc
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('panther');
         if (\method_exists($treeBuilder, 'getRootNode')) {