civicrm-core.git
3 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

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

3 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

3 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

3 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

3 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

3 years agoMerge pull request #18112 from eileenmcnaughton/paytest
Eileen McNaughton [Mon, 10 Aug 2020 10:06:32 +0000 (22:06 +1200)]
Merge pull request #18112 from eileenmcnaughton/paytest

[NFC] [Test] Initial testing on event payment forms.

3 years ago[Ref] [Test] Update Authorize.net test to use the trait
eileen [Mon, 10 Aug 2020 05:38:30 +0000 (17:38 +1200)]
[Ref] [Test] Update Authorize.net test to use the trait

3 years ago[NFC] [Test] Intial testing on event payment forms.
eileen [Mon, 10 Aug 2020 04:12:02 +0000 (16:12 +1200)]
[NFC] [Test] Intial testing on event payment forms.

I'm trying to work on improving our testing of payment forms. I started with 3 event forms but there were
enough challenges that for this commit I'm just adding tests on one form. As noted in the code comments
it makes sense for this test to be in the extension but I want to work through the challenges on the
other forms before finalising any helper functions to the point where they are available to extensions.

This is actually a bit of a break through as it's the first time we have testing on a form flow - ie
submitting the first form and then the second. It was quite painful

3 years agoMerge pull request #18110 from eileenmcnaughton/xml
Seamus Lee [Mon, 10 Aug 2020 00:55:34 +0000 (10:55 +1000)]
Merge pull request #18110 from eileenmcnaughton/xml

Add Serialize key to payment_processor field for Event & Contribution Page

3 years agoMerge pull request #18109 from eileenmcnaughton/format
Seamus Lee [Sun, 9 Aug 2020 23:33:30 +0000 (09:33 +1000)]
Merge pull request #18109 from eileenmcnaughton/format

[NFC] Array formatting

3 years agoMerge pull request #18108 from eileenmcnaughton/paytest
Seamus Lee [Sun, 9 Aug 2020 23:33:13 +0000 (09:33 +1000)]
Merge pull request #18108 from eileenmcnaughton/paytest

Remove unused variable

3 years agoAdd Serialize key to payment_processor field for Event & ContributionPage
eileen [Sun, 9 Aug 2020 23:03:05 +0000 (11:03 +1200)]
Add Serialize key to payment_processor field for Event & ContributionPage

The DAO can handle arrays if it knows the format now...

3 years agoRemove unused variable
eileen [Sun, 9 Aug 2020 21:44:02 +0000 (09:44 +1200)]
Remove unused variable

I spotted this variable as defined but unused - let's remove

3 years ago[NFC] Array formatting
eileen [Sun, 9 Aug 2020 21:55:11 +0000 (09:55 +1200)]
[NFC] Array formatting

This is a straight up IDE reformat to get rid of old array syntax.

IDE had some whitespace thoughts with I'm neutral on - if Jenkins is too then all good IMHO

3 years agoMerge pull request #18104 from civicrm/5.29
Seamus Lee [Sat, 8 Aug 2020 07:04:10 +0000 (17:04 +1000)]
Merge pull request #18104 from civicrm/5.29

5.29

3 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

3 years agoMerge pull request #18100 from civicrm/5.29
Seamus Lee [Sat, 8 Aug 2020 01:35:44 +0000 (11:35 +1000)]
Merge pull request #18100 from civicrm/5.29

5.29

3 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

3 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…

3 years agoMerge pull request #18097 from demeritcowboy/mysqli
Seamus Lee [Sat, 8 Aug 2020 00:07:15 +0000 (10:07 +1000)]
Merge pull request #18097 from demeritcowboy/mysqli

There is no "I" in mysqli - oh wait there is

3 years agoMerge pull request #18098 from civicrm/5.29
Eileen McNaughton [Fri, 7 Aug 2020 22:59:56 +0000 (10:59 +1200)]
Merge pull request #18098 from civicrm/5.29

5.29 to master

3 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…

3 years agoMerge pull request #17919 from seamuslee001/nfc_locale_documentation
Eileen McNaughton [Fri, 7 Aug 2020 22:26:23 +0000 (10:26 +1200)]
Merge pull request #17919 from seamuslee001/nfc_locale_documentation

[NFC] Update locale over-ride documentation to mention that it is mos…

3 years agomysqli
demeritcowboy [Fri, 7 Aug 2020 22:02:54 +0000 (18:02 -0400)]
mysqli

3 years agoMerge pull request #18093 from colemanw/expFix
Seamus Lee [Fri, 7 Aug 2020 04:18:17 +0000 (14:18 +1000)]
Merge pull request #18093 from colemanw/expFix

APIv4 Explorer - Fix possible undefined index

3 years agoMerge pull request #17934 from eileenmcnaughton/conttype
colemanw [Fri, 7 Aug 2020 02:59:08 +0000 (22:59 -0400)]
Merge pull request #17934 from eileenmcnaughton/conttype

[REF] Update subtypeInfo function to leverage getAllContactTypes

3 years agoAPIv4 Explorer - Fix possible undefined index
Coleman Watts [Thu, 6 Aug 2020 19:11:10 +0000 (15:11 -0400)]
APIv4 Explorer - Fix possible undefined index

3 years agoMerge pull request #18047 from eileenmcnaughton/ent_ref
Seamus Lee [Fri, 7 Aug 2020 02:18:16 +0000 (12:18 +1000)]
Merge pull request #18047 from eileenmcnaughton/ent_ref

[REF] Fix metadata label for contribution_page_id

3 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

3 years agoMerge pull request #18090 from civicrm/5.29
Seamus Lee [Fri, 7 Aug 2020 00:20:38 +0000 (10:20 +1000)]
Merge pull request #18090 from civicrm/5.29

5.29

3 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

3 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

3 years agoMerge pull request #18089 from colemanw/api4cv
Eileen McNaughton [Thu, 6 Aug 2020 22:33:45 +0000 (10:33 +1200)]
Merge pull request #18089 from colemanw/api4cv

APIv4 Explorer: Generate short cv code

3 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

3 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

3 years agoAPIv4 Explorer: Generate short cv code
Coleman Watts [Thu, 6 Aug 2020 18:36:10 +0000 (14:36 -0400)]
APIv4 Explorer: Generate short cv code

3 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

3 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`.

3 years agoMerge pull request #18027 from seamuslee001/pear_db_composer
Seamus Lee [Thu, 6 Aug 2020 06:43:13 +0000 (16:43 +1000)]
Merge pull request #18027 from seamuslee001/pear_db_composer

[REF] Deploy Pear DB package using composer

3 years agoSet version to 5.30.alpha1
CiviCRM [Thu, 6 Aug 2020 06:40:29 +0000 (06:40 +0000)]
Set version to 5.30.alpha1

3 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

3 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…

3 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

3 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.

3 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

3 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.

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

3 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 …

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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.

3 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…

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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…

3 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?

3 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

3 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

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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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

3 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`.

3 years ago[REF] Even less variable variables
eileen [Tue, 4 Aug 2020 01:30:55 +0000 (13:30 +1200)]
[REF] Even less variable variables

3 years agoMerge pull request #18051 from demeritcowboy/member-status
Eileen McNaughton [Tue, 4 Aug 2020 01:12:54 +0000 (13:12 +1200)]
Merge pull request #18051 from demeritcowboy/member-status

[REF] Simplify getMembershipStatusByDate more