Backport php-cc-mode compatibility scaffolding - #828
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This is a compatibility backport from #812
rewrite/cc-free-php-modethat preparesmasterfor the eventual CC Mode-freephp-modetransition without changing the current defaultphp-modebehavior.lisp/php-cc-mode.elas a forward-compatible alias for the current CC Mode basedphp-modephp-cc-modealiasesphp-modephp-cc-mode-hook,php-cc-mode-lineup-cascaded-calls, andphp-cc-mode-enable-backup-style-variablesalias their currentphp-mode-*counterpartslisp/php-style.elscaffolding for the variable-based style systemphp-moderequire graphphp-mode-*customization variables fromphp-mode.eltophp.elmaster(php-mode-coding-styleremainspear,symfony2remains available)php-cc-modealias in CHANGELOGCompatibility notes
This PR intentionally avoids switching the active
php-modeimplementation. The current CC Mode basedphp-moderemains the default for file associations and behavior.The new
php-cc-mode.elfile is a transitional shim onmaster; when the rewrite branch is rebased on top of this PR, that shim is replaced by the real frozenphp-cc-modeimplementation.Test plan
make testAdditional rebase check performed locally:
rewrite/cc-free-php-modeonto this branch completed successfully after resolving expected scaffolding conflictsmake teston the rebased rewrite branch: 99 tests, 96 passed, 3 skipped, 0 unexpectedmake test-ccon the rebased rewrite branch: 16 tests, 16 passed, 0 unexpected