civicrm-core.git
3 years agoMerge pull request #20666 from civicrm/5.39
Eileen McNaughton [Fri, 18 Jun 2021 23:58:19 +0000 (11:58 +1200)]
Merge pull request #20666 from civicrm/5.39

5.39 to master

3 years agoMerge pull request #20661 from seamuslee001/dev_core_2604
Eileen McNaughton [Fri, 18 Jun 2021 23:57:17 +0000 (11:57 +1200)]
Merge pull request #20661 from seamuslee001/dev_core_2604

dev/core#2604 Apply upstream patch to allow single quotes in return p…

3 years agoMerge pull request #20659 from colemanw/fixUndefinedTplVars
Seamus Lee [Fri, 18 Jun 2021 23:20:04 +0000 (09:20 +1000)]
Merge pull request #20659 from colemanw/fixUndefinedTplVars

Fix undefined tpl variables on contact summary

3 years agoMerge pull request #20655 from seamuslee001/fix_apiv4_group_concat_php8
Seamus Lee [Fri, 18 Jun 2021 22:41:58 +0000 (08:41 +1000)]
Merge pull request #20655 from seamuslee001/fix_apiv4_group_concat_php8

[php8-compact] Fix APIv4 Group Concat Test by setting dataType to be …

3 years agodev/core#2604 Apply upstream patch to allow single quotes in return patch emails
Seamus Lee [Fri, 18 Jun 2021 21:45:17 +0000 (21:45 +0000)]
dev/core#2604 Apply upstream patch to allow single quotes in return patch emails

3 years agoFix undefined tpl variables on contact summary
Coleman Watts [Fri, 18 Jun 2021 21:31:21 +0000 (17:31 -0400)]
Fix undefined tpl variables on contact summary

3 years agoMerge pull request #20652 from seamuslee001/fix_array_access_on_number
colemanw [Fri, 18 Jun 2021 21:30:35 +0000 (17:30 -0400)]
Merge pull request #20652 from seamuslee001/fix_array_access_on_number

[NFC] Fixes an issue in this unit test where we are trying to do an a…

3 years agoMerge pull request #20472 from eileenmcnaughton/trigger_clean
demeritcowboy [Fri, 18 Jun 2021 21:30:26 +0000 (17:30 -0400)]
Merge pull request #20472 from eileenmcnaughton/trigger_clean

Improve output triggers when logged to file

3 years agoMerge pull request #20471 from eileenmcnaughton/schema
demeritcowboy [Fri, 18 Jun 2021 21:30:15 +0000 (17:30 -0400)]
Merge pull request #20471 from eileenmcnaughton/schema

Fix Schema calculation of usePrefix to cope with rpow:

3 years agoMerge pull request #20649 from eileenmcnaughton/mem_clean
Seamus Lee [Fri, 18 Jun 2021 21:15:23 +0000 (07:15 +1000)]
Merge pull request #20649 from eileenmcnaughton/mem_clean

[NFC] [Test] Cleanup on membership type test

3 years ago[php8-compact] Fix APIv4 Group Concat Test by setting dataType to be NULL if the...
Seamus Lee [Fri, 18 Jun 2021 06:32:59 +0000 (06:32 +0000)]
[php8-compact] Fix APIv4 Group Concat Test by setting dataType to be NULL if the first expression is a SQL Function

3 years agoMerge pull request #20657 from demeritcowboy/these-go-to-11
Eileen McNaughton [Fri, 18 Jun 2021 21:04:03 +0000 (09:04 +1200)]
Merge pull request #20657 from demeritcowboy/these-go-to-11

[NFC/Unit test] - Add a test for getCaseRoles when there's a lot of roles assigned

3 years agotest lots of roles on cases
demeritcowboy [Fri, 18 Jun 2021 18:06:08 +0000 (14:06 -0400)]
test lots of roles on cases

3 years ago[NFC] Fix around returns, cleanup
Eileen McNaughton [Fri, 18 Jun 2021 01:39:42 +0000 (13:39 +1200)]
[NFC] Fix around returns, cleanup

