From f44ab2b354b2a01db9fd0a5b37c90428c45af3bf Mon Sep 17 00:00:00 2001 From: Constant Bouquet Date: Wed, 20 Mar 2024 10:12:04 +0100 Subject: [PATCH] Add symfony 7 support --- .scenarios.lock/symfony3/composer.json | 4 +- .scenarios.lock/symfony4/composer.json | 4 +- .scenarios.lock/symfony5/composer.json | 4 +- .scenarios.lock/symfony6/composer.json | 4 +- .scenarios.lock/symfony7/.gitignore | 1 + .scenarios.lock/symfony7/composer.json | 62 +++++++++++++++++++ LICENSE | 27 ++++---- composer.json | 9 ++- docker-compose.yml | 11 +++- src/ServiceContainer/PantherConfiguration.php | 2 +- 10 files changed, 103 insertions(+), 25 deletions(-) create mode 100644 .scenarios.lock/symfony7/.gitignore create mode 100644 .scenarios.lock/symfony7/composer.json diff --git a/.scenarios.lock/symfony3/composer.json b/.scenarios.lock/symfony3/composer.json index cb5a00e..a2b8eaa 100644 --- 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 index 1eef222..2dd0383 100644 --- 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 index 21db7ea..c7292c7 100644 --- 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 index c042ccb..cc6fa82 100644 --- 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 new file mode 100644 index 0000000..5657f6e --- /dev/null +++ b/.scenarios.lock/symfony7/.gitignore @@ -0,0 +1 @@ +vendor \ No newline at end of file diff --git a/.scenarios.lock/symfony7/composer.json b/.scenarios.lock/symfony7/composer.json new file mode 100644 index 0000000..f694b4d --- /dev/null +++ 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": "robertfreigang@gmx.de" + } + ], + "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 index 7e98339..88dec74 100644 --- 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 \ No newline at end of file diff --git a/composer.json b/composer.json index d3f02ce..0d05a1e 100644 --- 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 index 478980c..593fb07 100755 --- 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 index a128f74..9c94642 100644 --- 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')) {