civicrm-core.git
2 years agoCode cleanup on aisle CRM_Utils_Hook
Coleman Watts [Thu, 23 Mar 2023 12:40:21 +0000 (08:40 -0400)]
Code cleanup on aisle CRM_Utils_Hook

2 years agoMerge pull request #25902 from demeritcowboy/that
colemanw [Thu, 23 Mar 2023 11:57:36 +0000 (07:57 -0400)]
Merge pull request #25902 from demeritcowboy/that

[NFC] hulk smash

2 years agohulk smash
demeritcowboy [Thu, 23 Mar 2023 06:05:57 +0000 (02:05 -0400)]
hulk smash

2 years agoMerge pull request #25901 from colemanw/nullObject
Eileen McNaughton [Thu, 23 Mar 2023 02:47:40 +0000 (15:47 +1300)]
Merge pull request #25901 from colemanw/nullObject

Deprecate CRM_Utils_Hook::$nullObject

2 years agoDeprecate CRM_Utils_Hook::$nullObject
Coleman Watts [Thu, 23 Mar 2023 01:07:17 +0000 (21:07 -0400)]
Deprecate CRM_Utils_Hook::$nullObject

2 years agoMerge pull request #25894 from eileenmcnaughton/find_protected
colemanw [Wed, 22 Mar 2023 12:23:36 +0000 (08:23 -0400)]
Merge pull request #25894 from eileenmcnaughton/find_protected

Add getter for dedupeRuleGroupID

2 years agoMerge pull request #25874 from eileenmcnaughton/usage
colemanw [Wed, 22 Mar 2023 12:13:46 +0000 (08:13 -0400)]
Merge pull request #25874 from eileenmcnaughton/usage

Add handling of `usage` to `DAO` generator

2 years agoMerge pull request #25887 from eileenmcnaughton/dep_dn
Tim Otten [Wed, 22 Mar 2023 00:46:56 +0000 (17:46 -0700)]
Merge pull request #25887 from eileenmcnaughton/dep_dn

Remove 2021 noisily deprecated pdfCommon function

2 years agoMerge pull request #25891 from eileenmcnaughton/map_field
Tim Otten [Wed, 22 Mar 2023 00:30:19 +0000 (17:30 -0700)]
Merge pull request #25891 from eileenmcnaughton/map_field

[NFC] Add metadata about import jobs to `MapField` form

2 years agoAdd getter for dedupeRuleGroupID
Eileen McNaughton [Tue, 21 Mar 2023 23:18:01 +0000 (12:18 +1300)]
Add getter for dedupeRuleGroupID

We recently declared this with protected visibility - it turns out WMF
actually references it... I figure maybe a getter is better practice so
we still can....

2 years agoMerge pull request #25890 from eileenmcnaughton/dep_mail_format
Seamus Lee [Tue, 21 Mar 2023 21:57:54 +0000 (08:57 +1100)]
Merge pull request #25890 from eileenmcnaughton/dep_mail_format

Remove references to deprecated `preferred_mail_format` in tests

2 years ago[NFC] Add metadata about import jobs to MapField form
Eileen McNaughton [Tue, 21 Mar 2023 21:19:41 +0000 (10:19 +1300)]
[NFC] Add metadata about import jobs to MapField form

This extra metadata has been part of a whole lot of PRs & somehow always
winds up in conflict or otherwise so I'm adding it by itself, wihout any usage of it.

Note that
- this brings MapField into line with DataSource
- there is nothing calling these functions as of this PR - it's just
an attempt to get the extra metadata added to the forms/ parsers without
conflict

2 years agoRemove references to deprecated preferred_mail_format in tests
Eileen McNaughton [Tue, 21 Mar 2023 20:51:58 +0000 (09:51 +1300)]
Remove references to deprecated preferred_mail_format in tests

2 years agoMerge pull request #25889 from braders/remove-unused-print-property
Eileen McNaughton [Tue, 21 Mar 2023 19:46:24 +0000 (08:46 +1300)]
Merge pull request #25889 from braders/remove-unused-print-property