3 years agoMerge pull request #20653 from eileenmcnaughton/you_have_lines
Seamus Lee [Fri, 18 Jun 2021 06:42:21 +0000 (16:42 +1000)]
Merge pull request #20653 from eileenmcnaughton/you_have_lines

[REF] Remove always false if

3 years agoMerge pull request #20616 from seamuslee001/fix_custom_group_Test
Seamus Lee [Fri, 18 Jun 2021 06:31:01 +0000 (16:31 +1000)]
Merge pull request #20616 from seamuslee001/fix_custom_group_Test

[php8-compact][REF] Fix failing custom group test on php8 by better h…

3 years ago[REF] Remove always false if
Eileen McNaughton [Fri, 18 Jun 2021 05:09:39 +0000 (17:09 +1200)]
[REF] Remove always false if

We recently added code to ensure line_item is always populated
before this function is called. So line items is never empty at this point

3 years ago[NFC] Fixes an issue in this unit test where we are trying to do an array acess on...
Seamus Lee [Fri, 18 Jun 2021 04:44:56 +0000 (04:44 +0000)]
[NFC] Fixes an issue in this unit test where we are trying to do an array acess on an integer

3 years agoFix bug found by Eileen on creating Custom Fields of Paritipant event type and add...
Seamus Lee [Fri, 18 Jun 2021 04:42:44 +0000 (14:42 +1000)]
Fix bug found by Eileen on creating Custom Fields of Paritipant event type and add unit tests to lock in fix

3 years ago[REF] Shift special handling of extends param of the customGroup create into apiv3...
Seamus Lee [Wed, 16 Jun 2021 02:45:23 +0000 (02:45 +0000)]
[REF] Shift special handling of extends param of the customGroup create into apiv3 and change Custom Group form to use apiv3

3 years ago[php8-compact][REF] Fix failing custom group test on php8 by better handling strings...
Seamus Lee [Wed, 16 Jun 2021 01:59:33 +0000 (01:59 +0000)]
[php8-compact][REF] Fix failing custom group test on php8 by better handling strings in 2nd key of the extends array and also validating the child and main entity work

3 years agoMerge pull request #20621 from eileenmcnaughton/mps
Eileen McNaughton [Fri, 18 Jun 2021 03:57:13 +0000 (15:57 +1200)]
Merge pull request #20621 from eileenmcnaughton/mps

Add test validation for Membership & participant payments

3 years agoMerge pull request #20623 from seamuslee001/fix_event_form_test_php8
Eileen McNaughton [Fri, 18 Jun 2021 03:15:12 +0000 (15:15 +1200)]
Merge pull request #20623 from seamuslee001/fix_event_form_test_php8

[php8-compact] Fix Event Form test for php8 by setting totalAmount in…

3 years agoAdd test validation for Membership & participant payments
Eileen McNaughton [Wed, 16 Jun 2021 07:01:00 +0000 (19:01 +1200)]
Add test validation for Membership & participant payments

3 years agoMerge pull request #20639 from colemanw/getReferencesToContactTable
Eileen McNaughton [Fri, 18 Jun 2021 01:05:31 +0000 (13:05 +1200)]
Merge pull request #20639 from colemanw/getReferencesToContactTable

dev/core#2656 Fix getReferencesToContactTable to ignore non-id references

3 years agoMerge pull request #20647 from eileenmcnaughton/cl
Eileen McNaughton [Fri, 18 Jun 2021 00:49:24 +0000 (12:49 +1200)]
Merge pull request #20647 from eileenmcnaughton/cl

[NFC] [Test] Remove duplicate cleanup

3 years agoMerge pull request #20633 from eileenmcnaughton/ret3
colemanw [Fri, 18 Jun 2021 00:23:19 +0000 (20:23 -0400)]
Merge pull request #20633 from eileenmcnaughton/ret3

[NFC] [TEST] cleanup, more use of return in ActivityTest

