Skip to content

Merge 1.0.x into main#809

Merged
ghostwriter merged 11 commits intomainfrom
merge-up/1.0.x-into-main
Mar 31, 2026
Merged

Merge 1.0.x into main#809
ghostwriter merged 11 commits intomainfrom
merge-up/1.0.x-into-main

Conversation

@ghostwriter
Copy link
Copy Markdown
Member

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

Updates composer configuration files.

This pull request changes the following file(s):

- Update `composer.lock`

Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
Updates the `flake.nix` lock file

This pull request changes the following file(s):

- Update `flake.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.5 to 13.0.6.

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 `0.1.x` branch into the `0.2.x` branch.

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

Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@ghostwriter ghostwriter added this to the 0.1.1 milestone Mar 31, 2026
@ghostwriter ghostwriter added merge-up Pull request related to merging changes upwards patch Backwards compatible bug fixes and improvements labels Mar 31, 2026
@ghostwriter ghostwriter self-assigned this Mar 31, 2026
@ghostwriter ghostwriter merged commit 370e5f0 into main Mar 31, 2026
1 check passed
@ghostwriter ghostwriter deleted the merge-up/1.0.x-into-main branch March 31, 2026 09:11
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