civicrm-core.git
2 years agoFix Dedupe rule creation should display labels of contact types, in case they have...
Darrick Servis [Fri, 13 May 2022 23:29:03 +0000 (16:29 -0700)]
Fix Dedupe rule creation should display labels of contact types, in case they have been customised.

2 years agoMerge pull request #23420 from mattwire/custombasepage
demeritcowboy [Fri, 13 May 2022 16:49:49 +0000 (12:49 -0400)]
Merge pull request #23420 from mattwire/custombasepage

Allow for custom base page in AJAX requests

2 years agoUse a more unique placeholder url path for CiviCRM AJAX requests
Matthew Wire [Tue, 10 May 2022 15:41:20 +0000 (16:41 +0100)]
Use a more unique placeholder url path for CiviCRM AJAX requests

2 years agoMerge pull request #23444 from eileenmcnaughton/import_get
colemanw [Fri, 13 May 2022 13:06:23 +0000 (09:06 -0400)]
Merge pull request #23444 from eileenmcnaughton/import_get

[REF] [Import] Minor code cleanup

2 years agoMerge pull request #23453 from eileenmcnaughton/import_no_map_field
colemanw [Fri, 13 May 2022 13:04:49 +0000 (09:04 -0400)]
Merge pull request #23453 from eileenmcnaughton/import_no_map_field

Remove sets for no-longer gotten vars

2 years agoRemove sets for no-longer gotten vars
Eileen McNaughton [Fri, 13 May 2022 01:52:53 +0000 (13:52 +1200)]
Remove sets for no-longer gotten vars

2 years agoMerge pull request #23450 from totten/master-karma-comps
Seamus Lee [Thu, 12 May 2022 22:54:46 +0000 (08:54 +1000)]
Merge pull request #23450 from totten/master-karma-comps

 (NFC) karma - Enable all Civi components (not just CiviCase)

2 years agoMerge pull request #23448 from totten/master-typo
Seamus Lee [Thu, 12 May 2022 22:54:12 +0000 (08:54 +1000)]
Merge pull request #23448 from totten/master-typo

(NFC) CRM_Utils_Hook - Typo

2 years agoMerge pull request #23442 from eileenmcnaughton/import_data
Eileen McNaughton [Thu, 12 May 2022 22:15:17 +0000 (10:15 +1200)]
Merge pull request #23442 from eileenmcnaughton/import_data

[REF] [Import] Parser cleanup

2 years ago(NFC) karma - Enable all Civi components (not just CiviCase)
Tim Otten [Thu, 12 May 2022 20:53:46 +0000 (13:53 -0700)]
(NFC) karma - Enable all Civi components (not just CiviCase)

This is a small cleanup (suggested by @colemanw) that makes the `karma.conf.js` appear more general.

It modifies the startup process for a test-runner; as long as the test-runner still gives the
same output, it should be safe.

Before
------

`karma` loads baseline Angular modules and CiviCase Angular modules.

After
-----

`karma` loads baseline Angular modules and any/all component-based Angular modules

Comment
-------

Why was it only CiviCase?  Not certain...  but I *think* it's because
(historically) `crmMailing.ang.php` did extra work to build `settings`, and
this extra work was a bit too heavy.  That work has moved (`settings` became
`settingsFactory`) and maybe makes this safer.

2 years ago(NFC) CRM_Utils_Hook - Typo
Tim Otten [Thu, 12 May 2022 20:23:52 +0000 (13:23 -0700)]
(NFC) CRM_Utils_Hook - Typo

2 years agokarma - Allow execution with debug_mode=1. Hide jsonFormatter.
Tim Otten [Thu, 12 May 2022 20:38:48 +0000 (13:38 -0700)]
karma - Allow execution with debug_mode=1. Hide jsonFormatter.

Before
------

If you enable `debug_mode=1` and run `karma`, it produces a large number of failures:

```
PhantomJS 2.1.1 (Mac OS 0.0.0): Executed 81 of 81 (55 FAILED) (2.686 secs / 2.387 secs)
```

After
-----

If you enable `debug_mode=1` and run `karma`, it passes:

```
PhantomJS 2.1.1 (Mac OS 0.0.0): Executed 81 of 81 SUCCESS (7.232 secs / 6.95 secs)
```

Comments
--------

The `jsonFormatter` plugin is a DX nicety; when browsing a page with `?angularDebug=1` and with `debug_mode=1`, it will load extra
files so that `<crm-ui-debug>` panels look pretty. But ordinarily, loading these files is extraneous.

2 years ago[REF] [Import] Remove last instance of passing fieldTypes through get->set
Eileen McNaughton [Thu, 21 Apr 2022 22:11:41 +0000 (10:11 +1200)]
[REF] [Import] Remove last instance of passing fieldTypes through get->set

2 years agoMerge pull request #23332 from darrick/dupeQuery
Monish Deb [Thu, 12 May 2022 18:51:40 +0000 (00:21 +0530)]
Merge pull request #23332 from darrick/dupeQuery

(REF) CRM_Dedupe_BAO_DedupeRule - Support third party fields and tables in rules

2 years agoMerge pull request #23441 from colemanw/api4TestCleanup
Eileen McNaughton [Thu, 12 May 2022 04:21:06 +0000 (16:21 +1200)]
Merge pull request #23441 from colemanw/api4TestCleanup

[TEST ONLY] APIv4 - ensure test records are cleaned up in non-transaction tests

2 years agoMerge pull request #23443 from civicrm/5.50
Eileen McNaughton [Thu, 12 May 2022 03:19:13 +0000 (15:19 +1200)]
Merge pull request #23443 from civicrm/5.50

5.50

2 years agoAPIv4 Unit test fixes - ensure test records are cleaned up in non-transaction tests
Coleman Watts [Wed, 11 May 2022 23:39:17 +0000 (19:39 -0400)]
APIv4 Unit test fixes - ensure test records are cleaned up in non-transaction tests

Use the new `createTestRecord` and `saveTestRecords` in non-transaction test classes
so the created records are automatically cleaned-up.

2 years agoMerge pull request #23436 from colemanw/searchKitPagerDefaults
Eileen McNaughton [Thu, 12 May 2022 01:08:57 +0000 (13:08 +1200)]
Merge pull request #23436 from colemanw/searchKitPagerDefaults

SearchKit - Default to simple pager when creating new table display

2 years agoMerge pull request #23434 from colemanw/groupByFn
Eileen McNaughton [Thu, 12 May 2022 01:08:00 +0000 (13:08 +1200)]
Merge pull request #23434 from colemanw/groupByFn

SearchKit - Allow functions in the GROUP BY clause

2 years agoUse submittedValues for usps
Eileen McNaughton [Thu, 12 May 2022 00:37:37 +0000 (12:37 +1200)]
Use submittedValues for usps

2 years ago[REF] [Import] Minor code cleanup
Eileen McNaughton [Thu, 12 May 2022 00:12:29 +0000 (12:12 +1200)]
[REF] [Import] Minor code cleanup

This chunk of code effectively constructs an array 'value' which holds the location
fields from the mapping. If the array is not empty then
use it as an array, otherwise use just the value

2 years agoMerge pull request #23440 from totten/5.50-since-when
colemanw [Wed, 11 May 2022 23:58:50 +0000 (19:58 -0400)]
Merge pull request #23440 from totten/5.50-since-when

(NFC) mixin/mgd-php@1 - Twiddle `@since`

2 years agoMerge pull request #23427 from eileenmcnaughton/get_mapped_params
colemanw [Wed, 11 May 2022 23:58:17 +0000 (19:58 -0400)]
Merge pull request #23427 from eileenmcnaughton/get_mapped_params

[REF] [Import] Simplify if - exit loop early

2 years ago[REF] [Import] Move datasource interaction to datasource class
Eileen McNaughton [Wed, 11 May 2022 04:58:36 +0000 (16:58 +1200)]
[REF] [Import] Move datasource interaction to datasource class

2 years agoMerge pull request #23439 from colemanw/dashboardUpdate
Eileen McNaughton [Wed, 11 May 2022 23:15:35 +0000 (11:15 +1200)]
Merge pull request #23439 from colemanw/dashboardUpdate

Dashboard - Efficiency tweak

2 years ago(NFC) mixin/mgd-php@1 - Twiddle `@since`
Tim Otten [Wed, 11 May 2022 22:00:11 +0000 (15:00 -0700)]
(NFC) mixin/mgd-php@1 - Twiddle `@since`

Overview
--------

Switch `@since` from "modified" version to "introduced" version.

Comment
-------

The [spec for `@since`](https://docs.phpdoc.org/guide/references/phpdoc/tags/since.html)
is more open ("when an element was introduced _or_ modified"), but this matches similar
usages in the same repo.

2 years agoMerge pull request #23409 from demeritcowboy/psrlog
Tim Otten [Wed, 11 May 2022 21:42:49 +0000 (14:42 -0700)]
Merge pull request #23409 from demeritcowboy/psrlog

dev/drupal#176 - Allow wider range of psr-log versions to be installed

2 years agoMerge pull request #23437 from colemanw/noTransform
Eileen McNaughton [Wed, 11 May 2022 21:42:24 +0000 (09:42 +1200)]
Merge pull request #23437 from colemanw/noTransform

SearchKit - Don't transform case for fieldsets on admin screen (more translation-friendly)

2 years agoMerge pull request #23438 from colemanw/sortInactiveDashlets
Eileen McNaughton [Wed, 11 May 2022 21:20:54 +0000 (09:20 +1200)]
Merge pull request #23438 from colemanw/sortInactiveDashlets

Dashboard - Sort available dashlets alphabetically, add search box

2 years agoMerge pull request #23435 from mlutfy/removeOldL10nDir
Eileen McNaughton [Wed, 11 May 2022 20:05:41 +0000 (08:05 +1200)]
Merge pull request #23435 from mlutfy/removeOldL10nDir

Translation: remove support for CiviCRM pre-4.5 l10n file locations

2 years agoDashboard - Efficiency tweak
Coleman Watts [Wed, 11 May 2022 20:00:34 +0000 (16:00 -0400)]
Dashboard - Efficiency tweak

Use static binding for non-changing values

2 years agoDashboard - Sort inactive dashlets by label, add search box.
Coleman Watts [Wed, 11 May 2022 18:39:22 +0000 (14:39 -0400)]
Dashboard - Sort inactive dashlets by label, add search box.

This makes dashlets easier to find if there is a large number.

2 years agoSearchKit - Don't transform case for fieldsets on admin screen (more translation...
Coleman Watts [Wed, 11 May 2022 16:21:18 +0000 (12:21 -0400)]
SearchKit - Don't transform case for fieldsets on admin screen (more translation-friendly)

2 years agoMerge pull request #23432 from colemanw/api4TestCleanup
colemanw [Wed, 11 May 2022 15:33:46 +0000 (11:33 -0400)]
Merge pull request #23432 from colemanw/api4TestCleanup

[REF] APIv4 - Simplify entity creation in test suite

2 years agoSearchKit - Default to simple pager when creating new table display
Coleman Watts [Wed, 11 May 2022 15:00:23 +0000 (11:00 -0400)]
SearchKit - Default to simple pager when creating new table display

Before: Pager default included "row count" and "adjustible page size".
After: Defaults to simple pager without the extras.

The extra stuff isn't always useful and can break the layout on small screens or dashlets,
so I think a better default is to exclude rather than include them.

2 years agoTranslation: remove support for CiviCRM pre-4.5 l10n file locations
Mathieu Lutfy [Wed, 11 May 2022 14:53:34 +0000 (10:53 -0400)]
Translation: remove support for CiviCRM pre-4.5 l10n file locations

2 years agoSearchKit - Allow functions in the GROUP BY clause
Coleman Watts [Wed, 11 May 2022 14:30:36 +0000 (10:30 -0400)]
SearchKit - Allow functions in the GROUP BY clause

Fixes dev/core#2485

2 years agoMerge pull request #23433 from colemanw/dashletHover
demeritcowboy [Wed, 11 May 2022 14:12:34 +0000 (10:12 -0400)]
Merge pull request #23433 from colemanw/dashletHover

Dashboard - Show full title when hovering an inactive dashlet

2 years agoAPIv4 - Simplify entity creation in test suite
Coleman Watts [Wed, 11 May 2022 11:19:29 +0000 (07:19 -0400)]
APIv4 - Simplify entity creation in test suite

Removes the old v3 creation and hardcoded sample data in favor of
new `createTestRecord` and `saveTestRecords` methods which automatically
handle cleanup during tearDown.

2 years agoDashboard - Show full title when hovering an inactive dashlet
Coleman Watts [Wed, 11 May 2022 11:55:53 +0000 (07:55 -0400)]
Dashboard - Show full title when hovering an inactive dashlet

2 years ago[REF] [Import] Parser cleanup - remove now unused
Eileen McNaughton [Wed, 11 May 2022 02:02:37 +0000 (14:02 +1200)]
[REF] [Import] Parser cleanup - remove now unused

2 years agoMerge pull request #23428 from eileenmcnaughton/import_field_keys
Eileen McNaughton [Wed, 11 May 2022 02:48:23 +0000 (14:48 +1200)]
Merge pull request #23428 from eileenmcnaughton/import_field_keys

[REF] [Import] Remove unused field get action (death to copy & paste)

2 years agoMerge pull request #23421 from eileenmcnaughton/import_obs
demeritcowboy [Wed, 11 May 2022 02:47:28 +0000 (22:47 -0400)]
Merge pull request #23421 from eileenmcnaughton/import_obs

[Import] Stop passing unused parameter

2 years agoMerge pull request #23425 from eileenmcnaughton/import_member
Eileen McNaughton [Wed, 11 May 2022 01:23:38 +0000 (13:23 +1200)]
Merge pull request #23425 from eileenmcnaughton/import_member

[Ref] [Import][Member] Remove unused params

2 years ago[REF] [Import] Remove unused field get action
Eileen McNaughton [Wed, 11 May 2022 01:06:32 +0000 (13:06 +1200)]
[REF] [Import] Remove unused field get action

2 years ago[REF] [Import] Simplify if - exit loop early
Eileen McNaughton [Wed, 11 May 2022 00:34:05 +0000 (12:34 +1200)]
[REF] [Import] Simplify if - exit loop early

2 years agoMerge pull request #23426 from civicrm/5.50
Eileen McNaughton [Tue, 10 May 2022 23:44:41 +0000 (11:44 +1200)]
Merge pull request #23426 from civicrm/5.50

5.50 to master

2 years agoMerge pull request #23423 from totten/5.50-mixin-since
Eileen McNaughton [Tue, 10 May 2022 23:44:04 +0000 (11:44 +1200)]
Merge pull request #23423 from totten/5.50-mixin-since

(NFC) mixin/**.php - Add @since tags

2 years ago[Ref] [Import][Member] Remove unused params
Eileen McNaughton [Tue, 10 May 2022 23:38:51 +0000 (11:38 +1200)]
[Ref] [Import][Member] Remove unused params

2 years agoMerge pull request #23422 from totten/5.50-mgd-ver
colemanw [Tue, 10 May 2022 23:10:02 +0000 (19:10 -0400)]
Merge pull request #23422 from totten/5.50-mgd-ver

ManagedEntities - Update version number for mgd-php

2 years agoMerge pull request #23416 from eileenmcnaughton/import_create_job
colemanw [Tue, 10 May 2022 23:08:29 +0000 (19:08 -0400)]
Merge pull request #23416 from eileenmcnaughton/import_create_job

[REF] [Import] Create user-job records for Memership imports

2 years agotools/mixin/bin/mixer - Display the `@since` data
Tim Otten [Tue, 10 May 2022 21:50:56 +0000 (14:50 -0700)]
tools/mixin/bin/mixer - Display the `@since` data

2 years ago(NFC) mixin - Add `@since` tags
Tim Otten [Tue, 10 May 2022 21:36:46 +0000 (14:36 -0700)]
(NFC) mixin - Add `@since` tags

2 years agoManagedEntities - Update version number for mgd-php
Tim Otten [Tue, 10 May 2022 21:26:06 +0000 (14:26 -0700)]
ManagedEntities - Update version number for mgd-php

This is a follow-up/correction for #22959 (circa 5.50.alpha1; specifically
fdc67a75b2f20aea9f0961683bd8a59c78755d5f). The prior revision had updated the
behavior of `mgd-php`, so it should have also updated the version-number.

2 years agoStop passing unused parameter
Eileen McNaughton [Tue, 10 May 2022 19:30:16 +0000 (07:30 +1200)]
Stop passing unused parameter

2 years agoAllow AJAX paths to work properly with a custom basepage (as can be used on WordPress...
Matthew Wire [Tue, 10 May 2022 15:39:29 +0000 (16:39 +0100)]
Allow AJAX paths to work properly with a custom basepage (as can be used on WordPress frontend)

2 years agoallow more log
demeritcowboy [Mon, 9 May 2022 12:39:44 +0000 (08:39 -0400)]
allow more log

2 years agoMerge pull request #23418 from eileenmcnaughton/import_valid3
Monish Deb [Tue, 10 May 2022 13:48:50 +0000 (19:18 +0530)]
Merge pull request #23418 from eileenmcnaughton/import_valid3

[Import] Use table rather than csvs for no-match & unparsed

2 years agoMerge pull request #23317 from seamuslee001/php81_trim_codegen
Eileen McNaughton [Tue, 10 May 2022 08:57:26 +0000 (20:57 +1200)]
Merge pull request #23317 from seamuslee001/php81_trim_codegen

[REF] Fix PHP8.1 issue with passing NULL to trim()

2 years agoUse table rather than csvs for no-match & unparsed
Eileen McNaughton [Tue, 10 May 2022 08:07:14 +0000 (20:07 +1200)]
Use table rather than csvs for no-match & unparsed

2 years agoAdd test for NO_MATCH flow
Eileen McNaughton [Tue, 10 May 2022 07:41:12 +0000 (19:41 +1200)]
Add test for NO_MATCH flow

2 years ago[REF] Fix PHP8.1 issue with passing NULL to trim()
Seamus Lee [Thu, 28 Apr 2022 00:58:22 +0000 (10:58 +1000)]
[REF] Fix PHP8.1 issue with passing NULL to trim()

2 years agoMerge pull request #23385 from colemanw/defaultToIndividual
Yashodha Chaku [Tue, 10 May 2022 05:33:00 +0000 (11:03 +0530)]
Merge pull request #23385 from colemanw/defaultToIndividual

SearchKit - Default to search for individuals

2 years agoAdd test to ensure emails are validated & remove duplicate validation
Eileen McNaughton [Tue, 10 May 2022 00:10:18 +0000 (12:10 +1200)]
Add test to ensure emails are validated & remove duplicate validation

2 years ago[Ref][Import] Start adding testing to validation, simplify
Eileen McNaughton [Mon, 9 May 2022 21:14:29 +0000 (09:14 +1200)]
[Ref][Import] Start adding testing to validation, simplify

2 years ago[Import][Ref] Calculate relationship type in parser
Eileen McNaughton [Mon, 9 May 2022 12:16:23 +0000 (00:16 +1200)]
[Import][Ref] Calculate relationship type in parser

This is being calculated
here
https://github.com/civicrm/civicrm-core/blob/c169525f72b1f956d58cec1e4a15b0f57de3eabf/CRM/Contact/Import/ImportJob.php#L132-L136

And this change moves the calculation into the
parser class so that, along with the other arrays
it can be removed as an input parameter

2 years agoMerge pull request #23401 from eileenmcnaughton/import_data_source
colemanw [Tue, 10 May 2022 00:11:33 +0000 (20:11 -0400)]
Merge pull request #23401 from eileenmcnaughton/import_data_source

(REF) Importer - Remove unused parameters. Simplify signature.

2 years ago[REF] [Import] Create user-job records for Memership imports
Eileen McNaughton [Thu, 21 Apr 2022 21:31:57 +0000 (09:31 +1200)]
[REF] [Import] Create user-job records for Memership imports

2 years agoMerge pull request #23414 from civicrm/5.50
Eileen McNaughton [Mon, 9 May 2022 19:51:05 +0000 (07:51 +1200)]
Merge pull request #23414 from civicrm/5.50

5.50 to master

2 years agoMerge pull request #23412 from colemanw/inputTypes
Eileen McNaughton [Mon, 9 May 2022 19:50:35 +0000 (07:50 +1200)]
Merge pull request #23412 from colemanw/inputTypes

Afform - Fix RC regression of missing input types

2 years agoMerge pull request #23411 from civicrm/5.50
Eileen McNaughton [Mon, 9 May 2022 19:37:07 +0000 (07:37 +1200)]
Merge pull request #23411 from civicrm/5.50

5.50

2 years agoMerge pull request #23410 from colemanw/api4ConformanceTestBase
colemanw [Mon, 9 May 2022 17:58:51 +0000 (13:58 -0400)]
Merge pull request #23410 from colemanw/api4ConformanceTestBase

[TEST ONLY] APIv4 - Remove unused extras from ConformanceTest

2 years agoMerge pull request #23382 from eileenmcnaughton/import_simp
colemanw [Mon, 9 May 2022 17:45:08 +0000 (13:45 -0400)]
Merge pull request #23382 from eileenmcnaughton/import_simp

[REF] Import - make condition clearer

2 years agoMerge pull request #23290 from eileenmcnaughton/import_cont
colemanw [Mon, 9 May 2022 17:43:38 +0000 (13:43 -0400)]
Merge pull request #23290 from eileenmcnaughton/import_cont

[REF] [Import] Contribution import - clarify return codes

2 years agoMerge pull request #23406 from eileenmcnaughton/import_no_match
colemanw [Mon, 9 May 2022 17:41:18 +0000 (13:41 -0400)]
Merge pull request #23406 from eileenmcnaughton/import_no_match

[REF] [Import] Summary tpl - remove always-true ifs

2 years agoMerge pull request #23405 from eileenmcnaughton/import_in
colemanw [Mon, 9 May 2022 17:32:12 +0000 (13:32 -0400)]
Merge pull request #23405 from eileenmcnaughton/import_in

[REF][Import] Remove some, now unused, parameters

2 years agoAfform - Fix RC regression of missing input types
Coleman Watts [Mon, 9 May 2022 15:59:15 +0000 (11:59 -0400)]
Afform - Fix RC regression of missing input types

This regressed because the client-side variable was renamed as
part of 47332dba8ff22aa6f08d473a0437dc02ca53458d

2 years agoMerge pull request #23407 from eileenmcnaughton/import_550
demeritcowboy [Mon, 9 May 2022 15:56:59 +0000 (11:56 -0400)]
Merge pull request #23407 from eileenmcnaughton/import_550

[Import] Fix 5.50 error url

2 years agoAPIv4 Tests - Remove unused extras from ConformanceTest
Coleman Watts [Mon, 9 May 2022 15:40:56 +0000 (11:40 -0400)]
APIv4 Tests - Remove unused extras from ConformanceTest

2 years ago[Import] Fix 5.50 error url
Eileen McNaughton [Mon, 9 May 2022 11:13:20 +0000 (23:13 +1200)]
[Import] Fix 5.50 error url

2 years ago[REF] [Import] Summary tpl - remove always-true ifs
Eileen McNaughton [Mon, 9 May 2022 11:00:52 +0000 (23:00 +1200)]
[REF] [Import] Summary tpl - remove always-true ifs

2 years ago[REF][Import] Remove some, now unused, parameters
Eileen McNaughton [Mon, 9 May 2022 10:30:59 +0000 (22:30 +1200)]
[REF][Import] Remove some, now unused, parameters

2 years ago[REF] Import - make condition clearer
Eileen McNaughton [Thu, 5 May 2022 22:48:28 +0000 (10:48 +1200)]
[REF] Import - make condition clearer

The mapping of fields basically breaks down into 'has a relationship' - in which
case fieldName is empy and does not have a relationship - in which
case field name is not empy. This makes that explicit -
specifically referring to relatedContactKey rather than
relying on the person reading the code
understanding that the presence of fieldName implies
whether it is a relationship

2 years ago[REF] [Import] Contribution import - clarify return codes, remove handling for unused...
Eileen McNaughton [Sat, 23 Apr 2022 21:57:08 +0000 (09:57 +1200)]
[REF] [Import] Contribution import - clarify return codes, remove handling for unused CONFLICT

2 years agoMerge pull request #23296 from colemanw/afformRelationships
Seamus Lee [Mon, 9 May 2022 07:09:10 +0000 (17:09 +1000)]
Merge pull request #23296 from colemanw/afformRelationships

Afform - support relationships

2 years agoMerge pull request #23395 from eileenmcnaughton/import_cleanup
Yashodha Chaku [Mon, 9 May 2022 03:47:21 +0000 (09:17 +0530)]
Merge pull request #23395 from eileenmcnaughton/import_cleanup

[Ref][Import] Remove now-unused code

2 years agoAllow dupeQuery to add query for table added via dupeQuery type supportedFields hook.
Darrick Servis [Sat, 30 Apr 2022 19:55:20 +0000 (12:55 -0700)]
Allow dupeQuery to add query for table added via dupeQuery type supportedFields hook.

Adding unit tests for hook_civicrm_dupeQuery.

Fix coding standards.

Add query option to dupeQuery hook.

Fix typo.

Provide custom test entity to test findDuplicates.

Change contact type from Organization to Individual.

Use CRM_Core_DAO::getReferencesToContactTable() and
CRM_Core_DAO::getDynamicReferencesToTable('civicrm_contact')
to find refs for the DedupeRule query.

Simplify changes as much as possible.

2 years agoMerge pull request #23402 from colemanw/customTestBase
Eileen McNaughton [Sun, 8 May 2022 09:55:20 +0000 (21:55 +1200)]
Merge pull request #23402 from colemanw/customTestBase

[REF] [TEST ONLY] APIv4 - Reorganize test classes, don't use transactions for custom field tests

2 years agoMerge pull request #23400 from eileenmcnaughton/import_no_match
colemanw [Sat, 7 May 2022 20:56:59 +0000 (16:56 -0400)]
Merge pull request #23400 from eileenmcnaughton/import_no_match

[Import] Reduce unused copy & paste

2 years agoAPIv4 - Reorganize test classes, don't use transactions for custom value tests
Coleman Watts [Sat, 7 May 2022 17:35:56 +0000 (13:35 -0400)]
APIv4 - Reorganize test classes, don't use transactions for custom value tests

Transactions don't work for custom field tests because schema alterations can't be inside transactions.
This moves the "implements TransactionalInterface" declaration from the base class to the test classes
so each one can opt-in individually.

2 years ago[Import] Fix database initialization to remove unused parameters
Eileen McNaughton [Sat, 7 May 2022 03:07:34 +0000 (15:07 +1200)]
[Import] Fix database initialization to remove unused parameters

2 years agoMerge pull request #23399 from civicrm/5.50
Eileen McNaughton [Sat, 7 May 2022 03:16:09 +0000 (15:16 +1200)]
Merge pull request #23399 from civicrm/5.50

5.50

2 years ago[Import] Reduce unused copy & paste
Eileen McNaughton [Sat, 7 May 2022 02:36:50 +0000 (14:36 +1200)]
[Import] Reduce unused copy & paste

Unlike the CONFLICT return code the NO_MATCH code IS returned
- but ONLY in the contact import - in all the other imports
it is there by the virtue of copy & paste

2 years agoMerge pull request #23397 from totten/5.50-e2e-error
Seamus Lee [Sat, 7 May 2022 01:19:49 +0000 (11:19 +1000)]
Merge pull request #23397 from totten/5.50-e2e-error

(E2E) `testErrorChrome` - Update assertions for page-chrome

2 years agoMerge pull request #23398 from totten/5.50-e2e-error-bd
Seamus Lee [Sat, 7 May 2022 01:12:33 +0000 (11:12 +1000)]
Merge pull request #23398 from totten/5.50-e2e-error-bd

(E2E) testErrorChrome - Skip Backdrop and D8+ (much like D7)

2 years agoMerge pull request #23393 from eileenmcnaughton/import_reg
demeritcowboy [Sat, 7 May 2022 00:29:58 +0000 (20:29 -0400)]
Merge pull request #23393 from eileenmcnaughton/import_reg

dev/core#3447 Fix for master-only-regression

2 years agoMerge pull request #23394 from eileenmcnaughton/import_550
demeritcowboy [Sat, 7 May 2022 00:25:39 +0000 (20:25 -0400)]
Merge pull request #23394 from eileenmcnaughton/import_550

Import 550

2 years agoMerge pull request #23396 from totten/5.50-upgrade-esc
Tim Otten [Fri, 6 May 2022 23:56:24 +0000 (16:56 -0700)]
Merge pull request #23396 from totten/5.50-upgrade-esc

5.50.alpha1.mysql.tpl - Escape `grouping` (reserved word in MySQL 8.0)

2 years ago(E2E) testErrorChrome - Revise page-chrome check for all Drupal-style UFs
Tim Otten [Fri, 6 May 2022 23:35:11 +0000 (16:35 -0700)]
(E2E) testErrorChrome - Revise page-chrome check for all Drupal-style UFs

2 years ago(E2E) testErrorChrome - Skip Backdrop and D8+ (much like D7)
Tim Otten [Fri, 6 May 2022 22:48:43 +0000 (15:48 -0700)]
(E2E) testErrorChrome - Skip Backdrop and D8+ (much like D7)

This test was added during 5.50.alpha (#23257, #22805).  It's purpose is to
assert that the page-chrome/site-wide-template is present on certain
error-messages; however, the underlying behavior was only implemented on
WordPress. It has not yet been implemented on other CMS.

Before
------

* __WordPress__: Runs testErrorChrome. Expected to pass.
* __Drupal 7__: Skip testErrorChrome (mostly) because it is expected to fail.
* __Drupal 8+, Backdrop__: Runs testErrorChrome. Fails.

After
-----

* __WordPress__: Runs testErrorChrome. Expected to pass.
* ___Drupal 7, Drupal 8+, Backdrop__: Skip testErrorChrome (mostly) because it is expected to fail.

Comment
-------

It still runs `testErrorChrome` for `permission` errors; per MM discussion, it appears that this does actually work, but we need
to tune assertion for BD+D8.