From 49bf3e582cd243f8b54fc96ef1784b4c4f7d94e4 Mon Sep 17 00:00:00 2001 From: Yozhef Hisem Date: Fri, 1 Dec 2023 15:38:07 +0200 Subject: [PATCH 01/11] update symfony version --- .github/workflows/build.yml | 3 +++ DOCUMENTATION.md | 4 ++-- README.md | 2 +- composer.json | 14 +++++++------- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0f36893..79670bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,6 +32,9 @@ jobs: symfony-version: '6.1.*' - php-version: '8.0' symfony-version: '6.1.*' + include: + - php-version: '8.2' + symfony-version: '7.0.*' steps: - name: Checkout uses: actions/checkout@v3 diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index 3aae8dd..5fa0ecb 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -11,7 +11,7 @@ If you're starting a new project, we recommend to use Symfony with Flex as it's the most straightforward way. If you're adding this extension to an existing project, pick the method that fits it the best. -### Symfony 4/5 (with Flex) +### Symfony 4/5/6/7 (with Flex) 1. Require this extension using *Composer* and allow for using contrib recipes: @@ -19,7 +19,7 @@ If you're adding this extension to an existing project, pick the method that fit composer require --dev friends-of-behat/symfony-extension:^2.0 ``` -### Symfony 4/5 (new directory structure, without Flex) +### Symfony 4/5/6/7 (new directory structure, without Flex) 1. Require this extension using *Composer*: diff --git a/README.md b/README.md index 1d52165..e42c621 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@

SymfonyExtension

-This Behat extension provides an integration with Symfony (`^4.4`, `^5.3` and `^6.0`) and Mink driver for Symfony application. +This Behat extension provides an integration with Symfony (`^4.4`, `^5.3`, `^6.0` and `^7.0`) and Mink driver for Symfony application. It allows for: diff --git a/composer.json b/composer.json index c51f44d..a71c3c4 100644 --- a/composer.json +++ b/composer.json @@ -13,9 +13,9 @@ "require": { "php": "^7.4 || ^8.0", "behat/behat": "^3.6.1", - "symfony/dependency-injection": "^4.4 || ^5.3 || ^6.0", - "symfony/http-kernel": "^4.4 || ^5.3 || ^6.0", - "symfony/proxy-manager-bridge": "^4.4 || ^5.3 || ^6.0" + "symfony/dependency-injection": "^4.4 || ^5.3 || ^6.0 || ^7.0", + "symfony/http-kernel": "^4.4 || ^5.3 || ^6.0 || ^7.0", + "symfony/proxy-manager-bridge": "^4.4 || ^5.3 || ^6.0 || ^7.0" }, "require-dev": { "behat/mink-selenium2-driver": "^1.3", @@ -25,10 +25,10 @@ "friends-of-behat/page-object-extension": "^0.3.2", "friends-of-behat/service-container-extension": "^1.1", "sylius-labs/coding-standard": ">=4.1.1, <=4.2.1", - "symfony/browser-kit": "^4.4 || ^5.3 || ^6.0", - "symfony/framework-bundle": "^4.4 || ^5.3 || ^6.0", - "symfony/process": "^4.4 || ^5.3 || ^6.0", - "symfony/yaml": "^4.4 || ^5.3 || ^6.0", + "symfony/browser-kit": "^4.4 || ^5.3 || ^6.0 || ^7.0", + "symfony/framework-bundle": "^4.4 || ^5.3 || ^6.0 || ^7.0", + "symfony/process": "^4.4 || ^5.3 || ^6.0 || ^7.0", + "symfony/yaml": "^4.4 || ^5.3 || ^6.0 || ^7.0", "vimeo/psalm": "4.30.0" }, "suggest": { From 04da9ad9da6502cb1b9438b107d0fe1accfb9855 Mon Sep 17 00:00:00 2001 From: Yozhef Hisem Date: Fri, 1 Dec 2023 15:40:28 +0200 Subject: [PATCH 02/11] update symfony version --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a71c3c4..1118f5b 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,10 @@ "friends-of-behat/mink-extension": "^2.5" }, "config": { - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } }, "extra": { "branch-alias": { From ccee4b7fc5b3fbeb785416fefdf63ffcc10276c5 Mon Sep 17 00:00:00 2001 From: Yozhef Date: Thu, 11 Jan 2024 11:21:27 +0200 Subject: [PATCH 03/11] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1118f5b..621250a 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "behat/behat": "^3.6.1", "symfony/dependency-injection": "^4.4 || ^5.3 || ^6.0 || ^7.0", "symfony/http-kernel": "^4.4 || ^5.3 || ^6.0 || ^7.0", - "symfony/proxy-manager-bridge": "^4.4 || ^5.3 || ^6.0 || ^7.0" + "symfony/proxy-manager-bridge": "^4.4 || ^5.3 || ^6.0" }, "require-dev": { "behat/mink-selenium2-driver": "^1.3", From a485ae65b391e1dd349aac5eb4dcc11b58e6b13d Mon Sep 17 00:00:00 2001 From: Yozhef Date: Thu, 11 Jan 2024 11:38:19 +0200 Subject: [PATCH 04/11] Update composer.json --- composer.json | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 621250a..14a4c74 100644 --- a/composer.json +++ b/composer.json @@ -11,11 +11,10 @@ } ], "require": { - "php": "^7.4 || ^8.0", + "php": "^8.1", "behat/behat": "^3.6.1", - "symfony/dependency-injection": "^4.4 || ^5.3 || ^6.0 || ^7.0", - "symfony/http-kernel": "^4.4 || ^5.3 || ^6.0 || ^7.0", - "symfony/proxy-manager-bridge": "^4.4 || ^5.3 || ^6.0" + "symfony/dependency-injection": "^6.2 || ^7.0", + "symfony/http-kernel": "^6.2 || ^7.0" }, "require-dev": { "behat/mink-selenium2-driver": "^1.3", @@ -25,10 +24,10 @@ "friends-of-behat/page-object-extension": "^0.3.2", "friends-of-behat/service-container-extension": "^1.1", "sylius-labs/coding-standard": ">=4.1.1, <=4.2.1", - "symfony/browser-kit": "^4.4 || ^5.3 || ^6.0 || ^7.0", - "symfony/framework-bundle": "^4.4 || ^5.3 || ^6.0 || ^7.0", - "symfony/process": "^4.4 || ^5.3 || ^6.0 || ^7.0", - "symfony/yaml": "^4.4 || ^5.3 || ^6.0 || ^7.0", + "symfony/browser-kit": "^6.2 || ^7.0", + "symfony/framework-bundle": "^6.2 || ^7.0", + "symfony/process": "^6.2 || ^7.0", + "symfony/yaml": "^6.2 || ^7.0", "vimeo/psalm": "4.30.0" }, "suggest": { From 4314b8b42848206fab74a4cb18fa29ccbff64350 Mon Sep 17 00:00:00 2001 From: Yozhef Date: Thu, 11 Jan 2024 11:39:52 +0200 Subject: [PATCH 05/11] Update build.yml --- .github/workflows/build.yml | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 79670bb..e45feb2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,24 +17,11 @@ jobs: fail-fast: false matrix: php-version: - - '7.4' - - '8.0' - '8.1' + - '8.2' symfony-version: - - '4.4.*' - - '5.4.*' - - '6.0.*' - - '6.1.*' - exclude: - - php-version: '7.4' - symfony-version: '6.0.*' - - php-version: '7.4' - symfony-version: '6.1.*' - - php-version: '8.0' - symfony-version: '6.1.*' - include: - - php-version: '8.2' - symfony-version: '7.0.*' + - '6.2.*' + - '7.0.*' steps: - name: Checkout uses: actions/checkout@v3 @@ -73,7 +60,7 @@ jobs: with: coverage: none ini-values: "memory_limit=-1, zend.assertions=1" - php-version: 7.4 + php-version: 8.2 tools: composer:v2, flex - name: Install dependencies @@ -97,7 +84,7 @@ jobs: with: coverage: none ini-values: "memory_limit=-1, zend.assertions=1" - php-version: 8.1 + php-version: 8.2 tools: composer:v2, flex - name: Validate composer.json @@ -116,7 +103,7 @@ jobs: with: coverage: none ini-values: "memory_limit=-1, zend.assertions=1" - php-version: 8.1 + php-version: 8.2 tools: composer:v2, flex - name: Install dependencies From a622acfc89027ea9d3a04d0ac3cff97ef56cab29 Mon Sep 17 00:00:00 2001 From: Yozhef Date: Thu, 11 Jan 2024 11:41:42 +0200 Subject: [PATCH 06/11] Update build.yml --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e45feb2..9114e6d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,6 +22,9 @@ jobs: symfony-version: - '6.2.*' - '7.0.*' + exclude: + - php-version: '8.1' + symfony-version: '7.0.*' steps: - name: Checkout uses: actions/checkout@v3 From 5ec94941c7faa02edea8a48c465876a8f96d8d69 Mon Sep 17 00:00:00 2001 From: Yozhef Date: Thu, 11 Jan 2024 11:44:18 +0200 Subject: [PATCH 07/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e42c621..2364e5a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@

SymfonyExtension

-This Behat extension provides an integration with Symfony (`^4.4`, `^5.3`, `^6.0` and `^7.0`) and Mink driver for Symfony application. +This Behat extension provides an integration with Symfony (`^6.0` and `^7.0`) and Mink driver for Symfony application. It allows for: From 2bbefc00744393e60f0619a45233b28c78ca8fae Mon Sep 17 00:00:00 2001 From: Yozhef Date: Thu, 11 Jan 2024 11:44:43 +0200 Subject: [PATCH 08/11] Update DOCUMENTATION.md --- DOCUMENTATION.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index 5fa0ecb..6abb6a6 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -11,7 +11,7 @@ If you're starting a new project, we recommend to use Symfony with Flex as it's the most straightforward way. If you're adding this extension to an existing project, pick the method that fits it the best. -### Symfony 4/5/6/7 (with Flex) +### Symfony 6/7 (with Flex) 1. Require this extension using *Composer* and allow for using contrib recipes: @@ -19,7 +19,7 @@ If you're adding this extension to an existing project, pick the method that fit composer require --dev friends-of-behat/symfony-extension:^2.0 ``` -### Symfony 4/5/6/7 (new directory structure, without Flex) +### Symfony 6/7 (new directory structure, without Flex) 1. Require this extension using *Composer*: From 6a207017c808df39772fadfc4b344d60747c24f8 Mon Sep 17 00:00:00 2001 From: Yozhef Date: Thu, 11 Jan 2024 11:45:01 +0200 Subject: [PATCH 09/11] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9114e6d..3c787e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,7 @@ jobs: - '8.2' symfony-version: - '6.2.*' + - '6.4.*' - '7.0.*' exclude: - php-version: '8.1' From 7ff97d303a6d3aa9e2d17926224beb38754516d7 Mon Sep 17 00:00:00 2001 From: Yozhef Date: Thu, 11 Jan 2024 12:12:27 +0200 Subject: [PATCH 10/11] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 14a4c74..6e35628 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "require-dev": { "behat/mink-selenium2-driver": "^1.3", "friends-of-behat/mink": "^1.9", - "friends-of-behat/mink-browserkit-driver": "^1.5", + "behat/mink-browserkit-driver": "^1.5", "friends-of-behat/mink-extension": "^2.5", "friends-of-behat/page-object-extension": "^0.3.2", "friends-of-behat/service-container-extension": "^1.1", From a6d2a9168cd9ade5cd7fb1e387cd3cdb29263964 Mon Sep 17 00:00:00 2001 From: Yozhef Date: Thu, 11 Jan 2024 16:55:38 +0200 Subject: [PATCH 11/11] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c787e3..b9bba79 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,7 @@ jobs: with: coverage: none ini-values: "memory_limit=-1, zend.assertions=1" - php-version: 8.2 + php-version: 8.1 tools: composer:v2, flex - name: Install dependencies