civicrm-core.git
4 years agodev/core#1961 Fix regression - cancel button not working on recurring contributions
eileen [Thu, 20 Aug 2020 11:08:27 +0000 (23:08 +1200)]
dev/core#1961 Fix regression - cancel button not working on recurring contributions

Note this form only shows for some processors. To test an easy way is to edit
CRM_Core_Payment::supportsCancelRecurring to return FALSE

Then attempt to cancel a recurring contribution - the cancel button does not launch a form
without this.

Regression from
https://github.com/civicrm/civicrm-core/pull/17178/files#diff-63d76bd172c85725aaf2e76247b86354L11

https://lab.civicrm.org/dev/core/-/issues/1961

4 years agoMerge pull request #18180 from eileenmcnaughton/recur
Eileen McNaughton [Wed, 19 Aug 2020 03:47:37 +0000 (15:47 +1200)]
Merge pull request #18180 from eileenmcnaughton/recur

dev/core#1945 Fix recur access regression

4 years agodev/core#1945 Fix recur access regression
eileen [Mon, 17 Aug 2020 09:17:09 +0000 (21:17 +1200)]
dev/core#1945 Fix recur access regression

4 years agoMerge pull request #18174 from demeritcowboy/d8-upgrade-warning
Eileen McNaughton [Tue, 18 Aug 2020 04:20:46 +0000 (16:20 +1200)]
Merge pull request #18174 from demeritcowboy/d8-upgrade-warning

dev/core#1937 - Upgrade message about needing composer patching turned on and updating mysql in DSN strings

4 years agoMerge pull request #18185 from civicrm/revert-18091-xbutton-529
Eileen McNaughton [Tue, 18 Aug 2020 03:24:14 +0000 (15:24 +1200)]
Merge pull request #18185 from civicrm/revert-18091-xbutton-529

Revert "Swap out button/submit inputs for button elements"

4 years agoRevert "Swap out button/submit inputs for button elements"
colemanw [Tue, 18 Aug 2020 00:49:42 +0000 (20:49 -0400)]
Revert "Swap out button/submit inputs for button elements"

4 years agoupgrade message about composer patches
demeritcowboy [Sun, 16 Aug 2020 21:24:04 +0000 (17:24 -0400)]
upgrade message about composer patches

4 years agoMerge pull request #18175 from demeritcowboy/installation-doclinks
Seamus Lee [Sun, 16 Aug 2020 23:26:35 +0000 (09:26 +1000)]
Merge pull request #18175 from demeritcowboy/installation-doclinks

Installation doclinks not getting url-rewritten

4 years agoinstallation doclinks
demeritcowboy [Sun, 16 Aug 2020 22:29:50 +0000 (18:29 -0400)]
installation doclinks

4 years agoMerge pull request #18166 from demeritcowboy/cvv-required
Seamus Lee [Sun, 16 Aug 2020 21:00:19 +0000 (07:00 +1000)]
Merge pull request #18166 from demeritcowboy/cvv-required

cvv required html attribute should depend on backoffice setting

4 years agorequired
demeritcowboy [Sun, 16 Aug 2020 01:43:21 +0000 (21:43 -0400)]
required

4 years agoMerge pull request #18163 from seamuslee001/5.29
Seamus Lee [Sun, 16 Aug 2020 01:28:13 +0000 (11:28 +1000)]
Merge pull request #18163 from seamuslee001/5.29

[REF] Remove unnecessary comma

4 years ago[REF] Remove unnecessary comma
Seamus Lee [Sat, 15 Aug 2020 23:31:54 +0000 (09:31 +1000)]
[REF] Remove unnecessary comma

4 years agoMerge pull request #18133 from eileenmcnaughton/utf529
Seamus Lee [Sat, 15 Aug 2020 20:48:05 +0000 (06:48 +1000)]
Merge pull request #18133 from eileenmcnaughton/utf529

Fix 5.29 (unreleased) regression using temp tables

4 years agoMerge pull request #18149 from seamuslee001/dev_core_1952
Eileen McNaughton [Sat, 15 Aug 2020 00:56:41 +0000 (12:56 +1200)]
Merge pull request #18149 from seamuslee001/dev_core_1952

dev/core#1952 Remove uncessary component checking when exporting all …

4 years agoFix 5.29 regression using temp tables
eileen [Wed, 12 Aug 2020 04:20:38 +0000 (16:20 +1200)]
Fix 5.29 regression using temp tables

I just pushed 5.29rc through our WMF CI & it failed on a situation where it created a temp
table and that got joined on a non-temp table with a collation mix error. The issue is that the
DB default is set to utf8_general_ci (at least on our development DBs) whereas the
civicrm tables are utf8_unicode_ci. Until https://github.com/civicrm/civicrm-core/pull/18012/files
there was a list of permitted matches for db collation but now any 'utf' string matches.

From what I can tell utf8_general_ci  is a pretty common collation on drupal DBs and from my tests
it causes problems if not excluded here

4 years agodev/core#1952 Remove uncessary component checking when exporting all activities
Seamus Lee [Fri, 14 Aug 2020 23:22:08 +0000 (09:22 +1000)]
dev/core#1952 Remove uncessary component checking when exporting all activities

4 years agoMerge pull request #18144 from seamuslee001/dev_core_1953
Seamus Lee [Fri, 14 Aug 2020 23:04:42 +0000 (09:04 +1000)]
Merge pull request #18144 from seamuslee001/dev_core_1953

dev/core#1953 Ensure that Contribution pages do not fail validation o…

4 years agodev/core#1953 Ensure that Contribution pages do not fail validation on credit cards...
Seamus Lee [Fri, 14 Aug 2020 21:09:00 +0000 (07:09 +1000)]
dev/core#1953 Ensure that Contribution pages do not fail validation on credit cards when a zero dollar price is offered

4 years agoMerge pull request #18126 from eileenmcnaughton/dupe529
Seamus Lee [Tue, 11 Aug 2020 23:23:36 +0000 (09:23 +1000)]
Merge pull request #18126 from eileenmcnaughton/dupe529

dev/core#1934 fix regression on merging contacts with settings using contact_id

4 years agoMerge pull request #18123 from seamuslee001/dev_core_1936_alternate
Seamus Lee [Tue, 11 Aug 2020 22:49:39 +0000 (08:49 +1000)]
Merge pull request #18123 from seamuslee001/dev_core_1936_alternate

dev/core#1936 Make the price field value label field not required

4 years agodev/core#1934 fix regression on merging contacts with settings using contact_id
eileen [Tue, 11 Aug 2020 21:38:05 +0000 (09:38 +1200)]
dev/core#1934 fix regression on merging contacts with settings using contact_id

This is an interim fix to a reported regression. I'll look at more carefully in master when time permits

4 years agodev/core#1936 Make the price field value label field not required
Seamus Lee [Tue, 11 Aug 2020 00:09:36 +0000 (10:09 +1000)]
dev/core#1936 Make the price field value label field not required

Fix test and ensure default value is NULL

4 years agoMerge pull request #18091 from agh1/xbutton-529
Matthew Wire [Mon, 10 Aug 2020 12:42:37 +0000 (13:42 +0100)]
Merge pull request #18091 from agh1/xbutton-529

Swap out button/submit inputs for button elements

4 years agoMerge pull request #18101 from demeritcowboy/eventcart-settingcheck
Seamus Lee [Sat, 8 Aug 2020 04:27:00 +0000 (14:27 +1000)]
Merge pull request #18101 from demeritcowboy/eventcart-settingcheck

dev/event#40 - EventCart - Check legacy setting until extension is public

4 years agocheck legacy setting until extension is public
demeritcowboy [Sat, 8 Aug 2020 00:59:20 +0000 (20:59 -0400)]
check legacy setting until extension is public

4 years agoMerge pull request #18068 from seamuslee001/dev_wordpress_66
Seamus Lee [Sat, 8 Aug 2020 00:09:19 +0000 (10:09 +1000)]
Merge pull request #18068 from seamuslee001/dev_wordpress_66

dev/wordpress#66 Re-instate newer variables but with more support for…

4 years agoMerge pull request #18092 from seamuslee001/preimum_onbehalfof_fix
Eileen McNaughton [Fri, 7 Aug 2020 22:59:19 +0000 (10:59 +1200)]
Merge pull request #18092 from seamuslee001/preimum_onbehalfof_fix

[REF] Fix jquery validation for on behalf of fields when combined wit…

4 years ago[REF] Fix jquery validation for on behalf of fields when combined with a preimum
Seamus Lee [Fri, 7 Aug 2020 02:09:55 +0000 (12:09 +1000)]
[REF] Fix jquery validation for on behalf of fields when combined with a preimum

4 years agoMerge pull request #17950 from lcdservices/dev-core-1895
Seamus Lee [Thu, 6 Aug 2020 22:53:24 +0000 (08:53 +1000)]
Merge pull request #17950 from lcdservices/dev-core-1895

dev/core#1895 fix first/last name adv search

4 years agoMore radical cleanup of button CSS
Andrew Hunt [Thu, 6 Aug 2020 22:17:31 +0000 (18:17 -0400)]
More radical cleanup of button CSS

4 years agoFix CSS for new buttons
Andrew Hunt [Thu, 6 Aug 2020 22:00:58 +0000 (18:00 -0400)]
Fix CSS for new buttons

4 years agoFix JS for input buttons that are now button buttons
Andrew Hunt [Thu, 6 Aug 2020 20:06:56 +0000 (16:06 -0400)]
Fix JS for input buttons that are now button buttons

4 years agoRemove deprecated submitOnce js function
Andrew Hunt [Thu, 6 Aug 2020 19:36:47 +0000 (15:36 -0400)]
Remove deprecated submitOnce js function

4 years agoNo need for crm-button wrappers for real buttons
Andrew Hunt [Thu, 6 Aug 2020 18:57:11 +0000 (14:57 -0400)]
No need for crm-button wrappers for real buttons

4 years agoGive buttons a value when the submitted value is used to identify them
Andrew Hunt [Thu, 6 Aug 2020 17:55:52 +0000 (13:55 -0400)]
Give buttons a value when the submitted value is used to identify them

4 years agoPut icons inside of button elements
Andrew Hunt [Thu, 6 Aug 2020 17:12:36 +0000 (13:12 -0400)]
Put icons inside of button elements

4 years agoSwap out button/submit inputs for button elements
Andrew Hunt [Thu, 6 Aug 2020 15:19:56 +0000 (11:19 -0400)]
Swap out button/submit inputs for button elements

4 years agoMerge pull request #18088 from agh1/forcebackend
Seamus Lee [Thu, 6 Aug 2020 22:35:44 +0000 (08:35 +1000)]
Merge pull request #18088 from agh1/forcebackend

dev/core#1905 force backend links for new "configure" buttons

4 years agoMerge pull request #18085 from totten/5.29-periodic
Seamus Lee [Thu, 6 Aug 2020 21:27:55 +0000 (07:27 +1000)]
Merge pull request #18085 from totten/5.29-periodic

dev/core#1932 - Make status-checks more polite during upgrade

4 years agodev/wordpress#66 Re-instate newer variables but with more support for legacy file...
Seamus Lee [Tue, 4 Aug 2020 20:59:25 +0000 (06:59 +1000)]
dev/wordpress#66 Re-instate newer variables but with more support for legacy file systems

4 years agodev/core#1905 force backend links for new "configure" buttons
Andrew Hunt [Thu, 6 Aug 2020 18:31:40 +0000 (14:31 -0400)]
dev/core#1905 force backend links for new "configure" buttons

4 years agodev/core#1932 - Make status-checks more polite during upgrade
Tim Otten [Thu, 6 Aug 2020 09:04:36 +0000 (02:04 -0700)]
dev/core#1932 - Make status-checks more polite during upgrade

Before
------

If you happen to run a status-check (eg `showPeriodicAlerts()`) in the interim between
downloading code and running DB upgrades, then you'll get weird failures.

After
-----

The status-checks are able to complete.

Technical Details
-----------------

(1) I figure that this conditional is lightweight because it relies on data
that's read-once and then cached in memory:

```
CRM_Utils_System::version() !== CRM_Core_BAO_Domain::version()
```

(2) The easiest way to reproduce is to get a DB from before 4.7 and coerce
`CRM_Utils_Check::CHECK_TIMER`.

4 years agoSet version to 5.29.beta1
CiviCRM [Thu, 6 Aug 2020 06:23:07 +0000 (06:23 +0000)]
Set version to 5.29.beta1

4 years agoMerge pull request #18080 from seamuslee001/dev_core_1928
Seamus Lee [Thu, 6 Aug 2020 03:54:01 +0000 (13:54 +1000)]
Merge pull request #18080 from seamuslee001/dev_core_1928

dev/core#1928 Fix HTML5 error due to required attribute being set swi…

4 years agoMerge pull request #18084 from civicrm/5.28
Seamus Lee [Thu, 6 Aug 2020 03:25:30 +0000 (13:25 +1000)]
Merge pull request #18084 from civicrm/5.28

5.28

4 years agoMerge pull request #18083 from totten/5.28-rn
Tim Otten [Thu, 6 Aug 2020 03:23:56 +0000 (20:23 -0700)]
Merge pull request #18083 from totten/5.28-rn

(NFC) 5.28.0.md - Describe last minute PR. Random copyedits.

4 years agoMerge pull request #18082 from seamuslee001/master
Seamus Lee [Thu, 6 Aug 2020 02:53:29 +0000 (12:53 +1000)]
Merge pull request #18082 from seamuslee001/master

5.28

4 years ago5.28.0.md - Describe last minute PR. Random copyedits.
Tim Otten [Thu, 6 Aug 2020 02:47:27 +0000 (19:47 -0700)]
5.28.0.md - Describe last minute PR. Random copyedits.

4 years agoMerge in 5.28
Seamus Lee [Thu, 6 Aug 2020 02:38:20 +0000 (12:38 +1000)]
Merge in 5.28

4 years agoMerge pull request #18079 from eileenmcnaughton/528
Seamus Lee [Thu, 6 Aug 2020 02:35:59 +0000 (12:35 +1000)]
Merge pull request #18079 from eileenmcnaughton/528

dev/core#1930 fix for move-related checkbox being overridden to true …

4 years agodev/core#1928 Fix HTML5 error due to required attribute being set switch to using...
Seamus Lee [Thu, 6 Aug 2020 01:18:33 +0000 (11:18 +1000)]
dev/core#1928 Fix HTML5 error due to required attribute being set switch to using a class as jquery.validation picks up the class as well

4 years agodev/core#1930 fix for move-related checkbox being overridden to true in form
eileen [Thu, 6 Aug 2020 00:50:43 +0000 (12:50 +1200)]
dev/core#1930 fix for move-related checkbox being overridden to true in form

4 years agoMerge pull request #18078 from eileenmcnaughton/directp
Seamus Lee [Wed, 5 Aug 2020 23:16:02 +0000 (09:16 +1000)]
Merge pull request #18078 from eileenmcnaughton/directp

dev/financial#135 Remove stub function from payflowPro

4 years agoMerge pull request #18077 from civicrm/5.28
Seamus Lee [Wed, 5 Aug 2020 22:14:57 +0000 (08:14 +1000)]
Merge pull request #18077 from civicrm/5.28

5.28

4 years agoMerge pull request #18000 from eileenmcnaughton/brn
Seamus Lee [Wed, 5 Aug 2020 21:20:04 +0000 (07:20 +1000)]
Merge pull request #18000 from eileenmcnaughton/brn

Fix button name on updated form

4 years agoRemove stub function
eileen [Wed, 5 Aug 2020 21:05:56 +0000 (09:05 +1200)]
Remove stub function

We used to do this, we don't now

4 years agoMerge pull request #18074 from agh1/5.28.0-releasenotes-final
Mathieu Lu [Wed, 5 Aug 2020 20:33:23 +0000 (16:33 -0400)]
Merge pull request #18074 from agh1/5.28.0-releasenotes-final

5.28.0 release notes final edits

4 years ago5.28.0 release notes: added late changes
Andrew Hunt [Wed, 5 Aug 2020 18:50:10 +0000 (14:50 -0400)]
5.28.0 release notes: added late changes

4 years ago5.28.0 release notes: misc edits
Andrew Hunt [Wed, 5 Aug 2020 16:04:32 +0000 (12:04 -0400)]
5.28.0 release notes: misc edits

4 years agoMerge pull request #18073 from seamuslee001/provider_test_php74
Eileen McNaughton [Wed, 5 Aug 2020 12:20:24 +0000 (00:20 +1200)]
Merge pull request #18073 from seamuslee001/provider_test_php74

[NFC] Fix provider unit test on PHP7.4

4 years agoMerge pull request #17981 from eileenmcnaughton/merge_form
Eileen McNaughton [Wed, 5 Aug 2020 12:18:52 +0000 (00:18 +1200)]
Merge pull request #17981 from eileenmcnaughton/merge_form

[REF] Move handling of form elements back to the Form

4 years agoMerge pull request #18071 from eileenmcnaughton/anet
Matthew Wire [Wed, 5 Aug 2020 10:26:48 +0000 (11:26 +0100)]
Merge pull request #18071 from eileenmcnaughton/anet

Do not pass-by-reference to recur function

4 years agoMerge pull request #18072 from eileenmcnaughton/manual
Matthew Wire [Wed, 5 Aug 2020 10:26:16 +0000 (11:26 +0100)]
Merge pull request #18072 from eileenmcnaughton/manual

dev/financial#135 Remove unreachable doDirectPayment from manual processor

4 years ago[NFC] Fix provider unit test on PHP7.4
Seamus Lee [Wed, 5 Aug 2020 10:14:03 +0000 (20:14 +1000)]
[NFC] Fix provider unit test on PHP7.4

4 years agoMerge pull request #18049 from christianwach/lab-core-1891
Matthew Wire [Wed, 5 Aug 2020 09:57:03 +0000 (10:57 +0100)]
Merge pull request #18049 from christianwach/lab-core-1891

Refactor "applyLocale" and remove references to "language" column in UFMatch table

4 years agodev/financial#135 Remove unreachable doDirectPayment from manual processor
eileen [Wed, 5 Aug 2020 06:35:45 +0000 (18:35 +1200)]
dev/financial#135 Remove unreachable doDirectPayment from manual processor

doDirectPayment is only ever called (deprecated) when doPayment is not overriden (for quite some time now). This is
unreachable & can be removed

4 years agoDo not pass-by-reference to recur function
eileen [Wed, 5 Aug 2020 06:25:53 +0000 (18:25 +1200)]
Do not pass-by-reference to recur function

This is called once, from the main function and the values are not used again

4 years agoMerge pull request #18065 from colemanw/cronAlert
Eileen McNaughton [Wed, 5 Aug 2020 03:51:33 +0000 (15:51 +1200)]
Merge pull request #18065 from colemanw/cronAlert

Show cron warning on Scheduled Jobs admin page

4 years agoMerge pull request #18069 from civicrm/5.28
Eileen McNaughton [Wed, 5 Aug 2020 02:32:59 +0000 (14:32 +1200)]
Merge pull request #18069 from civicrm/5.28

5.28

4 years agoAPIv4 - Fix potential PHP undefined index warning
Coleman Watts [Wed, 5 Aug 2020 01:22:43 +0000 (21:22 -0400)]
APIv4 - Fix potential PHP undefined index warning

Ensures the array key '0' exists in the where clause before accessing it.

4 years agoMerge pull request #18070 from seamuslee001/dev_core_1927
Seamus Lee [Wed, 5 Aug 2020 00:48:44 +0000 (10:48 +1000)]
Merge pull request #18070 from seamuslee001/dev_core_1927

dev/core#1927 Ensure that the contents of the database table are fixe…

4 years agoMerge pull request #18056 from pradpnayak/invopdf
Eileen McNaughton [Tue, 4 Aug 2020 23:38:57 +0000 (11:38 +1200)]
Merge pull request #18056 from pradpnayak/invopdf

Use correct pdf package to generate pdf file on invoice download/email activity

4 years agodev/core#1927 Ensure that the contents of the database table are fixed up before...
Seamus Lee [Tue, 4 Aug 2020 23:19:17 +0000 (09:19 +1000)]
dev/core#1927 Ensure that the contents of the database table are fixed up before changing the column type

4 years agoMerge pull request #18066 from seamuslee001/dev_drupal_131
Seamus Lee [Tue, 4 Aug 2020 22:34:17 +0000 (08:34 +1000)]
Merge pull request #18066 from seamuslee001/dev_drupal_131

dev/drupal#131 Ensure that the General class exists

4 years agodev/drupal#131 Ensure that the General class exists
Seamus Lee [Tue, 4 Aug 2020 20:48:47 +0000 (06:48 +1000)]
dev/drupal#131 Ensure that the General class exists

4 years agoMerge pull request #18005 from agh1/button-icon-placement
Seamus Lee [Tue, 4 Aug 2020 20:24:06 +0000 (06:24 +1000)]
Merge pull request #18005 from agh1/button-icon-placement

Fix buggy placement of icons on buttons

4 years agoMerge pull request #18058 from eileenmcnaughton/date
Seamus Lee [Tue, 4 Aug 2020 20:22:55 +0000 (06:22 +1000)]
Merge pull request #18058 from eileenmcnaughton/date

[REF] Even less variable variables

4 years agoShow cron warning on Scheduled Jobs admin page
Coleman Watts [Tue, 4 Aug 2020 20:19:09 +0000 (16:19 -0400)]
Show cron warning on Scheduled Jobs admin page

4 years agoMerge pull request #18064 from agh1/configicons-ts
Eileen McNaughton [Tue, 4 Aug 2020 19:34:24 +0000 (07:34 +1200)]
Merge pull request #18064 from agh1/configicons-ts

dev/core#1905 rework #17942 with simpler ts strings

4 years agodev/core#1905 rework #17942 with simpler ts strings
Andrew Hunt [Tue, 4 Aug 2020 17:04:37 +0000 (13:04 -0400)]
dev/core#1905 rework #17942 with simpler ts strings

4 years agoMerge pull request #18039 from eileenmcnaughton/mail
Matthew Wire [Tue, 4 Aug 2020 13:40:02 +0000 (14:40 +0100)]
Merge pull request #18039 from eileenmcnaughton/mail

Extract code to set isEmailReceipt in Contribution.completeOrder

4 years agoMerge pull request #18055 from eileenmcnaughton/curr_copy
Matthew Wire [Tue, 4 Aug 2020 13:38:37 +0000 (14:38 +0100)]
Merge pull request #18055 from eileenmcnaughton/curr_copy

[REF] remove first attempt to set currency in repeattransaction flow

4 years agoMerge pull request #18063 from civicrm/5.28
Seamus Lee [Tue, 4 Aug 2020 11:58:07 +0000 (21:58 +1000)]
Merge pull request #18063 from civicrm/5.28

5.28

4 years agoMerge pull request #17942 from jitendrapurohit/configure-link
Eileen McNaughton [Tue, 4 Aug 2020 11:57:00 +0000 (23:57 +1200)]
Merge pull request #17942 from jitendrapurohit/configure-link

dev/core#1905 Add configure icons on public pages

4 years agoMerge pull request #17995 from colemanw/updateHook
Eileen McNaughton [Tue, 4 Aug 2020 11:32:52 +0000 (23:32 +1200)]
Merge pull request #17995 from colemanw/updateHook

CRM_Utils_Hook: deprecation warning and short array syntax

4 years agoMerge pull request #18040 from MegaphoneJon/selfservice-fixes
Eileen McNaughton [Tue, 4 Aug 2020 11:30:37 +0000 (23:30 +1200)]
Merge pull request #18040 from MegaphoneJon/selfservice-fixes

event#35: move statusBounce out of BAO layer; don't allow self-service when dis…

4 years agoMerge pull request #18054 from agh1/no-button-bg
Matthew Wire [Tue, 4 Aug 2020 11:30:28 +0000 (12:30 +0100)]
Merge pull request #18054 from agh1/no-button-bg

Why not make the buttons flat?

4 years agoMerge pull request #18061 from seamuslee001/5274_notes
Seamus Lee [Tue, 4 Aug 2020 10:13:27 +0000 (20:13 +1000)]
Merge pull request #18061 from seamuslee001/5274_notes

[NFC] 5.27.4 Release Notes

4 years agoMerge pull request #18062 from eileenmcnaughton/error_juice
Matthew Wire [Tue, 4 Aug 2020 10:05:44 +0000 (11:05 +0100)]
Merge pull request #18062 from eileenmcnaughton/error_juice

Improve error handling on IPN

4 years agoremoved unused statements
Pradeep Nayak [Tue, 4 Aug 2020 08:36:49 +0000 (09:36 +0100)]
removed unused statements

4 years agoImprove error handling on IPN
eileen [Tue, 4 Aug 2020 07:44:33 +0000 (19:44 +1200)]
Improve error handling on IPN

https://civicrm.stackexchange.com/questions/37277/paypal-standard-payments-are-being-accepted-but-marked-as-incomplete-transaction/37279#37279

shows how unhelpful this error is - getting data from the exception should help.

Targetting 5.28 in case the gitlab relates to a regression & we need to solicit more debug info

4 years agorelease-notes.md - Small copy-edits
Tim Otten [Tue, 4 Aug 2020 06:26:11 +0000 (23:26 -0700)]
release-notes.md - Small copy-edits

4 years agoAdd release-notes/5.27.4.md
Tim Otten [Mon, 3 Aug 2020 10:04:07 +0000 (03:04 -0700)]
Add release-notes/5.27.4.md

4 years agoMerge pull request #17951 from eileenmcnaughton/export_im
Seamus Lee [Tue, 4 Aug 2020 05:53:48 +0000 (15:53 +1000)]
Merge pull request #17951 from eileenmcnaughton/export_im

[REF] Simplify location metadata handling in Export class

4 years ago[REF] remove first attempt to set currency in repeattransaction flow
eileen [Tue, 4 Aug 2020 00:25:23 +0000 (12:25 +1200)]
[REF] remove first attempt to set currency in repeattransaction flow

The currency is retrieved from the template transaction, these lines are no longer needed, as demonstrated
in the test

4 years agoMerge pull request #18059 from civicrm/5.28
Seamus Lee [Tue, 4 Aug 2020 04:13:04 +0000 (14:13 +1000)]
Merge pull request #18059 from civicrm/5.28

5.28

4 years agoMerge pull request #18053 from seamuslee001/test_ports
Seamus Lee [Tue, 4 Aug 2020 04:11:44 +0000 (14:11 +1000)]
Merge pull request #18053 from seamuslee001/test_ports

[NFC] Port some recent test fixes from master to 5.28

4 years agoMerge pull request #18057 from eileenmcnaughton/single
Seamus Lee [Tue, 4 Aug 2020 02:33:43 +0000 (12:33 +1000)]
Merge pull request #18057 from eileenmcnaughton/single

[REF] Do not pass by reference to the recur function

4 years ago(REF) WebsiteTest - Mitigate flaky failures
Tim Otten [Tue, 14 Jul 2020 18:18:08 +0000 (11:18 -0700)]
(REF) WebsiteTest - Mitigate flaky failures

Overview
--------

In recent days, api_v3_WebsiteTest has emitted sporadic failures like this:

```
api_v3_WebsiteTest::testDeleteWebsite with data set #0 (3)
Failed asserting that 3 matches expected 0.

/home/jenkins/bknix-max/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/api/v3/WebsiteTest.php:75
/home/jenkins/bknix-max/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviUnitTestCase.php:209
/home/jenkins/bknix-max/extern/phpunit7/phpunit7.phar:615
```

and

```
api_v3_WebsiteTest::testDeleteWebsiteInvalid with data set #0 (3)
Failed asserting that 4 matches expected 1.

/home/jenkins/bknix-max/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/api/v3/WebsiteTest.php:88
/home/jenkins/bknix-max/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviUnitTestCase.php:209
/home/jenkins/bknix-max/extern/phpunit7/phpunit7.phar:615
```

These failures do not reproduce for me in isolation.

Before
------

Both the failing assertions make an implicit assumption that the baseline content of `civicrm_website` is empty.

After
-----

The failing assertions use an explicit baseline (`$beforeCount`).

Comments
--------

The test failures are sporadic and only seem to seem occur when run in the full suite.

My theory is that something else is leaking `civicrm_website` records;
however, it's hard to track that down amidst a full suite (when the full
suite takes so long to execute).  Therefore, I cannot be certain that this
is actually fixes the problem.  However, this really just tightens up the
assumptions of the test - as long as it passes the PR tests, it should be
safe to merge and then watch in the `CiviCRM-Core-Matrix`.