[REF][PHP8.2] Remove property which is no longer used

2 years ago[REF][PHP8.2] Remove property which is no longer used
Bradley Taylor [Tue, 21 Mar 2023 18:22:27 +0000 (18:22 +0000)]
[REF][PHP8.2] Remove property which is no longer used

2 years agoRemove 2021 noisily deprecated pdfCommon functions
Eileen McNaughton [Tue, 21 Mar 2023 06:24:24 +0000 (19:24 +1300)]
Remove 2021 noisily deprecated pdfCommon functions

2 years agoMerge pull request #25885 from totten/master-cache-unique
Eileen McNaughton [Tue, 21 Mar 2023 06:15:47 +0000 (19:15 +1300)]
Merge pull request #25885 from totten/master-cache-unique

civicrm_cache - Replace wonky index

2 years agocivicrm_cache - Add index on `expired_date`
Tim Otten [Tue, 21 Mar 2023 04:55:38 +0000 (21:55 -0700)]
civicrm_cache - Add index on `expired_date`

2 years agoUpgrader - Dedupe caches. Failsafe to ensure ugprade runs.
Tim Otten [Tue, 21 Mar 2023 01:49:28 +0000 (18:49 -0700)]
Upgrader - Dedupe caches. Failsafe to ensure ugprade runs.

2 years agocivicrm_cache - Replace wonky idx (group,path,date) with sensible idx (group,path)
Tim Otten [Tue, 21 Mar 2023 00:57:02 +0000 (17:57 -0700)]
civicrm_cache - Replace wonky idx (group,path,date) with sensible idx (group,path)

Note: On the PR, I'll give a more thorough discussion for why the old index seems nonsensical.

2 years agoMerge pull request #25855 from totten/setup-order
Tim Otten [Tue, 21 Mar 2023 03:55:12 +0000 (20:55 -0700)]
Merge pull request #25855 from totten/setup-order

CiviUnitTestCase (etal) - Resolve spooky interaction

2 years agoMerge pull request #25883 from eileenmcnaughton/mail_format
Eileen McNaughton [Tue, 21 Mar 2023 02:12:58 +0000 (15:12 +1300)]
Merge pull request #25883 from eileenmcnaughton/mail_format

Remove preferred_mail_format from tokens

2 years agoMerge pull request #25884 from lemniscus/tagset-markup
Eileen McNaughton [Tue, 21 Mar 2023 01:22:54 +0000 (14:22 +1300)]
Merge pull request #25884 from lemniscus/tagset-markup

don't create tagset markup if there's no tagset

2 years agoRemove preferred_mail_format from tokens
Eileen McNaughton [Tue, 21 Mar 2023 00:01:18 +0000 (13:01 +1300)]
Remove preferred_mail_format from tokens

This also removes the handling from action schedule - there
might be a test checking it's presence to putting up
to adapt tests

2 years agoMerge pull request #25673 from jmcclelland/transaction-lock
Tim Otten [Tue, 21 Mar 2023 00:37:25 +0000 (17:37 -0700)]
Merge pull request #25673 from jmcclelland/transaction-lock

ensure delays from transactions don't cause cache race condition

2 years agoAdd handling of usage to DAO generator
Eileen McNaughton [Mon, 20 Mar 2023 00:07:10 +0000 (13:07 +1300)]
Add handling of usage to DAO generator

2 years agodon't create tagset markup if there's no tagset
Noah Miller [Mon, 20 Mar 2023 23:54:53 +0000 (19:54 -0400)]
don't create tagset markup if there's no tagset

2 years agoMerge pull request #25877 from eileenmcnaughton/submitted
Seamus Lee [Mon, 20 Mar 2023 21:49:45 +0000 (08:49 +1100)]
Merge pull request #25877 from eileenmcnaughton/submitted

Move getSubmittedValues to `CRM_Core_Form`

2 years agoMerge pull request #25882 from lemniscus/tagset-tpl
colemanw [Mon, 20 Mar 2023 20:49:42 +0000 (16:49 -0400)]
Merge pull request #25882 from lemniscus/tagset-tpl

Skip adding script when it won't have anything to run on

2 years agoMerge pull request #25881 from colemanw/dropTable
colemanw [Mon, 20 Mar 2023 19:45:49 +0000 (15:45 -0400)]
Merge pull request #25881 from colemanw/dropTable

SchemaHandler - Add IF EXISTS to dropTable function

2 years agoskip adding script when it won't have anything to run on
Noah Miller [Mon, 20 Mar 2023 18:50:01 +0000 (14:50 -0400)]
skip adding script when it won't have anything to run on

2 years agoSchemaHandler - Add IF EXISTS to dropTable function
Coleman Watts [Mon, 20 Mar 2023 15:57:32 +0000 (11:57 -0400)]
SchemaHandler - Add IF EXISTS to dropTable function

2 years agoMerge pull request #25880 from mattwire/caseactivity
demeritcowboy [Mon, 20 Mar 2023 18:40:44 +0000 (14:40 -0400)]
Merge pull request #25880 from mattwire/caseactivity

Use API4 to create 'Assign Case Role' activity

2 years agoUse API4 to create 'Assign Case Role' activity
Matthew Wire [Wed, 22 Feb 2023 14:49:26 +0000 (14:49 +0000)]
Use API4 to create 'Assign Case Role' activity

2 years agoMerge pull request #25402 from colemanw/deprecatedActions
Matthew Wire [Mon, 20 Mar 2023 13:53:00 +0000 (13:53 +0000)]
Merge pull request #25402 from colemanw/deprecatedActions

APIv4 - Show actions as deprecated in the Explorer

2 years agoMerge pull request #25461 from mattwire/dedupepermission
colemanw [Mon, 20 Mar 2023 13:37:58 +0000 (09:37 -0400)]
Merge pull request #25461 from mattwire/dedupepermission

Afform: Fix dedupe rules for anonymous users

2 years agoMerge pull request #25779 from eileenmcnaughton/unreachable
colemanw [Mon, 20 Mar 2023 13:23:50 +0000 (09:23 -0400)]
Merge pull request #25779 from eileenmcnaughton/unreachable

Add deprecations to unreachable code in previously shared function

2 years agoMerge pull request #25878 from eileenmcnaughton/dep_individual_format
colemanw [Mon, 20 Mar 2023 13:08:03 +0000 (09:08 -0400)]
Merge pull request #25878 from eileenmcnaughton/dep_individual_format

Remove do-nothing noisily deprecated formatting code

2 years agoRemove do-nothing formatting code
Eileen McNaughton [Mon, 20 Mar 2023 06:07:05 +0000 (19:07 +1300)]
Remove do-nothing formatting code

I've been convinced that dates are already handled long before this point
(& loading from the database) so nearly a year ago I added deprecation
notices to fire if this code ever actually did anything. No reports.

It can go:

2 years agoAdd deprecations to unreachable code in previously shared function
Eileen McNaughton [Fri, 10 Mar 2023 00:22:36 +0000 (13:22 +1300)]
Add deprecations to unreachable code in previously shared function

2 years agoMove getSubmittedValues to CRM_Core_Form
Eileen McNaughton [Mon, 20 Mar 2023 04:17:04 +0000 (17:17 +1300)]
Move getSubmittedValues to CRM_Core_Form

2 years agoMerge pull request #25875 from eileenmcnaughton/php82_report
Seamus Lee [Mon, 20 Mar 2023 02:58:25 +0000 (13:58 +1100)]
Merge pull request #25875 from eileenmcnaughton/php82_report

[PHP8.2] Declare outputHandler property in reports

2 years ago[PHP8.2] Declare outputHandler property
Eileen McNaughton [Mon, 20 Mar 2023 01:29:33 +0000 (14:29 +1300)]
[PHP8.2] Declare outputHandler property

I did a universe search to check private is OK

2 years agoMerge pull request #25872 from totten/master-release-mysqlver
Eileen McNaughton [Mon, 20 Mar 2023 01:13:55 +0000 (14:13 +1300)]
Merge pull request #25872 from totten/master-release-mysqlver

CiviUnitTestCase - Degrade gracefully on older DBMS

2 years agoCiviUnitTestCase - Allow relaxed enforcement on older DBMS
Tim Otten [Sun, 19 Mar 2023 22:52:08 +0000 (15:52 -0700)]
CiviUnitTestCase - Allow relaxed enforcement on older DBMS

2 years agoMerge pull request #25862 from eileenmcnaughton/dedupe_finder2
colemanw [Sun, 19 Mar 2023 22:46:55 +0000 (18:46 -0400)]
Merge pull request #25862 from eileenmcnaughton/dedupe_finder2

Post split code cleanup

2 years agoMerge pull request #25869 from eileenmcnaughton/import_contact_pre
Eileen McNaughton [Sun, 19 Mar 2023 22:05:52 +0000 (11:05 +1300)]
Merge pull request #25869 from eileenmcnaughton/import_contact_pre

[REF] Simplify import preProcess

2 years agoMerge pull request #25868 from eileenmcnaughton/import_switch
Eileen McNaughton [Sun, 19 Mar 2023 22:04:55 +0000 (11:04 +1300)]
Merge pull request #25868 from eileenmcnaughton/import_switch

Switch out the switch

2 years ago[REF] Simplify import preProcess
Eileen McNaughton [Sun, 19 Mar 2023 20:54:15 +0000 (09:54 +1300)]
[REF] Simplify import preProcess

2 years agoRemove require_onces
Eileen McNaughton [Sun, 19 Mar 2023 20:42:24 +0000 (09:42 +1300)]
Remove require_onces

2 years agoSwitch out the switch
Eileen McNaughton [Sun, 19 Mar 2023 00:46:47 +0000 (13:46 +1300)]
Switch out the switch

2 years agoMerge pull request #25866 from eileenmcnaughton/import_contribution_mapfield
colemanw [Sun, 19 Mar 2023 14:39:24 +0000 (10:39 -0400)]
Merge pull request #25866 from eileenmcnaughton/import_contribution_mapfield

[REF] Minor code simplification - extract `getHighlightedFields` in Contribution import `MapField`

2 years agoMerge pull request #25867 from eileenmcnaughton/import_unused
Seamus Lee [Sun, 19 Mar 2023 03:54:37 +0000 (14:54 +1100)]
Merge pull request #25867 from eileenmcnaughton/import_unused

[NFC] Remove some no-longer-used properties on Contribution import parser

2 years agoRemove some no-longer-used properties
Eileen McNaughton [Sun, 19 Mar 2023 00:35:33 +0000 (13:35 +1300)]
Remove some no-longer-used properties

2 years ago[REF] Minor code simplification - extract getHighlightedFields
Eileen McNaughton [Sat, 18 Mar 2023 23:09:57 +0000 (12:09 +1300)]
[REF] Minor code simplification - extract getHighlightedFields

2 years agoMerge pull request #25851 from eileenmcnaughton/pledge
Seamus Lee [Sat, 18 Mar 2023 22:42:46 +0000 (09:42 +1100)]
Merge pull request #25851 from eileenmcnaughton/pledge

dev/core#4079 Add Pledge Tokens

2 years agoRemove fake if
Eileen McNaughton [Sat, 18 Mar 2023 22:15:35 +0000 (11:15 +1300)]
Remove fake if

2 years agoRemove duplicate layer of caching
Eileen McNaughton [Sat, 18 Mar 2023 02:05:21 +0000 (15:05 +1300)]
Remove duplicate layer of caching

This is cached within a cache - the load of calling it is not
especially high and it is somewhat unlikely the cache will be populated
anyway so let's simplfiy...

2 years agoRemove last non-variable variables
Eileen McNaughton [Sat, 18 Mar 2023 01:58:37 +0000 (14:58 +1300)]
Remove last non-variable variables

2 years agoHard-code cacheKey as variables are not variable
Eileen McNaughton [Sat, 18 Mar 2023 01:57:31 +0000 (14:57 +1300)]
Hard-code cacheKey as variables are not variable

2 years agoRemove never-true if
Eileen McNaughton [Sat, 18 Mar 2023 01:55:10 +0000 (14:55 +1300)]
Remove never-true if

isProfile is always false

2 years agoStop adding field just so the calling code can strip them
Eileen McNaughton [Sat, 18 Mar 2023 01:54:13 +0000 (14:54 +1300)]
Stop adding field just so the calling code can strip them

The calling code will not use any field with no WHERE clause

2 years agoRemove handling for no contact type - it is ALWAYS passed in here
Eileen McNaughton [Sat, 18 Mar 2023 01:47:37 +0000 (14:47 +1300)]
Remove handling for no contact type - it is ALWAYS passed in here

2 years agoCopy shared ImportableFields to private function, for unravelling
Eileen McNaughton [Sat, 18 Mar 2023 01:39:07 +0000 (14:39 +1300)]
Copy shared ImportableFields to private function, for unravelling

2 years agoMerge pull request #25854 from eileenmcnaughton/test_tidy
Seamus Lee [Sat, 18 Mar 2023 22:04:02 +0000 (09:04 +1100)]
Merge pull request #25854 from eileenmcnaughton/test_tidy

[NFC] Minor tidy up in `MappingTest`

2 years agoMerge pull request #25852 from eileenmcnaughton/php82_contacttest
Seamus Lee [Sat, 18 Mar 2023 21:03:16 +0000 (08:03 +1100)]
Merge pull request #25852 from eileenmcnaughton/php82_contacttest

[Test][Php8.2] Fix undeclared properties & other housekeeping

2 years agoMerge pull request #25859 from eileenmcnaughton/dedupe_private
colemanw [Sat, 18 Mar 2023 18:49:09 +0000 (14:49 -0400)]
Merge pull request #25859 from eileenmcnaughton/dedupe_private

Make `Finder::tableQuery private`, after universe search

2 years agoMerge pull request #25864 from braders/php8.2-ParticipantPaymentTes
colemanw [Sat, 18 Mar 2023 18:48:06 +0000 (14:48 -0400)]
Merge pull request #25864 from braders/php8.2-ParticipantPaymentTes

[REF][PHP8.2] Refactor api_v3_ParticipantPaymentTest

2 years agoMerge pull request #25865 from braders/php8.2-eventid-property
colemanw [Sat, 18 Mar 2023 18:47:14 +0000 (14:47 -0400)]
Merge pull request #25865 from braders/php8.2-eventid-property

[REF][PHP8.2] Refactor getParticipantOrderParams to never write a dynamic property

2 years ago[REF][PHP8.2] Refactor getParticipantOrderParams to never write a dynamic property
Bradley Taylor [Sat, 18 Mar 2023 17:30:14 +0000 (17:30 +0000)]
[REF][PHP8.2] Refactor getParticipantOrderParams to never write a dynamic property

2 years ago[REF][PHP8.2] Refactor api_v3_ParticipantPaymentTest
Bradley Taylor [Sat, 18 Mar 2023 15:39:54 +0000 (15:39 +0000)]
[REF][PHP8.2] Refactor api_v3_ParticipantPaymentTest

2 years agoMerge pull request #25860 from eileenmcnaughton/dedupe_query
colemanw [Sat, 18 Mar 2023 15:12:16 +0000 (11:12 -0400)]
Merge pull request #25860 from eileenmcnaughton/dedupe_query

[REF] Replace use of legacy `$dao->query()` with `CRM_Core_DAO::executeQuery()`

