Merge release 2.26.0 into 3.0.x

laminas / laminas-diactoros

PSR HTTP Message implementations

https://docs.laminas.dev/laminas-diactoros/

BSD 3-Clause "New" or "Revised" License

483 stars 63 forks source link

Merge release 2.26.0 into 3.0.x #177

Closed github-actions[bot] closed 10 months ago

github-actions[bot] commented 1 year ago

Release Notes for 2.26.0

Feature release (minor)

2.26.0

Total issues resolved: 0
Total pull requests resolved: 1
Total contributors: 1

Enhancement

176: Update PHP constraints to allow v8.3 thanks to @ADmad

Ocramius commented 1 year ago

I think that the cleanest approach here is to merge-up with no changes, as in resetting HEAD to 3.0.x and having the merge commit with an empty diff, leading therefore to a clean merge-up in future.

Also means that we don't need to do any releases: all security fixes from 2.x would smoothly go up to 3.x too

gsteel commented 10 months ago

I think that the cleanest approach here is to merge-up with no changes, as in resetting HEAD to 3.0.x and having the merge commit with an empty diff, leading therefore to a clean merge-up in future.

Also means that we don't need to do any releases: all security fixes from 2.x would smoothly go up to 3.x too

@Ocramius

So just checkout this branch, git reset hard to 3.0.x, force push and then release 3.0.1, and subsequently 3.1.x, 3.2.x and 3.3.x after all the clean merge-ups are made?

Xerkus commented 10 months ago

No. Merge up into latest with no effective changes. I'll do this.