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

MathTrig - Change Names of funcWhatever to evaluate #2006

Closed
wants to merge 3 commits into from
Closed

MathTrig - Change Names of funcWhatever to evaluate #2006

wants to merge 3 commits into from

Conversation

oleibman
Copy link
Collaborator

Per discussions while MathTrig was being broken up, this would help standardize the code. That idea was adopted partway through the breakup. This PR applies that standardization to the earlier efforts. A similar effort is required for DateTime; that will come later.

The only 2 remaining funcWhatevers in MathTrig are both in SUM, which required two different methods depending on whether or not string parameters were to be ignored. It seems appropriate to leave those method names non-standardized in order to require a decision about which is to be used if they are invoked internally.

I also changed the MatrixFunctions method names as part of this PR. This could create a conflict with PR #2005, even though I think the names I chose in this PR and the names in that one are identical. I can remove that part of this change if desired.

3 Phpstan grandfathered errors were eliminated as part of this change, and its baseline has changed accordingly.

This is:

- [ ] a bugfix
- [ ] a new feature
- [x] refactoring

Checklist:

Why this change is needed?

Per discussions while MathTrig was being broken up, this would help standardize the code. That idea was adopted partway through the breakup. This PR applies that standardization to the earlier efforts. A similar effort is required for DateTime; that will come later.

The only 2 remaining funcWhatevers in MathTrig are both in SUM, which required two different methods depending on whether or not string parameters were to be ignored. It seems appropriate to leave those method names non-standardized in order to require a decision about which is to be used if they are invoked internally.

I also changed the MatrixFunctions method names as part of this PR. This could create a conflict with PR #2005, even though I think the names I chose in this PR and the names in that one are identical. I can remove that part of this change if desired.

3 Phpstan grandfathered errors were eliminated as part of this change, and its baseline has changed accordingly.
@MarkBaker
Copy link
Member

Watch out for case-sensitivity in class/method names... we always try to use lower-camel-case for method names

@oleibman oleibman marked this pull request as draft April 18, 2021 16:56
@oleibman
Copy link
Collaborator Author

There are too many conflicts with #2005. I am converting to draft while I figure out the best way to handle this. I usually handle conflicts by hand, but that seems too unwieldy here. I could use a suggestion on what you feel the best approach would be.

I was not sure what your camel-case comment referred to. I thought all my name changes used 'evaluate'. Possibly you were referring to the 3 matrix functions, which I changed to all lower case as part of this PR. At any rate, please let me know if there are other names that still need attention.

@oleibman
Copy link
Collaborator Author

Aha - found uppercase Multiply, Inverse, Identity in my test members. I will resolve those now.

@oleibman oleibman marked this pull request as ready for review April 18, 2021 18:15
@oleibman oleibman marked this pull request as draft April 18, 2021 18:15
Let's see if another push clears it.
@oleibman
Copy link
Collaborator Author

I seem to have done something wrong - Github is "waiting for status to be reported". I will start over.

@MarkBaker
Copy link
Member

PHPStorm's merge tool is generally pretty good; but if it doesn't help you, I can probably do them a lot more quickly because I know exactly what I'm looking at

@oleibman
Copy link
Collaborator Author

Thank you for the tip. I'll look into it so that I'm better prepared next time this happens.

@oleibman
Copy link
Collaborator Author

Closing, replaced by #2008.

@oleibman oleibman closed this Apr 18, 2021
MarkBaker pushed a commit that referenced this pull request Apr 20, 2021
* MathTrig - Change Names of funcWhatever to evaluate

Per discussions while MathTrig was being broken up, this would help standardize the code. That idea was adopted partway through the breakup. This PR applies that standardization to the earlier efforts. A similar effort is required for DateTime; that will come later. This PR replaces #2006.

The only 2 remaining funcWhatevers in MathTrig are both in SUM, which required two different methods depending on whether or not string parameters were to be ignored. It seems appropriate to leave those method names non-standardized in order to require a decision about which is to be used if they are invoked internally.

3 Phpstan grandfathered errors were eliminated as part of this change, and its baseline has changed accordingly.

Co-authored-by: Mark Baker <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants