This is our custom fork of php with a small feature added (autoescaping for html)
- Fetch the origin
- Create a new branch at the git tag of the php release we want to use
- Cherry-pick the commit that adds our feature
- Merging can be done too, but there are often far more conflicts
- Deal with conflicts (usually few)
- Ensure the copied (and slightly changed) functions in
Zend/zend_compile.c
andZend/zend_vm_def.h
are just like their copied from counterparts. - git add the changes and continue the cherry-pick.
- run
php Zend/zend_vm_gen.php
and commit the resultant files - Build php (using the build script in our infrastructure repo) on this branch.
- Try running some of the tests that have been added in our patch
- Open a pull here into the
ifixit-production
branch.