[REF] Move functions back to class that uses it #20136
Merged
Conversation
This file contains 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
|
(Standard links)
|
|
@eileenmcnaughton checkstyle got mad |
|
take that jenkins |
eileenmcnaughton
force-pushed
the
dom
branch
3 times, most recently
from
241cb61 to
6857c99
Compare
eileenmcnaughton
changed the title
| @@ -227,7 +227,7 @@ public static function isHtmlTokenInTableCell($token, $entity, $textToSearch) { | |||
| * @return string | |||
| * @throws \CRM_Core_Exception | |||
| */ | |||
| private static function resolveTokens(string $html_message, $contact, $contribution, $messageToken, $grouped, $separator, $contributions): string { | |||
| public static function resolveTokens(string $html_message, $contact, $contribution, $messageToken, $grouped, $separator, $contributions): string { | |||
There was a problem hiding this comment.
I'm going to move this in a bit but it started spiralling so left it for now
|
@colemanw can you merge this - the tests that go through this code would fatal if there is an issue in this as the main risk area is fixing references to 'self' & visibility |
|
Ok looks good. |
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.
Overview
[REF] Move function back to class that uses it
Before
The class CRM_Contribute_Form_Task_PDFLetterCommon is not called from anywhere else in the git universe but functions that are really part of CRM_Contribute_Form_Task_PDF as 'distributed' onto it
After
some of the functions moved back - will move more in a bit
Technical Details
A couple of functions have been made public but in the end they won't be
Note these PDFLetterCommon classes are a pretty weird structure - I think they are about 10% trying to emulate a trait & 90% copy and paste
Comments
CRM_Contribute_Form_Task_PDFLetterCommonTest tests pass through all these lines of code