Merge pull request #14 from ConstantBqt/feat/symfony_7_support

Add Symfony 7 support
robertfausk · Apr 17, 2024 · 8f89aa0 · 8f89aa0
2 parents 4fb3d47 + f44ab2b
commit 8f89aa0
Show file tree

Hide file tree

Showing 10 changed files with 103 additions and 25 deletions.
diff --git a/.scenarios.lock/symfony3/composer.json b/.scenarios.lock/symfony3/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"
     },
@@ -56,7 +56,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1.x-dev"
+            "dev-main": "1.1.x-dev"
         }
     }
 }
diff --git a/.scenarios.lock/symfony4/composer.json b/.scenarios.lock/symfony4/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"
     },
@@ -56,7 +56,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1.x-dev"
+            "dev-main": "1.1.x-dev"
         }
     }
 }
diff --git a/.scenarios.lock/symfony5/composer.json b/.scenarios.lock/symfony5/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"
     },
@@ -56,7 +56,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1.x-dev"
+            "dev-main": "1.1.x-dev"
         }
     }
 }
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"
     },
@@ -56,7 +56,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1.x-dev"
+            "dev-main": "1.1.x-dev"
         }
     }
 }
diff --git a/.scenarios.lock/symfony7/.gitignore b/.scenarios.lock/symfony7/.gitignore
@@ -0,0 +1 @@
+vendor
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|^5.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/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2022 Robert Freigang
+Copyright (c) 2019-2024 Robert Freigang
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -25,30 +25,31 @@ DEPENDENCY LICENSES:
 Name                               Version Licenses
 behat/behat                        v3.7.0  MIT
 behat/gherkin                      v4.9.0  MIT
-behat/mink                         v1.10.0 MIT
+behat/mink                         v1.11.0 MIT
 behat/transliterator               v1.5.0  Artistic-1.0
 friends-of-behat/mink-extension    v2.5.0  MIT
-php-webdriver/webdriver            1.12.1  MIT
+php-webdriver/webdriver            1.15.1  MIT
 psr/container                      1.1.2   MIT
 psr/log                            2.0.0   MIT
 robertfausk/mink-panther-driver    v1.1.0  MIT
-symfony/browser-kit                v5.4.11 MIT
+symfony/browser-kit                v5.4.35 MIT
 symfony/config                     v3.4.47 MIT
-symfony/console                    v4.4.45 MIT
-symfony/css-selector               v6.1.3  MIT
+symfony/console                    v4.4.49 MIT
+symfony/css-selector               v7.0.3  MIT
 symfony/dependency-injection       v3.4.47 MIT
 symfony/deprecation-contracts      v2.5.2  MIT
-symfony/dom-crawler                v5.4.12 MIT
+symfony/dom-crawler                v5.4.35 MIT
 symfony/event-dispatcher           v4.4.44 MIT
-symfony/event-dispatcher-contracts v1.1.13 MIT
+symfony/event-dispatcher-contracts v1.10.0 MIT
 symfony/filesystem                 v4.4.42 MIT
-symfony/http-client                v5.4.12 MIT
+symfony/http-client                v5.4.37 MIT
 symfony/http-client-contracts      v2.5.2  MIT
 symfony/panther                    v1.1.1  MIT
-symfony/polyfill-ctype             v1.26.0 MIT
-symfony/polyfill-mbstring          v1.26.0 MIT
-symfony/process                    v5.4.11 MIT
+symfony/polyfill-ctype             v1.29.0 MIT
+symfony/polyfill-mbstring          v1.29.0 MIT
+symfony/polyfill-php80             v1.29.0 MIT
+symfony/process                    v5.4.36 MIT
 symfony/service-contracts          v2.5.2  MIT
-symfony/translation                v4.4.45 MIT
+symfony/translation                v4.4.47 MIT
 symfony/translation-contracts      v2.5.2  MIT
 symfony/yaml                       v5.3.14 MIT
diff --git a/composer.json b/composer.json
@@ -26,13 +26,13 @@
         "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": {
         "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"
     },
@@ -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')) {