2 years agoReplace use of legacy dao->query()
Eileen McNaughton [Sat, 18 Mar 2023 00:41:48 +0000 (13:41 +1300)]
Replace use of legacy dao->query()

2 years agoMerge pull request #25844 from braders/dynamic-props-ProcessorFormTest
Eileen McNaughton [Sat, 18 Mar 2023 05:19:31 +0000 (18:19 +1300)]
Merge pull request #25844 from braders/dynamic-props-ProcessorFormTest

[REF][PHP8.2] Get rid of dynamic properties in CRM_Core_Payment_ProcessorFormTest

2 years agoMake Finder::tableQuery private, after universe search
Eileen McNaughton [Sat, 18 Mar 2023 00:33:41 +0000 (13:33 +1300)]
Make Finder::tableQuery private, after universe search

2 years agoMerge pull request #25858 from totten/master-autoclean-explicit
Eileen McNaughton [Fri, 17 Mar 2023 23:36:22 +0000 (12:36 +1300)]
Merge pull request #25858 from totten/master-autoclean-explicit

AutoClean - Optionally allow explicit cleanup

2 years ago[REF][PHP8.2] Get rid of dynamic properties in CRM_Core_Payment_ProcessorFormTest
Bradley Taylor [Thu, 16 Mar 2023 09:25:32 +0000 (09:25 +0000)]
[REF][PHP8.2] Get rid of dynamic properties in CRM_Core_Payment_ProcessorFormTest

2 years agoAutoClean - Optionally allow explicit cleanup
Tim Otten [Fri, 17 Mar 2023 22:36:01 +0000 (15:36 -0700)]
AutoClean - Optionally allow explicit cleanup

2 years agoCRM_Core_Lock - Deferred release should work same for commit or rollback
Tim Otten [Fri, 17 Mar 2023 21:44:28 +0000 (14:44 -0700)]
CRM_Core_Lock - Deferred release should work same for commit or rollback

2 years agoensure we properly pass the arguments needed.
Jamie McClelland [Mon, 27 Feb 2023 18:36:26 +0000 (13:36 -0500)]
ensure we properly pass the arguments needed.

2 years agoensure delays from transactions don't cause cache race condition
Jamie McClelland [Mon, 27 Feb 2023 16:36:04 +0000 (11:36 -0500)]
ensure delays from transactions don't cause cache race condition

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

2 years agoMerge pull request #25856 from totten/test-release-locks
Tim Otten [Fri, 17 Mar 2023 21:40:44 +0000 (14:40 -0700)]
Merge pull request #25856 from totten/test-release-locks

CiviUnitTestCase - During teardown, ensure that we cleanup locks

2 years agoMerge pull request #25801 from eileenmcnaughton/82_part_test
colemanw [Fri, 17 Mar 2023 21:27:37 +0000 (17:27 -0400)]
Merge pull request #25801 from eileenmcnaughton/82_part_test

[PHP8.2] Clean up in `apiv3_ParticipantTest` with view to 8.2 compatibility

2 years agoMerge pull request #25799 from eileenmcnaughton/php82-invoice_id
Eileen McNaughton [Fri, 17 Mar 2023 21:24:55 +0000 (10:24 +1300)]
Merge pull request #25799 from eileenmcnaughton/php82-invoice_id

[PHP8.2] [Test] Remove use of (often undeclared) property `_invoiceID` in tests & one instance of `paymentProcessorID2`

2 years agoMerge pull request #25857 from colemanw/unusedVar
demeritcowboy [Fri, 17 Mar 2023 15:42:51 +0000 (11:42 -0400)]
Merge pull request #25857 from colemanw/unusedVar

Remove unused var

2 years agoRemove unused var
Coleman Watts [Fri, 17 Mar 2023 14:26:25 +0000 (10:26 -0400)]
Remove unused var

2 years agoCiviUnitTestCase - During cleanup, ensure that we have a clean slate (wrt locking)
Tim Otten [Fri, 17 Mar 2023 07:22:03 +0000 (00:22 -0700)]
CiviUnitTestCase - During cleanup, ensure that we have a clean slate (wrt locking)

