Skip to content

Commit 54a7139

Browse files
authored
minor #428 Update supported branches in README file and PR template (GSadee)
This PR was merged into the 1.4 branch. Discussion ---------- | Q | A | --------------- | ----- | Branch? | 1.4 | Bug fix? | no | New feature? | no | Related tickets | Commits ------- 4fc1d54 Update supported branches in README file 4fb850f Update PR template 6cbbd85 Add conflict to behat/mink-selenium2-driver to fix the builds
2 parents 645dad8 + 6cbbd85 commit 54a7139

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| Q | A
22
| --------------- | -----
3-
| Branch? | 1.3 (security fixes), 1.4 (bug fixes, improvements), 1.5 (new features)
3+
| Branch? | 1.4 (security fixes), 1.5 (bug fixes, improvements), 1.6 (new features)
44
| Bug fix? | no/yes
55
| New feature? | no/yes
66
| Related tickets | fixes #X, partially #Y, mentioned in #Z

CONFLICTS.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# CONFLICTS
2+
3+
This document explains why certain conflicts were added to `composer.json` and
4+
references related issues.
5+
6+
- `behat/mink-selenium2-driver:>=1.7.0`:
7+
8+
This version adds strict type to the `Behat\Mink\Driver\Selenium2Driver::visit($url)` method
9+
which causes a fatal error because the method signature is no longer compatible with the parent class.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ Tagged services would be executed according to their priority (descending).
130130
131131
## Supported branches
132132
133-
* `1.3` (v1.3.*) - security fixes
134-
* `1.4` (v1.4.*) - bug fixes, improvements
135-
* `1.5` (v1.5.*) - new features
133+
* `1.4` (v1.4.*) - security fixes
134+
* `1.5` (v1.5.*) - bug fixes, improvements
135+
* `1.6` (v1.6.*) - new features
136136
* `2.0` (v2.0.*) - new features, removing deprecations, BC breaks
137137
138138
## Security issues

composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@
5656
"symfony/web-profiler-bundle": "^5.4 || ^6.0",
5757
"symfony/webpack-encore-bundle": "^1.15"
5858
},
59+
"conflict": {
60+
"behat/mink-selenium2-driver": ">=1.7.0"
61+
},
5962
"autoload": {
6063
"psr-4": {
6164
"Sylius\\RefundPlugin\\": "src/",

0 commit comments

Comments
 (0)