Skip to content

Merge 2.1.x into 3.0.x#738

Merged
ghostwriter merged 7 commits into3.0.xfrom
merge-up/2.1.x-into-3.0.x
Apr 3, 2026
Merged

Merge 2.1.x into 3.0.x#738
ghostwriter merged 7 commits into3.0.xfrom
merge-up/2.1.x-into-3.0.x

Conversation

@ghostwriter
Copy link
Copy Markdown
Owner

Merges the changes from the 2.1.x branch into the 3.0.x branch.

Updates the `phpunit/phpunit` dependency from `13.0.6` to `13.1.0`.

This pull request changes the following file(s):

- Update `composer.json`
- Update `composer.lock`

Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
Updates phpunit phar file from 13.0.6 to 13.1.0.

This pull request changes the following file(s):

- Update `phive.xml`
- Update `tools/phar/phpunit`

Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
Merges the changes from the `2.0.x` branch into the `2.1.x` branch.

Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter ghostwriter added this to the 2.0.1 milestone Apr 3, 2026
@ghostwriter ghostwriter added patch Backwards compatible bug fixes and improvements merge-up Pull request related to merging changes upwards labels Apr 3, 2026
@ghostwriter ghostwriter self-assigned this Apr 3, 2026
@ghostwriter ghostwriter merged commit 492f3d5 into 3.0.x Apr 3, 2026
1 check passed
@ghostwriter ghostwriter deleted the merge-up/2.1.x-into-3.0.x branch April 3, 2026 08:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merge-up Pull request related to merging changes upwards patch Backwards compatible bug fixes and improvements

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant