Skip to content

Commit

Permalink
bug Sylius#285 Conflict behat/mink-selenium2-driver:>=1.7.0 && Bump…
Browse files Browse the repository at this point in the history
… version of `symfony/flex` to `^2.4` (Rafikooo)

This PR was merged into the 1.5 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.5
| Bug fix?        | yes
| New feature?    | no
| Related tickets | Sylius/Sylius-Standard#945

Both changes were interdependent, so I propose to combine them into one PR to achieve the green build

Commits
-------

7347d95 [Conflict] Add conflict with behat/mink-selenium2-driver:>=1.7.0
bea2505 [CI] Bump version of symfony/flex to ^2.4
  • Loading branch information
GSadee authored Feb 15, 2024
2 parents 65c1dca + bea2505 commit 9ab11fd
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
if: matrix.symfony != ''
run: |
composer global config --no-plugins allow-plugins.symfony/flex true
composer global require --no-progress --no-scripts --no-plugins "symfony/flex:1.18.5"
composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^2.4"
composer config --no-plugins allow-plugins.symfony/thanks true
composer config extra.symfony.require "${{ matrix.symfony }}"
Expand Down
10 changes: 10 additions & 0 deletions CONFLICTS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# CONFLICTS

This document explains why certain conflicts were added to `composer.json` and
references related issues.

- `behat/mink-selenium2-driver:>=1.7.0`:

This version adds strict type to the `Behat\Mink\Driver\Selenium2Driver::visit($url)` method
which causes a fatal error because the method signature is no longer compatible with the parent class:
`PHP Fatal error: Declaration of Behat\Mink\Driver\Selenium2Driver::visit(string $url) must be compatible with Behat\Mink\Driver\CoreDriver::visit($url) in /home/runner/work/Sylius-Standard/Sylius-Standard/vendor/behat/mink-selenium2-driver/src/Selenium2Driver.php on line 401`
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@
"autoload-dev": {
"classmap": ["tests/Application/Kernel.php"]
},
"conflict": {
"behat/mink-selenium2-driver": ">=1.7.0"
},
"config": {
"sort-packages": true,
"allow-plugins": {
Expand Down

0 comments on commit 9ab11fd

Please sign in to comment.