Skip to content

[4.x] merge up 3.x - #239

Merged
acoulton merged 10 commits into
Behat:v4.xfrom
acoulton:4-x-merge-up-20260928
Sep 28, 2026
Merged

acoulton merged 10 commits into
Behat:v4.xfrom
acoulton:4-x-merge-up-20260928

Conversation

@acoulton

Copy link
Copy Markdown
Contributor

No description provided.

acoulton and others added 10 commits June 23, 2026 07:47
* Fix the reference to the 3.0 docs version (=> 3.x)
* Add the 4.x version
* Update to show that `latest` (the default version) now points to 4.x
* ci: crate-cy/typos action no longer has a`master` tag

The project have renamed their default branch to `main`, so our build was breaking.
It's better to pin something like this to a specific version anyway, so that any new
typo detections happen in a version bump commit rather than an unrelated build.

* ci: Run on push to all version branches

The build was hardcoded to run only on 'v3.0', so wasn't running on push since
we renamed the version branch to `v3.x`, or on the new `v4.x` branch (it was only
running on PRs).

* ci: Add dependabot config to bump Github actions
Bumps the majors group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [actions/upload-artifact](https://github.com/actions/upload-artifact).


Updates `actions/checkout` from 4 to 7
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4...v7)

Updates `actions/upload-artifact` from 4 to 7
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v4...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: majors
- dependency-name: actions/upload-artifact
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: majors
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [setuptools](https://github.com/pypa/setuptools) from 78.1.1 to 83.0.0.
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst)
- [Commits](pypa/setuptools@v78.1.1...v83.0.0)

---
updated-dependencies:
- dependency-name: setuptools
  dependency-version: 83.0.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Coulton <andrew@ingenerator.com>
Bumps [anyio](https://github.com/agronholm/anyio) from 4.9.0 to 4.14.2.
- [Release notes](https://github.com/agronholm/anyio/releases)
- [Commits](agronholm/anyio@4.9.0...4.14.2)

---
updated-dependencies:
- dependency-name: anyio
  dependency-version: 4.14.2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Coulton <andrew@ingenerator.com>
…t#234)

Strengthen the recommendation against using PHPUnit, and add details
of the PHPUnit assertions extension.

Also gave a little more info on the well-known assertion libraries (matching
what we now say in the PHPUnit assertions extension readme).
For the new mode, and to cover Rule and multiple step args support.
Our policy says that we will set an EOL for each major series at the release of the next
major, and that we will give at least 12 months of bugfix and 24 months of security.

Now that 4.0 is released, we can set the EOL for 3.x.

We have intentionally restricted the scope of 4.0 so that it should be possible to
upgrade most of the way with automated tools (Rector to convert to attributes,
in-built tools to migrate to PHP config, etc).

We also know that 3.x has been out for a long time and is generally stable - we
don't get huge numbers of new bug reports.

Therefore I think it's fine to offer our minimum 12 month / 24 month EOLs for 3.x.

@carlos-granados carlos-granados left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@acoulton
acoulton merged commit fe54e8c into Behat:v4.x Sep 28, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants