Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added submodules, fixes #291 #292

Merged
merged 1 commit into from Jan 3, 2022
Merged

Added submodules, fixes #291 #292

merged 1 commit into from Jan 3, 2022

Conversation

fox91
Copy link

@fox91 fox91 commented Sep 3, 2021

No description provided.

@dbrekelmans
Copy link
Collaborator

Hi @fox91, thanks for the PR! I like the idea of submodules in this case.

If you resolve the conflicts, I will let the CI jobs run

@fox91
Copy link
Author

fox91 commented Sep 4, 2021

Hi @fox91, thanks for the PR! I like the idea of submodules in this case.

If you resolve the conflicts, I will let the CI jobs run

This PR is supposed to be merged in a new branch created after tag v1.3.3 (as I done in my fork).
This way is possible to solve other bug and maintain support to PHP 7.3+

After that you can also merge with main branch (overwrite generator/doc/update.sh with the new one).

@dbrekelmans dbrekelmans changed the base branch from master to 1.x January 3, 2022 14:59
@dbrekelmans dbrekelmans merged commit 194bf34 into thecodingmachine:1.x Jan 3, 2022
@dbrekelmans
Copy link
Collaborator

Hi @fox91, sorry for the late response, but I've merged this to a new 1.x branch. Any future bugfixes regarding PHP7.x can be targeted against this branch and it will use the specific php-docs commit that you have introduced here.

Thanks for the contribution!

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.

None yet

2 participants