2 years agoNormalize order of setUp()/useTransaction() - batch 6
Tim Otten [Fri, 17 Mar 2023 07:19:18 +0000 (00:19 -0700)]
Normalize order of setUp()/useTransaction() - batch 6

2 years agoNormalize order of setUp()/useTransaction() - batch 5
Tim Otten [Fri, 17 Mar 2023 06:07:54 +0000 (23:07 -0700)]
Normalize order of setUp()/useTransaction() - batch 5

2 years agoNormalize order of setUp()/useTransaction() - batch 4
Tim Otten [Fri, 17 Mar 2023 05:54:15 +0000 (22:54 -0700)]
Normalize order of setUp()/useTransaction() - batch 4

2 years agoNormalize order of setUp()/useTransaction() - batch 3
Tim Otten [Fri, 17 Mar 2023 05:54:04 +0000 (22:54 -0700)]
Normalize order of setUp()/useTransaction() - batch 3

2 years agoNormalize order of setUp()/useTransaction() - batch 2
Tim Otten [Fri, 17 Mar 2023 05:52:48 +0000 (22:52 -0700)]
Normalize order of setUp()/useTransaction() - batch 2

2 years agoMerge pull request #25853 from lemniscus/crm-core-form-php8-typeerror
Eileen McNaughton [Fri, 17 Mar 2023 04:33:03 +0000 (17:33 +1300)]
Merge pull request #25853 from lemniscus/crm-core-form-php8-typeerror

Avoid type error in CRM_Core_Form on php 8

2 years agoMinor tidy up in MappingTest
Eileen McNaughton [Thu, 16 Mar 2023 09:13:50 +0000 (22:13 +1300)]
Minor tidy up in MappingTest

2 years agoCiviUnitTestCase - Complain if setup steps are flipped around
Tim Otten [Fri, 17 Mar 2023 03:54:26 +0000 (20:54 -0700)]
CiviUnitTestCase - Complain if setup steps are flipped around

2 years agotest/phpunit/api/v3 - Fix spooky interaction
Tim Otten [Fri, 17 Mar 2023 03:51:34 +0000 (20:51 -0700)]
test/phpunit/api/v3 - Fix spooky interaction

This fixes an issue observed in review of 25673. With that patch included,
`JobProcessMailingTest` would still pass... but only in isolation. When
combined with `ExceptionTest`, it would fail.

I tried disabling the entire substance of `ExceptionTest`, and it still
failed. Say what?

The problem was _the order_ in which `ExceptionTest` does its initialization
(`parent::setUp()` and `$this->useTransaction()`). I suppose that order
determines the effectiveness of the transaction.

Most tests call `setup()` then `useTransaction()`. I looked for
outliers which flipped the order -- and found `EntityTagACLTest`
has the same init and the same spooky interaction.

After fixing the outliers, I'm getting the expected results on
`JobProcessMailingTest`.

2 years agoavoid type error in CRM_Core_Form on php 8
Noah Miller [Fri, 17 Mar 2023 03:20:27 +0000 (23:20 -0400)]
avoid type error in CRM_Core_Form on php 8

2 years ago[Test][Php8.2] Fix undeclared properties & other housekeeping
Eileen McNaughton [Thu, 16 Mar 2023 23:11:54 +0000 (12:11 +1300)]
[Test][Php8.2] Fix undeclared properties & other housekeeping

2 years agoMerge pull request #25811 from eileenmcnaughton/import_access
Seamus Lee [Fri, 17 Mar 2023 00:26:39 +0000 (11:26 +1100)]
Merge pull request #25811 from eileenmcnaughton/import_access

dev/core#4184 Permit access to template user jobs (imports)

2 years agoMerge pull request #25847 from civicrm/5.60
Eileen McNaughton [Thu, 16 Mar 2023 23:24:00 +0000 (12:24 +1300)]
Merge pull request #25847 from civicrm/5.60

5.60