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

Upgrade When package to the lastest version #15223

Merged
merged 5 commits into from
Oct 13, 2019

Conversation

seamuslee001
Copy link
Contributor

@seamuslee001 seamuslee001 commented Sep 5, 2019

Overview

This picks up the work from @agileware-pengyi in #14903 and goes for more of a straight composer way with this PR. Note that this PR is expected to fail testing

Note to @agh1 please make sure @agileware-pengyi is credited

Before

Old version of When package is used

After

Newer version of When package used

In terms of tests i am expecting that CRM/Core/BAO/RecurringEntityTest is going to fail as it is locally which suggests we do have some unit tests already covering this code

ping @jusfreeman @eileenmcnaughton

Agileware ref: CIVICRM-1223

@civibot civibot bot added the master label Sep 5, 2019
@civibot
Copy link

civibot bot commented Sep 5, 2019

(Standard links)

@seamuslee001 seamuslee001 force-pushed the when_package_upgrade branch 3 times, most recently from de607b4 to cbe9baa Compare September 6, 2019 01:04
@eileenmcnaughton
Copy link
Contributor

fail relates

@jusfreeman
Copy link
Contributor

@seamuslee001 thanks and thanks for adding the Agileware ref! Legend!

@seamuslee001
Copy link
Contributor Author

@jusfreeman i'm not sure how to fix the test failures but given that Pengyi has looked into it already maybe he can give some guidance here

@jusfreeman
Copy link
Contributor

@seamuslee001 we won't be able to get to this one today, however should have time next week. It's on our board to action.

Copy link
Contributor

@agileware-pengyi agileware-pengyi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have reviewed the fails.
Should I submit a new PR against this branch or the master branch?

CRM/Core/BAO/RecurringEntity.php Outdated Show resolved Hide resolved
CRM/Core/BAO/RecurringEntity.php Outdated Show resolved Hide resolved
@agileware-pengyi
Copy link
Contributor

I have made the changes in this commit

@seamuslee001
Copy link
Contributor Author

Thanks @agileware-pengyi i have brought that commit in, i will need another reviewer to review this now @eileenmcnaughton @monishdeb

@eileenmcnaughton
Copy link
Contributor

eileenmcnaughton commented Sep 11, 2019

@seamuslee001 I think this is mergeable it you and @agileware-pengyi have reached agreement - without having gone into the code to the level you two have nothing jumps out as concerning

@agileware-pengyi
Copy link
Contributor

@seamuslee001 thanks

@seamuslee001
Copy link
Contributor Author

@eileenmcnaughton @agileware-pengyi i have also just pushed one minor change which is setting the ignoring of exceptions to only happen when in UnitTests UF because i figure we still want Execptions to be thrown so they show up as status messages

@agileware-pengyi
Copy link
Contributor

@eileenmcnaughton @agileware-pengyi i have also just pushed one minor change which is setting the ignoring of exceptions to only happen when in UnitTests UF because i figure we still want Execptions to be thrown so they show up as status messages

That makes sense to me. Just noting that this exception with message The start date must be the first occurrence. is not checked by the old version.

@agileware-pengyi
Copy link
Contributor

Working on exclude dates issue. It needs some changes for the new version.

@agileware-pengyi
Copy link
Contributor

agileware-pengyi commented Sep 12, 2019

Following the old way to generate the occurrences. see agileware@410b858

More confidence with this one because of fewer changes.

One thing I notice is that error is not defined in both old and new version. Should we keep it?

$r->errors[] = 'Repeats every: is a required field';

@jusfreeman
Copy link
Contributor

@seamuslee001 ping just in case you missed it

@monishdeb
Copy link
Member

Awesome. And after merging this PR we need to remove the When package thus there should be a followup PR that removes it from packages/*

@seamuslee001
Copy link
Contributor Author

thanks @agileware-pengyi incorporated now

@seamuslee001
Copy link
Contributor Author

@monishdeb packages PR is here civicrm/civicrm-packages#264

@eileenmcnaughton
Copy link
Contributor

Ug - needs a rebase

Update composer.lock to match the commits's composer.json
@seamuslee001
Copy link
Contributor Author

rebased now @eileenmcnaughton

@mattwire
Copy link
Contributor

Merging so we get plenty of testing during the 5.20 release cycle. @seamuslee001 Do we need a PR to remove from packages?

@mattwire mattwire merged commit d5ef1ed into civicrm:master Oct 13, 2019
@eileenmcnaughton eileenmcnaughton deleted the when_package_upgrade branch October 13, 2019 16:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants