Skip to content

Merge 7.0.x into main#651

Open
ghostwriter wants to merge 15 commits intomainfrom
merge-up/7.0.x-into-main
Open

Merge 7.0.x into main#651
ghostwriter wants to merge 15 commits intomainfrom
merge-up/7.0.x-into-main

Conversation

@ghostwriter
Copy link
Owner

Merges the changes from the 7.0.x branch into the main branch.

Updates infection phar file from 0.32.5 to 0.32.6.

This pull request changes the following file(s):

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

Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
Updates the infection configuration files.

This pull request changes the following file(s):

- Update `infection.json5.dist`

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

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

Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter ghostwriter added this to the 6.0.2 milestone Feb 26, 2026
@ghostwriter ghostwriter added patch Backwards compatible bug fixes and improvements merge-up Pull request related to merging changes upwards labels Feb 26, 2026
@ghostwriter ghostwriter self-assigned this Feb 26, 2026
@ghostwriter ghostwriter force-pushed the merge-up/7.0.x-into-main branch 2 times, most recently from 3976203 to b698c12 Compare February 27, 2026 02:04
Updates composer configuration files.

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>
Merges the changes from the `6.0.x` branch into the `6.1.x` branch.

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

Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter ghostwriter force-pushed the merge-up/7.0.x-into-main branch 10 times, most recently from 4a9204f to cc090aa Compare March 1, 2026 17:44
@ghostwriter ghostwriter force-pushed the merge-up/7.0.x-into-main branch 9 times, most recently from 3a7e190 to 24629a7 Compare March 2, 2026 17:22
@ghostwriter ghostwriter force-pushed the merge-up/7.0.x-into-main branch from 24629a7 to 3e92da8 Compare March 2, 2026 20:06
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