Tim Otten [Thu, 15 Dec 2022 06:55:47 +0000 (22:55 -0800)]
CiviUnitTestCase - Remove unused method requireDBReset
Tim Otten [Thu, 15 Dec 2022 06:54:15 +0000 (22:54 -0800)]
CiviUnitTestCase - Remove ancient/unused property '$_dbName'
Tim Otten [Thu, 15 Dec 2022 06:51:10 +0000 (22:51 -0800)]
CiviUnitTestCase - Remove ancient/unused method 'getDataSet()'
Yashodha Chaku [Fri, 16 Dec 2022 04:56:04 +0000 (10:26 +0530)]
Merge pull request #25185 from civicrm/5.57
5.57
demeritcowboy [Fri, 16 Dec 2022 03:24:43 +0000 (22:24 -0500)]
Merge pull request #25174 from seamuslee001/ref_create_alter_column_function
[REF] Create Alter Column function in upgrade base class
demeritcowboy [Fri, 16 Dec 2022 03:08:57 +0000 (22:08 -0500)]
Merge pull request #25177 from totten/5.57-testing
Fix miscoordination between CiviUnitTestCase/CiviEnvBuilder. Fix flaky ConformanceTest.
demeritcowboy [Fri, 16 Dec 2022 03:08:08 +0000 (22:08 -0500)]
Merge pull request #25183 from eileenmcnaughton/build_memy
Remove conditionals that rely on NULL not being NULL
Eileen McNaughton [Fri, 16 Dec 2022 01:58:44 +0000 (14:58 +1300)]
Merge pull request #25161 from mattwire/genericsqlimport
Add datasource selector to generic import (so it can be used eg. with contribution import)
Tim Otten [Fri, 16 Dec 2022 00:54:36 +0000 (16:54 -0800)]
AutocompleteTest - Use SK as part of the baseline environment
Eileen McNaughton [Thu, 15 Dec 2022 23:24:29 +0000 (12:24 +1300)]
Merge pull request #25182 from eileenmcnaughton/build_mem
Simplify params on now-private function
Eileen McNaughton [Thu, 15 Dec 2022 22:39:35 +0000 (11:39 +1300)]
Remove conditionals that rely on NULL not being NULL
Eileen McNaughton [Thu, 15 Dec 2022 22:05:12 +0000 (11:05 +1300)]
Simplify params on now-private function
Yashodha Chaku [Thu, 15 Dec 2022 08:43:00 +0000 (14:13 +0530)]
Merge pull request #25144 from mattwire/afformmembership
Add Membership entity to formbuilder
Tim Otten [Tue, 13 Dec 2022 06:39:04 +0000 (22:39 -0800)]
ConformanceTest - Remove override, which causes failures in `ConformanceTest`
Tim Otten [Thu, 15 Dec 2022 04:13:08 +0000 (20:13 -0800)]
CiviUnitTestCase - Fix miscoordination with CiviEnvBuilder
Background
----------
Recall that `CiviUnitTestCase` and `CiviEnvBuilder` are two different
implementations of a similar concept.
* `Concept`: If two tests use the same baseline DB/environment, and if they
preserve the baseline, then you don't need to reset everything in between
tests. But if they change, then you need to reset.
* `CiviUnitTestCase`: The older rendition. Tightly coupled. Only allows
one specific baseline. Mingled with a lot of unrelated functionality in
`CiviUnitTestCase`.
* `CiviEnvBuilder`: The newer rendition. Loosely coupled. Allows different
baselines. Can be mixed into any plain-old `TestCase`. Used by
`Civi\Test::headless()` and `Civi\Test::e2e()`.
Problem Scenario
----------------
Suppose you have a mix of different tests running with the same DB -- e.g.
1. Run some tests based on `CiviEnvBuilder`
2. Run some tests based on `CiviUnitTestCase`
3. Run some tests based on `CiviEnvBuilder`
This wasn't originally anticipated, but it can happen -- either because
the test-suite is large+mixed, or because a developer is manually
running specific tests (which happen to be written differently).
The problem goes like this:
1. Run some tests based on `CiviEnvBuilder`
* This resets the DB and also stores a DB signature. ("Here is how
we setup the DB...")
2. Run some tests based on `CiviUnitTestCase`
* This resets the DB, but leaves the old DB signature in place.
3. Run some tests based on `CiviEnvBuilder`
* This sees the old DB signature and wrongly concludes that we
still have the DB from step (1).
Solution
--------
Whenever one resets the DB, it should update the DB signature.
Tim Otten [Thu, 15 Dec 2022 04:11:13 +0000 (20:11 -0800)]
(REF) CiviEnvBuilder - Simplify `$name` calculation
Tweaking the `$name` is theoretically useful if you have entirely
independent data-sets that happen to live in the same DB. In practice, we
only use CiviEnvBuilder to manage Civi-related data-sets.
Seamus Lee [Wed, 14 Dec 2022 22:22:21 +0000 (09:22 +1100)]
[REF] Create Alter Column function in upgrade base class
Minor fixes as per coleman
demeritcowboy [Wed, 14 Dec 2022 20:55:45 +0000 (15:55 -0500)]
Merge pull request #25172 from colemanw/noLocalize
Remove incorrect usages of {localize} in civicrm_data.tpl
demeritcowboy [Wed, 14 Dec 2022 20:21:30 +0000 (15:21 -0500)]
Merge pull request #25123 from mattwire/searchKitTasks
Add search/display details to searchKitTasks hook - allows for eg. filtering actions by search display
Coleman Watts [Wed, 14 Dec 2022 19:01:19 +0000 (14:01 -0500)]
Remove incorrect usages of {localize} in civicrm_data.tpl
The {localize} block was being used in this template in ways that could not plausibly work
- Using the tag in some rows but not others within the same INSERT statement
- Adding it to the rows but not the columns of an INSERT statement
I think the only reason this didn't cause a crash is because this file is only used during installation,
and it's not possible to install CiviCRM with multiple languages - you have to switch to multilingual
post-installation. So these {localize} blocks were never actually used.
colemanw [Wed, 14 Dec 2022 18:55:42 +0000 (13:55 -0500)]
Merge pull request #25143 from aydun/option_group_descriptions
Add Option Group descriptions from templates/CRM/Admin/Page/Options.tpl
Matthew Wire [Wed, 14 Dec 2022 18:31:03 +0000 (18:31 +0000)]
Merge pull request #25146 from colemanw/defineVars
SearchKit - Ensure id & name are defined when loading saved searches
Matthew Wire [Tue, 6 Dec 2022 22:31:58 +0000 (22:31 +0000)]
Add search/display details to searchKitTasks hook - allows for eg. filtering actions by search display
Coleman Watts [Wed, 14 Dec 2022 15:18:59 +0000 (10:18 -0500)]
OptionGroup - Update some descriptions and fix multilingual upgrader
Yashodha Chaku [Wed, 14 Dec 2022 07:14:29 +0000 (12:44 +0530)]
Merge pull request #25169 from demeritcowboy/act-targ-value
E_NOTICES on activity view
demeritcowboy [Tue, 13 Dec 2022 23:50:59 +0000 (18:50 -0500)]
E_NOTICES
Eileen McNaughton [Wed, 14 Dec 2022 01:03:20 +0000 (14:03 +1300)]
Merge pull request #25168 from totten/master-ornery
(NFC) PrevNextTest - Fix warning about "@group"
demeritcowboy [Tue, 13 Dec 2022 23:56:07 +0000 (18:56 -0500)]
Merge pull request #25167 from civicrm/5.57
5.57
Tim Otten [Tue, 13 Dec 2022 22:51:57 +0000 (14:51 -0800)]
(NFC) PrevNextTest - Fix warning about "@group"
When running this test, there are warnings like so:
```
WARNING: Class E2E\Core\PrevNextTest implements EndToEndInterface. It should declare "@group e2e".
```
In PHPUnit docs (https://phpunit.readthedocs.io/en/9.5/annotations.html#group), they
encode multiple groups using multiple lines. Following this convention fixes the warning.
demeritcowboy [Tue, 13 Dec 2022 22:34:26 +0000 (17:34 -0500)]
Merge pull request #25160 from totten/5.57-file-test
CRM_Utils_FileTest - Fix compatibility with private data folders
Eileen McNaughton [Tue, 13 Dec 2022 21:41:10 +0000 (10:41 +1300)]
Merge pull request #25145 from MegaphoneJon/core-4027-rc
fixes core#4027 - don't crash when a contribution has no line items
Seamus Lee [Tue, 13 Dec 2022 21:32:28 +0000 (08:32 +1100)]
Merge pull request #25165 from eileenmcnaughton/smarty_case
Fix smarty notices on Open Case
Eileen McNaughton [Tue, 13 Dec 2022 20:10:47 +0000 (09:10 +1300)]
Fix smarty notices on Open Case
Eileen McNaughton [Tue, 13 Dec 2022 19:49:57 +0000 (08:49 +1300)]
Merge pull request #25163 from civicrm/5.57
5.57
demeritcowboy [Tue, 13 Dec 2022 15:52:27 +0000 (10:52 -0500)]
Merge pull request #25158 from totten/5.57-entity-stat
getSiteStats - Use consistent report format
demeritcowboy [Tue, 13 Dec 2022 15:51:38 +0000 (10:51 -0500)]
Merge pull request #25157 from civicrm/5.57
5.57
Matthew Wire [Tue, 13 Dec 2022 11:48:41 +0000 (11:48 +0000)]
Add datasource selector to generic import (so it can be used eg. with contribution import)
Aidan Saunders [Fri, 9 Dec 2022 12:39:48 +0000 (12:39 +0000)]
regen
Aidan Saunders [Fri, 9 Dec 2022 12:37:02 +0000 (12:37 +0000)]
Change description field to text
Add Option Group descriptions from templates/CRM/Admin/Page/Options.tpl
Tim Otten [Tue, 13 Dec 2022 08:16:07 +0000 (00:16 -0800)]
CRM_Utils_FileTest - Fix compatibility with private data folders
For example, on my local, the `templates_c` folder lands at:
$BUILDKIT/build/dmaster/.civibuild/private/default/civicrm/templates_c
which is not a descendent of
$BUILDKIT/build/dmaster/web
Tim Otten [Tue, 13 Dec 2022 05:35:52 +0000 (21:35 -0800)]
getSiteStats - Use consistent report format
When general usage stats are enabled, the format should be consistent across
versions.
Before (4.7 - 5.56): Report stat as 'Delivered'
Before (5.57.beta1): Report stat as 'MailingEventDelivered'
After (5.57.beta1): Report stat as 'Delivered'
Yashodha Chaku [Tue, 13 Dec 2022 04:55:39 +0000 (10:25 +0530)]
Merge pull request #25149 from larssandergreen/allow-dashes-in-tracked-URLs-for-text-in-flexmailer
Flexmailer: Prevent broken urls containing hyphens when click tracking is enabled for plain text mailings
larssandergreen [Tue, 13 Dec 2022 02:36:48 +0000 (19:36 -0700)]
allow hyphens in tracked URLs in text emails
Yashodha Chaku [Mon, 12 Dec 2022 06:57:16 +0000 (12:27 +0530)]
Merge pull request #25152 from eileenmcnaughton/create_act
Remove no-longer-used noisily deprecated function `CRM_Contact_Form_Task_PDFLetterCommon::createActivities`
Eileen McNaughton [Sun, 11 Dec 2022 23:04:34 +0000 (12:04 +1300)]
Remove no-longer-used noisily deprecated function
demeritcowboy [Sun, 11 Dec 2022 01:13:43 +0000 (20:13 -0500)]
Merge pull request #25151 from civicrm/5.57
5.57
Seamus Lee [Sun, 11 Dec 2022 00:03:05 +0000 (11:03 +1100)]
Merge pull request #25150 from demeritcowboy/sitestats
[NFC] Update testGetSiteStats to match earlier name change
demeritcowboy [Sat, 10 Dec 2022 16:12:25 +0000 (11:12 -0500)]
update to match earlier name change
Coleman Watts [Fri, 9 Dec 2022 19:30:38 +0000 (14:30 -0500)]
SearchKit - Ensure id & name are defined when loading saved searches
Jon Goldberg [Fri, 9 Dec 2022 17:50:57 +0000 (12:50 -0500)]
fixes core#4027 - don't crash when a contribution has no line items
Matthew Wire [Fri, 9 Dec 2022 13:31:52 +0000 (13:31 +0000)]
Add Membership entity to formbuilder
Matthew Wire [Fri, 9 Dec 2022 12:05:18 +0000 (12:05 +0000)]
Merge pull request #25142 from eileenmcnaughton/import_contact
Php layer consolidation on Import DataSource form
Matthew Wire [Fri, 9 Dec 2022 12:04:11 +0000 (12:04 +0000)]
Merge pull request #25141 from eileenmcnaughton/import_source
Enotice fixes, consolidation on Import datasource forms
Tim Otten [Fri, 9 Dec 2022 09:09:29 +0000 (01:09 -0800)]
Set version to 5.58.alpha1
Tim Otten [Fri, 9 Dec 2022 09:04:58 +0000 (01:04 -0800)]
Set version to 5.57.beta1
Yashodha Chaku [Fri, 9 Dec 2022 04:31:33 +0000 (10:01 +0530)]
Merge pull request #25108 from eileenmcnaughton/pdf_depp
Remove noisly deprecated function PDFLetterCommon::postProcess
Eileen McNaughton [Fri, 9 Dec 2022 02:30:27 +0000 (15:30 +1300)]
Php layer consolidation on Import DataSource form
Eileen McNaughton [Fri, 9 Dec 2022 02:05:06 +0000 (15:05 +1300)]
Enotice fixes, consolidation on Import datasource forms
Seamus Lee [Fri, 9 Dec 2022 01:46:03 +0000 (12:46 +1100)]
Merge pull request #25140 from eileenmcnaughton/class
Fix enotice on user dash - when user has membership/s & debugging enabled
Seamus Lee [Thu, 8 Dec 2022 22:48:12 +0000 (09:48 +1100)]
Merge pull request #25137 from eileenmcnaughton/import_loc
Stop using single hard-coded value array (clean up from previous refactors)
Eileen McNaughton [Thu, 8 Dec 2022 22:41:47 +0000 (11:41 +1300)]
Fix enotice on user dash
demeritcowboy [Thu, 8 Dec 2022 19:41:18 +0000 (14:41 -0500)]
Merge pull request #24798 from jmcclelland/currency-additional-payment
ensure currency is included to avoid translation problems
Eileen McNaughton [Thu, 8 Dec 2022 19:28:23 +0000 (08:28 +1300)]
Merge pull request #25139 from christopher-yu/master
Cast membership object as array before passing to getMembershipStatusByDate()
Eileen McNaughton [Thu, 8 Dec 2022 19:26:22 +0000 (08:26 +1300)]
Merge pull request #25138 from demeritcowboy/regen
[NFC] Update instructions for running regen online
cyu [Thu, 8 Dec 2022 18:00:32 +0000 (10:00 -0800)]
Cast membership object as array before passing to getMembershipStatusByDate()
demeritcowboy [Thu, 8 Dec 2022 16:32:24 +0000 (11:32 -0500)]
update instructions
Mathieu Lu [Thu, 8 Dec 2022 15:49:26 +0000 (10:49 -0500)]
Merge pull request #25126 from colemanw/stripTags
SearchKit - Include html columns in spreadsheet download
Jamie McClelland [Thu, 8 Dec 2022 15:30:54 +0000 (10:30 -0500)]
re-generated sql file.
demeritcowboy [Thu, 8 Dec 2022 15:15:52 +0000 (10:15 -0500)]
Merge pull request #25136 from eileenmcnaughton/import_count
Remove always-true ifs
colemanw [Thu, 8 Dec 2022 11:47:33 +0000 (06:47 -0500)]
Merge pull request #24925 from eileenmcnaughton/token_dep
Fold `processGreetingTemplate` function only called from one place into caller, deprecate
Eileen McNaughton [Thu, 8 Dec 2022 06:46:18 +0000 (19:46 +1300)]
Stop using single hard-coded value array
Eileen McNaughton [Thu, 8 Dec 2022 06:35:56 +0000 (19:35 +1300)]
Remove always-true ifs
Eileen McNaughton [Thu, 8 Dec 2022 05:25:44 +0000 (18:25 +1300)]
Merge pull request #25129 from MegaphoneJon/oauth-accounting-batches-cont
Fix core#7016 in a second location
colemanw [Thu, 8 Dec 2022 02:39:00 +0000 (21:39 -0500)]
Merge pull request #25110 from eileenmcnaughton/mandatory_flex
Make flexmailer mandatory
Seamus Lee [Thu, 8 Dec 2022 02:36:55 +0000 (13:36 +1100)]
Merge pull request #25134 from seamuslee001/master
#24911 Forward port to master / 5.57
colemanw [Thu, 8 Dec 2022 02:36:19 +0000 (21:36 -0500)]
Merge pull request #25125 from MegaphoneJon/cmsuser-profile-cleanup
always define showCMS
colemanw [Thu, 8 Dec 2022 02:36:02 +0000 (21:36 -0500)]
Merge pull request #25131 from totten/master-symbols-test
(NFC) dev/core#4008 - Afform - More coverage for symbol-scanner
Seamus Lee [Thu, 8 Dec 2022 01:06:51 +0000 (12:06 +1100)]
Merge branch 'php81_null_string'
Seamus Lee [Thu, 8 Dec 2022 00:16:36 +0000 (11:16 +1100)]
Merge pull request #25132 from totten/master-wp-baseurl
CRM_Utils_System_WordPress - Drop unused variable
Seamus Lee [Thu, 8 Dec 2022 00:01:51 +0000 (11:01 +1100)]
Merge pull request #25130 from civicrm/5.56
5.56
Seamus Lee [Thu, 8 Dec 2022 00:01:19 +0000 (11:01 +1100)]
Merge pull request #25133 from colemanw/searchSortTest
SearchKit - Fix unit test so sort param actually does something
Seamus Lee [Sun, 6 Nov 2022 22:09:42 +0000 (09:09 +1100)]
[REF][PHP8.1] Fix a couple of issues where passing in NULL in string functions is deprecated in PHP8.1
Coleman Watts [Wed, 7 Dec 2022 22:51:36 +0000 (17:51 -0500)]
SearchKit - Fix unit test so sort param actually does something
Tim Otten [Wed, 7 Dec 2022 22:39:42 +0000 (14:39 -0800)]
CRM_Utils_System_WordPress - Drop unused variable
This is an off-shoot from #24911.
Before
------
`WordPress` implements the method `mapConfigToSSL()`, but ti doesn't do anything.
To see this, you can search for 'base_url' across the entire-source of a Civi-WP installation.
Specifically, I used
```
grep -lri 'global.*base_url'
```
The references appeared unrelated -- some references to Drupal/Backdrop adapters, and
some references to minified JS files. But I couldn't see anything that would in PHP on WP.
After
-----
Don't bother implementing the method. Might as well inherit the base method (which is empty).
Seamus Lee [Wed, 7 Dec 2022 22:20:36 +0000 (09:20 +1100)]
Merge pull request #25128 from seamuslee001/5.56
Output of npm audit fix
Tim Otten [Wed, 7 Dec 2022 22:08:14 +0000 (14:08 -0800)]
Merge pull request #24998 from demeritcowboy/oauth-name
Avoid symbol scan errors in oauth-client help text
Tim Otten [Wed, 7 Dec 2022 21:45:49 +0000 (13:45 -0800)]
(NFC) dev/core#4008 - Afform - More coverage for symbol-scanner
Add more test-coverage. This reproduces the failure-scenario that was
addressed by #25067. (When combined with 25067, it passes. But before
25067, it fails.)
Tim Otten [Wed, 7 Dec 2022 21:44:39 +0000 (13:44 -0800)]
Merge pull request #25067 from demeritcowboy/invalid-html
dev/core#4008 - alternate to 24998 - Avoid symbol scan errors
Jon Goldberg [Wed, 7 Dec 2022 21:07:50 +0000 (16:07 -0500)]
Fix core#7016 in a second location
Seamus Lee [Wed, 7 Dec 2022 20:49:41 +0000 (07:49 +1100)]
Output of npm audit fix
colemanw [Wed, 7 Dec 2022 19:04:33 +0000 (14:04 -0500)]
Merge pull request #25124 from MegaphoneJon/profile-cleanup-1
remove unused template vars from Profile Form
Jamie McClelland [Mon, 24 Oct 2022 15:00:18 +0000 (11:00 -0400)]
ensure currency is included to avoid translation problems
See https://lab.civicrm.org/dev/core/-/issues/411
demeritcowboy [Wed, 7 Dec 2022 02:42:06 +0000 (21:42 -0500)]
Merge pull request #25119 from demeritcowboy/current-revision
dev/core#1532 - Upgrade message about old civicase activity revisions
Coleman Watts [Wed, 7 Dec 2022 01:16:24 +0000 (20:16 -0500)]
SearchKit - Include html columns in spreadsheet download
This adds html-type columns to the spreadsheet download, by formatting them as plain text.
demeritcowboy [Wed, 7 Dec 2022 00:43:33 +0000 (19:43 -0500)]
Merge pull request #25122 from MegaphoneJon/no-perl
remove civimail-spooler script
Jon Goldberg [Tue, 6 Dec 2022 23:43:09 +0000 (18:43 -0500)]
always define showCMS
Jon Goldberg [Tue, 6 Dec 2022 23:36:37 +0000 (18:36 -0500)]
remove unused template vars from Profile Form
Seamus Lee [Tue, 6 Dec 2022 23:36:09 +0000 (10:36 +1100)]
Merge pull request #25121 from MegaphoneJon/no-drupalCms
remove unused code in Profile template
Jon Goldberg [Tue, 6 Dec 2022 21:49:52 +0000 (16:49 -0500)]
remove civimail-spooler script
Jon Goldberg [Tue, 6 Dec 2022 21:21:33 +0000 (16:21 -0500)]
remove unused code in Profile template