3 years agoMerge pull request #20636 from eileenmcnaughton/mm
Seamus Lee [Fri, 18 Jun 2021 00:21:06 +0000 (10:21 +1000)]
Merge pull request #20636 from eileenmcnaughton/mm

[NFC] Cleanup on membership test

3 years agoMerge pull request #20637 from eileenmcnaughton/mem
Seamus Lee [Fri, 18 Jun 2021 00:20:04 +0000 (10:20 +1000)]
Merge pull request #20637 from eileenmcnaughton/mem

[NFC] [Test] Remove duplicate cleanup

3 years agoMerge pull request #20638 from eileenmcnaughton/ret2
Seamus Lee [Fri, 18 Jun 2021 00:19:43 +0000 (10:19 +1000)]
Merge pull request #20638 from eileenmcnaughton/ret2

[NFC] Cleanup on contribution v3 api test

3 years agoMerge pull request #20644 from lcdservices/dev-core-2657
Eileen McNaughton [Thu, 17 Jun 2021 23:39:57 +0000 (11:39 +1200)]
Merge pull request #20644 from lcdservices/dev-core-2657

dev/core#2657 trigger pre hook on LineItem delete

3 years ago[NFC] [Test] Remove duplicate cleanup
Eileen McNaughton [Thu, 17 Jun 2021 08:41:01 +0000 (20:41 +1200)]
[NFC] [Test] Remove duplicate cleanup

3 years agoMerge pull request #20646 from civicrm/5.39
Eileen McNaughton [Thu, 17 Jun 2021 22:32:19 +0000 (10:32 +1200)]
Merge pull request #20646 from civicrm/5.39

5.39

3 years agoMerge pull request #20554 from colemanw/noteUsedFor
demeritcowboy [Thu, 17 Jun 2021 21:25:47 +0000 (17:25 -0400)]
Merge pull request #20554 from colemanw/noteUsedFor

Convert Notes to use option_group instead of hardcoded list

3 years agoMerge pull request #20645 from agh1/5.39.0-releasenotes-initial
Seamus Lee [Thu, 17 Jun 2021 20:35:15 +0000 (06:35 +1000)]
Merge pull request #20645 from agh1/5.39.0-releasenotes-initial

5.39.0 release notes initial run

3 years agoRegenerate sql with note_used_for option group
Coleman Watts [Thu, 17 Jun 2021 18:29:43 +0000 (14:29 -0400)]
Regenerate sql with note_used_for option group

3 years agoConvert Notes to use option_group instead of hardcoded list
Coleman Watts [Tue, 8 Jun 2021 12:37:38 +0000 (08:37 -0400)]
Convert Notes to use option_group instead of hardcoded list

3 years ago5.39.0 release notes: added boilerplate
Andrew Hunt [Thu, 17 Jun 2021 16:33:18 +0000 (12:33 -0400)]
5.39.0 release notes: added boilerplate

3 years ago5.39.0 release notes: raw from script
Andrew Hunt [Thu, 17 Jun 2021 16:30:57 +0000 (12:30 -0400)]
5.39.0 release notes: raw from script

3 years agoMerge pull request #20642 from colemanw/admin
colemanw [Thu, 17 Jun 2021 16:11:31 +0000 (12:11 -0400)]
Merge pull request #20642 from colemanw/admin

Remove unreachable code from admin page

3 years agoMerge pull request #20643 from colemanw/moveUpgradeCode
colemanw [Thu, 17 Jun 2021 15:49:34 +0000 (11:49 -0400)]
Merge pull request #20643 from colemanw/moveUpgradeCode

Move upgrade code to correct version

3 years agodev/core#2657 trigger pre hook on LineItem delete
Brian Shaughnessy [Thu, 17 Jun 2021 14:46:32 +0000 (10:46 -0400)]
dev/core#2657 trigger pre hook on LineItem delete

3 years agoMerge pull request #20641 from pradpnayak/urlfix
demeritcowboy [Thu, 17 Jun 2021 14:43:45 +0000 (10:43 -0400)]
Merge pull request #20641 from pradpnayak/urlfix

Fixed url

3 years agoMerge pull request #20640 from colemanw/smartyNotices
demeritcowboy [Thu, 17 Jun 2021 14:34:29 +0000 (10:34 -0400)]
Merge pull request #20640 from colemanw/smartyNotices

Show smarty E-notices when in debug mode

3 years agoMove upgrade code to correct version
Coleman Watts [Thu, 17 Jun 2021 13:27:30 +0000 (09:27 -0400)]
Move upgrade code to correct version

See https://github.com/civicrm/civicrm-core/pull/20553

3 years agoRemove unreachable code from admin page
Coleman Watts [Thu, 17 Jun 2021 13:19:58 +0000 (09:19 -0400)]
Remove unreachable code from admin page

3 years agoMerge pull request #20553 from JMAConsulting/add_product_id_fk
colemanw [Thu, 17 Jun 2021 13:14:29 +0000 (09:14 -0400)]
Merge pull request #20553 from JMAConsulting/add_product_id_fk

dev/core#2486 - Add foreign key on civicrm_contribution_product.product_id

3 years agoFixed url
Pradeep Nayak [Thu, 17 Jun 2021 13:07:24 +0000 (14:07 +0100)]
Fixed url

3 years agoShow smarty E-notices when in debug mode
Coleman Watts [Thu, 17 Jun 2021 13:04:05 +0000 (09:04 -0400)]
Show smarty E-notices when in debug mode

3 years agoFix getReferencesToContactTable to ignore non-id references
Coleman Watts [Thu, 17 Jun 2021 12:10:19 +0000 (08:10 -0400)]
Fix getReferencesToContactTable to ignore non-id references

Fixes dev/core#2656
https://lab.civicrm.org/dev/core/-/issues/2656

3 years agoMerge pull request #20635 from eileenmcnaughton/reta
Monish Deb [Thu, 17 Jun 2021 11:52:56 +0000 (17:22 +0530)]
Merge pull request #20635 from eileenmcnaughton/reta

[NFC] [TEST] cleanup, more use of return in AddressTest

3 years agoAdd product_id FK
Monish Deb [Tue, 8 Jun 2021 07:35:02 +0000 (13:05 +0530)]
Add product_id FK

3 years ago[NFC] Cleanup on contribution v3 api test
Eileen McNaughton [Thu, 17 Jun 2021 10:20:25 +0000 (22:20 +1200)]
[NFC] Cleanup on contribution v3 api test

3 years ago[NFC] [TEST] cleanup, more use of return in ActivityTest
Eileen McNaughton [Thu, 17 Jun 2021 08:53:27 +0000 (20:53 +1200)]
[NFC] [TEST] cleanup, more use of return in ActivityTest

3 years ago[NFC] [Test] Remove duplicate cleanup
Eileen McNaughton [Thu, 17 Jun 2021 08:41:01 +0000 (20:41 +1200)]
[NFC] [Test] Remove duplicate cleanup

3 years agoCleanup on membership test
Eileen McNaughton [Thu, 17 Jun 2021 08:33:20 +0000 (20:33 +1200)]
Cleanup on membership test

3 years agoMerge pull request #20607 from colemanw/searchDisplayAccessBypass
Seamus Lee [Thu, 17 Jun 2021 07:49:54 +0000 (17:49 +1000)]
Merge pull request #20607 from colemanw/searchDisplayAccessBypass

SearchKit - Allow super admins to disable Search Display access checks

3 years agoMerge pull request #20634 from highfalutin/patch-7
Seamus Lee [Thu, 17 Jun 2021 07:46:33 +0000 (17:46 +1000)]
Merge pull request #20634 from highfalutin/patch-7

replace unnecessary function call with string literal

3 years agoMerge pull request #20630 from eileenmcnaughton/trigg_mailing
Seamus Lee [Thu, 17 Jun 2021 07:23:18 +0000 (17:23 +1000)]
Merge pull request #20630 from eileenmcnaughton/trigg_mailing

Use mysql to set mailing.created_date

3 years ago[NFC] [TEST] cleanup, more use of return in AddressTest
Eileen McNaughton [Thu, 17 Jun 2021 06:35:36 +0000 (18:35 +1200)]
[NFC] [TEST] cleanup, more use of return in AddressTest

3 years agoMerge pull request #20632 from eileenmcnaughton/ret
Eileen McNaughton [Thu, 17 Jun 2021 06:16:38 +0000 (18:16 +1200)]
Merge pull request #20632 from eileenmcnaughton/ret

[NFC] [Test] Specify return values on get calls

3 years agoreplace unnecessary function call with string literal
highfalutin [Thu, 17 Jun 2021 06:02:28 +0000 (23:02 -0700)]
replace unnecessary function call with string literal

3 years agoMerge pull request #20628 from colemanw/deprecateAngular
Tim Otten [Thu, 17 Jun 2021 05:47:25 +0000 (22:47 -0700)]
Merge pull request #20628 from colemanw/deprecateAngular

AngularLoader - Emit warning when setModules method is used.

3 years agoUse mysql to set mailing.created_date
Eileen McNaughton [Thu, 17 Jun 2021 02:04:11 +0000 (14:04 +1200)]
Use mysql to set mailing.created_date

On digging I determined this trigger hokiness was all about mysql
5.5 and we can ditch it now

https://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-5.html#mysqld-5-6-5-data-types

and https://github.com/civicrm/civicrm-core/pull/10953#issuecomment-327613771

Note that we still support mysql 5.6 and the current version is 5.6.51

I think it's fine to require that the 5.6 minimum is 5.6.5 as released in 2012

I'll do the upgrade script as a follow up

3 years agoMerge pull request #20622 from eileenmcnaughton/act2
Seamus Lee [Thu, 17 Jun 2021 05:19:32 +0000 (15:19 +1000)]
Merge pull request #20622 from eileenmcnaughton/act2

dev/core#1191 [TEST][NFC] Increase setting of return in tests

3 years ago[NFC] [Test] Specify return values on get calls
Eileen McNaughton [Thu, 17 Jun 2021 03:59:19 +0000 (15:59 +1200)]
[NFC] [Test] Specify return values on get calls

3 years agoMerge pull request #20598 from colemanw/entityDescriptions
Eileen McNaughton [Thu, 17 Jun 2021 04:08:52 +0000 (16:08 +1200)]
Merge pull request #20598 from colemanw/entityDescriptions

SearchKit - Add translatable descriptions to entities

3 years agoMerge pull request #20617 from eileenmcnaughton/cust_g
Seamus Lee [Thu, 17 Jun 2021 04:04:24 +0000 (14:04 +1000)]
Merge pull request #20617 from eileenmcnaughton/cust_g

Improve CustomGroupTest

3 years agoImprove CustomGroupTest
Eileen McNaughton [Wed, 16 Jun 2021 03:00:06 +0000 (15:00 +1200)]
Improve CustomGroupTest

Use api, various cleanups

3 years agoImprove output triggers when logged to file
Eileen McNaughton [Wed, 2 Jun 2021 03:13:32 +0000 (15:13 +1200)]
Improve output triggers when logged to file

Hmm write on rebuild AND reap on destruct

3 years agoMerge pull request #20629 from civicrm/5.39
Seamus Lee [Thu, 17 Jun 2021 01:12:26 +0000 (11:12 +1000)]
Merge pull request #20629 from civicrm/5.39

5.39

3 years agoSearchKit - Add translatable descriptions to entities
Coleman Watts [Mon, 14 Jun 2021 12:49:38 +0000 (08:49 -0400)]
SearchKit - Add translatable descriptions to entities

Before: Entities had descriptions derived from code comments, which were written for developers and English-only
After: Entities can have a user-friendly description which is translated

3 years agoMerge pull request #20618 from eileenmcnaughton/return2
Seamus Lee [Wed, 16 Jun 2021 23:16:42 +0000 (09:16 +1000)]
Merge pull request #20618 from eileenmcnaughton/return2

dev/core#1191 Try adding a strict return function to getAndCheck

3 years agoMerge pull request #20624 from seamuslee001/query_test_php8
Eileen McNaughton [Wed, 16 Jun 2021 23:10:58 +0000 (11:10 +1200)]
Merge pull request #20624 from seamuslee001/query_test_php8

[php8-compact][NFC] Update testGroupClause unit test to work on php8

3 years agoMerge pull request #20610 from colemanw/fixApiOrder
Seamus Lee [Wed, 16 Jun 2021 23:08:19 +0000 (09:08 +1000)]
Merge pull request #20610 from colemanw/fixApiOrder

dev/report#68 Fix smart group crash when ordering by aggregated column

3 years agoMerge pull request #20536 from MegaphoneJon/mailing-96
demeritcowboy [Wed, 16 Jun 2021 22:52:13 +0000 (18:52 -0400)]
Merge pull request #20536 from MegaphoneJon/mailing-96

mailing#96: Warn on invalid mailing options

3 years agoAngularLoader - Emit warning when setModules method is used.
Coleman Watts [Wed, 16 Jun 2021 21:55:49 +0000 (17:55 -0400)]
AngularLoader - Emit warning when setModules method is used.

It can cause conflicts with other extensions who have added modules.

3 years agoSearchKit - Fix smart group crash when ordering by aggregated column
Coleman Watts [Tue, 15 Jun 2021 19:44:12 +0000 (15:44 -0400)]
SearchKit - Fix smart group crash when ordering by aggregated column

Fixes dev/report#68

3 years agoUpdate CRM/Mailing/BAO/Mailing.php
Jon [Wed, 16 Jun 2021 14:09:32 +0000 (10:09 -0400)]
Update CRM/Mailing/BAO/Mailing.php

Co-authored-by: demeritcowboy <demeritcowboy@hotmail.com>
3 years ago[php8-compact][NFC] Update testGroupClause unit test to work on php8
Seamus Lee [Wed, 16 Jun 2021 08:36:28 +0000 (08:36 +0000)]
[php8-compact][NFC] Update testGroupClause unit test to work on php8

3 years ago[php8-compact] Fix Event Form test for php8 by setting totalAmount in the form params
Seamus Lee [Wed, 16 Jun 2021 08:18:47 +0000 (08:18 +0000)]
[php8-compact] Fix Event Form test for php8 by setting totalAmount in the form params

3 years ago[TEST][NFC] Increase setting of return in tests
Eileen McNaughton [Wed, 16 Jun 2021 07:35:25 +0000 (19:35 +1200)]
[TEST][NFC] Increase setting of return in tests

3 years agoTry adding a strict return function to getAndCheck
Eileen McNaughton [Wed, 16 Jun 2021 03:06:19 +0000 (15:06 +1200)]
Try adding a strict return function to getAndCheck

3 years agoMerge pull request #20615 from colemanw/afformCivix
Seamus Lee [Wed, 16 Jun 2021 02:46:32 +0000 (12:46 +1000)]
Merge pull request #20615 from colemanw/afformCivix

[NFC] Afform - Regenerate civix files

3 years agoMerge pull request #20614 from seamuslee001/fix_test_setup
Seamus Lee [Wed, 16 Jun 2021 02:34:20 +0000 (12:34 +1000)]
Merge pull request #20614 from seamuslee001/fix_test_setup

[NFC] Fix test setup on a couple of tests to make them pass in php8

3 years agoMerge pull request #20608 from seamuslee001/fix_core_form_array_to_string
Eileen McNaughton [Wed, 16 Jun 2021 01:49:10 +0000 (13:49 +1200)]
Merge pull request #20608 from seamuslee001/fix_core_form_array_to_string

[php8-compact] Fix Array to String in formButtons in CRM_Core_FormTest

3 years agoMerge pull request #20613 from seamuslee001/fix_participant_templates
Eileen McNaughton [Wed, 16 Jun 2021 01:48:50 +0000 (13:48 +1200)]
Merge pull request #20613 from seamuslee001/fix_participant_templates

[php8-compact]  Fix issues with participant message templates causing…

3 years agoAfform - Regenerate civix files
Coleman Watts [Wed, 16 Jun 2021 01:00:05 +0000 (21:00 -0400)]
Afform - Regenerate civix files

3 years ago[NFC] Fix test setup on a couple of tests to make them pass in php8
Seamus Lee [Wed, 16 Jun 2021 00:55:22 +0000 (00:55 +0000)]
[NFC] Fix test setup on a couple of tests to make them pass in php8

3 years agoMerge pull request #20570 from eileenmcnaughton/return
Seamus Lee [Wed, 16 Jun 2021 00:21:06 +0000 (10:21 +1000)]
Merge pull request #20570 from eileenmcnaughton/return

Test cleanup - specify return

3 years ago[php8-compact] Fix issues with participant message templates causing Event Tests...
Seamus Lee [Tue, 15 Jun 2021 23:59:14 +0000 (23:59 +0000)]
[php8-compact]  Fix issues with participant message templates causing Event Tests to fail

3 years agoMerge pull request #20612 from civicrm/5.39
Seamus Lee [Tue, 15 Jun 2021 23:37:03 +0000 (09:37 +1000)]
Merge pull request #20612 from civicrm/5.39

5.39

3 years agoMerge pull request #20609 from colemanw/readOnlyApis
Seamus Lee [Tue, 15 Jun 2021 23:36:26 +0000 (09:36 +1000)]
Merge pull request #20609 from colemanw/readOnlyApis

APIv4 - Make LineItem, EntityFinancialTrxn and FinancialTrxn read-only

3 years agoMerge pull request #20611 from eileenmcnaughton/539_o
Seamus Lee [Tue, 15 Jun 2021 23:35:47 +0000 (09:35 +1000)]
Merge pull request #20611 from eileenmcnaughton/539_o

Fix unreleased api change to more logical variant

3 years agoMerge pull request #20573 from colemanw/entityTagFilter
Seamus Lee [Tue, 15 Jun 2021 23:19:18 +0000 (09:19 +1000)]
Merge pull request #20573 from colemanw/entityTagFilter

APIv4 - Add filter for entity tags

3 years ago[php8-compact] Fix Array to String in formButtons in CRM_Core_FormTest
Seamus Lee [Tue, 15 Jun 2021 06:56:25 +0000 (06:56 +0000)]
[php8-compact] Fix Array to String in formButtons in CRM_Core_FormTest

3 years agotest failure fix
Monish Deb [Wed, 9 Jun 2021 03:35:20 +0000 (09:05 +0530)]
test failure fix

3 years agoFix unreleased api change
Eileen McNaughton [Tue, 15 Jun 2021 21:40:57 +0000 (09:40 +1200)]
Fix unreleased api change

An unreleased change adds the entity ids for membership to the return values.

However, on digging into further cleanup I realised that the entity ids are in
the line item array, along with other values which may or may not be useful,
and it's cleaner, more complete and more maintainable to return the line_items.

It requires an extra foreach loop in the calling code but
I don't see that as a downside.

We should change this in the rc so what is released is consistent

Test cover in testSubmitRecur & other tests in CRM_Member_Form_MembershipTest

3 years agoAPIv4 - Make LineItem, EntityFinancialTrxn and FinancialTrxn read-only
Coleman Watts [Tue, 15 Jun 2021 19:04:06 +0000 (15:04 -0400)]
APIv4 - Make LineItem, EntityFinancialTrxn and FinancialTrxn read-only

Adds a new ReadOnly trait which annotates write methods as @internal
and sets write permissions to ALWAYS_DENY.

This effectively hides the write actions from the API Explorer,
and restricts use of the write methods to when `checkPermissions = FALSE`.

3 years agoRegenerate civicrm_generated.mysql
Coleman Watts [Tue, 15 Jun 2021 20:38:12 +0000 (16:38 -0400)]
Regenerate civicrm_generated.mysql