Eileen McNaughton [Thu, 29 Dec 2022 21:42:41 +0000 (10:42 +1300)]
Merge pull request #25233 from braders/remove-isHtml
Remove broken method CRM_Utils_File::isHtml()
Bradley Taylor [Thu, 29 Dec 2022 20:10:22 +0000 (20:10 +0000)]
Remove broken method CRM_Utils_File::isHtml()
Yashodha Chaku [Wed, 28 Dec 2022 09:56:42 +0000 (15:26 +0530)]
Merge pull request #25227 from eileenmcnaughton/dedupe_rule
Support DedupeRules as Managed entities
Eileen McNaughton [Wed, 28 Dec 2022 07:01:57 +0000 (20:01 +1300)]
Merge pull request #25228 from civicrm/5.57
5.57 to master
Eileen McNaughton [Wed, 28 Dec 2022 07:01:22 +0000 (20:01 +1300)]
Merge pull request #25225 from agh1/5.57.0-releasenotes-initial
5.57.0 release notes initial run
Eileen McNaughton [Wed, 28 Dec 2022 01:02:21 +0000 (14:02 +1300)]
Support DedupeRules as Managed entities
Andie Hunt [Tue, 27 Dec 2022 21:23:49 +0000 (16:23 -0500)]
5.57.0 release notes: added boilerplate
Andie Hunt [Tue, 27 Dec 2022 14:57:39 +0000 (09:57 -0500)]
5.57.0 release notes: raw from script
Yashodha Chaku [Tue, 27 Dec 2022 05:01:05 +0000 (10:31 +0530)]
Merge pull request #25223 from eileenmcnaughton/dep_opt
Remove deprecated ids from OptionValue::add
Eileen McNaughton [Tue, 27 Dec 2022 02:49:32 +0000 (15:49 +1300)]
Remove deprecated ids from OptionValue::add
demeritcowboy [Fri, 23 Dec 2022 19:03:21 +0000 (14:03 -0500)]
Merge pull request #25217 from braders/profile-image-accept-types
Only allow valid image types to be uploaded to image_URL field on profiles
demeritcowboy [Fri, 23 Dec 2022 18:09:31 +0000 (13:09 -0500)]
Merge pull request #25216 from civicrm/5.57
5.57
Bradley Taylor [Fri, 23 Dec 2022 17:05:03 +0000 (17:05 +0000)]
Only allow valid image types to be uploaded to image_URL field on profiles
Yashodha Chaku [Fri, 23 Dec 2022 08:06:03 +0000 (13:36 +0530)]
Merge pull request #25213 from demeritcowboy/fract-qty
dev/core#4039 - Restore ability to have fractional quantity for text price fields
demeritcowboy [Fri, 23 Dec 2022 00:15:22 +0000 (19:15 -0500)]
restore ability to have fractional quantity
demeritcowboy [Thu, 22 Dec 2022 21:34:23 +0000 (16:34 -0500)]
Merge pull request #25212 from seamuslee001/ref_composer_patches
[REF][PHP8.2] Update Composer Patches to latest version to fix notice…
Seamus Lee [Thu, 22 Dec 2022 19:51:51 +0000 (06:51 +1100)]
[REF][PHP8.2] Update Composer Patches to latest version to fix notice issue in php8.2
Seamus Lee [Wed, 21 Dec 2022 07:31:36 +0000 (18:31 +1100)]
Merge pull request #25201 from demeritcowboy/empty-checkbox
[NFC] php8 - Unit test for empty checkbox array #23305
demeritcowboy [Wed, 21 Dec 2022 03:10:32 +0000 (22:10 -0500)]
Merge pull request #25208 from civicrm/5.57
5.57
Eileen McNaughton [Tue, 20 Dec 2022 22:18:25 +0000 (11:18 +1300)]
Merge pull request #25204 from kurund/contribution-import-fix
dev/core#4038 import contribution fixes in update mode
demeritcowboy [Tue, 20 Dec 2022 18:46:05 +0000 (13:46 -0500)]
Merge pull request #23305 from ginkgomzd/custom-empty-array
correct logic for handling empty-array values for checkboxes;
demeritcowboy [Tue, 20 Dec 2022 17:18:43 +0000 (12:18 -0500)]
Merge pull request #25205 from mattwire/activityimporttypo
NFC: Fix variable name in activity import
ginkgoMZD [Tue, 20 Dec 2022 15:52:58 +0000 (10:52 -0500)]
correctly handle empty arrays in custom-fields;
Matthew Wire [Tue, 20 Dec 2022 13:03:32 +0000 (13:03 +0000)]
Fix variable name in activity import
Kurund Jalmi [Tue, 20 Dec 2022 10:06:25 +0000 (10:06 +0000)]
import contribution fixes in update mode
demeritcowboy [Tue, 20 Dec 2022 03:26:40 +0000 (22:26 -0500)]
Merge pull request #25202 from seamuslee001/php82_deprecation_classvariables
[REF][PHP8.2] Further resolve some deprecation issues around dynamic …
demeritcowboy [Mon, 19 Dec 2022 19:39:40 +0000 (14:39 -0500)]
failing test for empty checkbox array
Seamus Lee [Mon, 19 Dec 2022 22:55:05 +0000 (09:55 +1100)]
Merge pull request #25203 from seamuslee001/update_compile_lib
[REF] Update Composer Compile Lib with latest version
Seamus Lee [Mon, 19 Dec 2022 20:54:20 +0000 (20:54 +0000)]
[REF][PHP8.2] Further resolve some deprecation issues around dynamic class properties
Seamus Lee [Mon, 19 Dec 2022 21:23:12 +0000 (08:23 +1100)]
[REF] Update Composer Compile Lib with latest version
Seamus Lee [Mon, 19 Dec 2022 20:24:44 +0000 (07:24 +1100)]
Merge pull request #25186 from eileenmcnaughton/data_array
Remove reference to 'dataArray' from text version of contribution_online_receipt
demeritcowboy [Mon, 19 Dec 2022 19:25:31 +0000 (14:25 -0500)]
Merge pull request #25200 from MegaphoneJon/gotv-static
PHP8: callback function on GOTV must be static
demeritcowboy [Mon, 19 Dec 2022 18:19:18 +0000 (13:19 -0500)]
Merge pull request #25178 from totten/master-civiunitestcase
(REF) CiviUnitTestCase - Cleanup and simplify the DB-reset mechanism
Jon Goldberg [Mon, 19 Dec 2022 17:33:59 +0000 (12:33 -0500)]
callback function on GOTV must be static
colemanw [Mon, 19 Dec 2022 15:33:31 +0000 (10:33 -0500)]
Merge pull request #25164 from alifrumin/mailingLabels
[dev/core#3470] Search Kit: Mailing labels don't work
Yashodha Chaku [Mon, 19 Dec 2022 04:25:44 +0000 (09:55 +0530)]
Merge pull request #25193 from demeritcowboy/act-targ
E_WARNING on bulk email activity view
Eileen McNaughton [Mon, 19 Dec 2022 00:31:44 +0000 (13:31 +1300)]
Merge pull request #25197 from colemanw/fixOptions
SearchKit - Fix option loading & rendering for in-place edit
Seamus Lee [Sun, 18 Dec 2022 22:20:19 +0000 (09:20 +1100)]
Merge pull request #25147 from colemanw/bumpPhpMin
Bump min PHP version to 7.3.0
Eileen McNaughton [Sun, 18 Dec 2022 02:27:00 +0000 (15:27 +1300)]
Merge pull request #25120 from briennekordis/event_fees_tab
Configure Event Fees tab
demeritcowboy [Sun, 18 Dec 2022 00:11:15 +0000 (19:11 -0500)]
Merge pull request #25196 from seamuslee001/php82_errors_2
[REF] Fix a couple of errors in PHP8.2
demeritcowboy [Sun, 18 Dec 2022 00:11:03 +0000 (19:11 -0500)]
Merge pull request #25173 from eileenmcnaughton/no_const
Standardise method of getting entity in imports
demeritcowboy [Sun, 18 Dec 2022 00:10:42 +0000 (19:10 -0500)]
Merge pull request #25194 from eileenmcnaughton/build_divide
Post code-divide tidy-up
demeritcowboy [Sat, 17 Dec 2022 23:10:39 +0000 (18:10 -0500)]
Merge pull request #25154 from totten/master-month-names
CRM_Utils_Date - Get month names from IntlDateFormatter. Ignore timezones.
Coleman Watts [Sat, 17 Dec 2022 23:02:15 +0000 (18:02 -0500)]
SearchKit - Fix option loading & rendering for in-place edit
Fixes dev/core#4037
Eileen McNaughton [Wed, 14 Dec 2022 20:26:04 +0000 (09:26 +1300)]
Standardise method of getting entity
Seamus Lee [Sat, 17 Dec 2022 21:56:13 +0000 (08:56 +1100)]
[REF] Fix a couple of errors in PHP8.2
Eileen McNaughton [Fri, 16 Dec 2022 23:17:45 +0000 (12:17 +1300)]
Post code-divide tidy-up
Follow up to https://github.com/civicrm/civicrm-core/pull/25184
demeritcowboy [Fri, 16 Dec 2022 20:31:31 +0000 (15:31 -0500)]
E_NOTICE
demeritcowboy [Fri, 16 Dec 2022 20:25:09 +0000 (15:25 -0500)]
Merge pull request #25192 from mlutfy/addCroatian
List of languages: Enable Croatian language by default
demeritcowboy [Fri, 16 Dec 2022 19:12:41 +0000 (14:12 -0500)]
Merge pull request #25190 from civicrm/5.57
5.57
Mathieu Lutfy [Fri, 16 Dec 2022 18:48:45 +0000 (13:48 -0500)]
List of languages: Enable Croatian language by default
demeritcowboy [Fri, 16 Dec 2022 17:19:33 +0000 (12:19 -0500)]
Merge pull request #25189 from MegaphoneJon/batch-form-entity
Fix 'cannot determine default entity' error on New Batch page
demeritcowboy [Fri, 16 Dec 2022 15:33:11 +0000 (10:33 -0500)]
Merge pull request #25184 from eileenmcnaughton/build_divide
Divide & conquer, `initSet` no longer shared as much code is not
Jon Goldberg [Fri, 16 Dec 2022 15:24:30 +0000 (10:24 -0500)]
Fix 'cannot determine default entity' error on New Batch page
Tim Otten [Fri, 16 Dec 2022 10:46:36 +0000 (02:46 -0800)]
Merge pull request #25179 from jaapjansma/civix_issue_257
totten/civix#257 Fix Civix not correctly loading Mixinx
Eileen McNaughton [Fri, 16 Dec 2022 06:42:06 +0000 (19:42 +1300)]
Remove reference to 'dataArray' from text version of contribution_online_receipt
Tim Otten [Thu, 15 Dec 2022 08:36:04 +0000 (00:36 -0800)]
CiviUnitTestCase - Simplify console message. Remove unused method 'getDBName()'.
Tim Otten [Thu, 15 Dec 2022 08:31:45 +0000 (00:31 -0800)]
CiviUnitTestCase - Inline method '_populateDB()'
At this point, it's just a bunch of verbosely written conditions that
appear to be trueisms;
* When called via `setUpBeforeClass()`, the `$perClass` flag is TRUE,
so it does the reset.
* When called via `setUp()`, the `$object` flag is non-null,
so it does the reset.
At this point, the actual reset bit is 1-line. Easier to just call that.
Tim Otten [Thu, 15 Dec 2022 08:26:46 +0000 (00:26 -0800)]
CiviUnitTestCase - Extract method 'buildEnvironment'. Future target for method-overrides.
Tim Otten [Thu, 15 Dec 2022 07:13:02 +0000 (23:13 -0800)]
CiviUnitTestCase - Move UF check
In practice, this check is the first thing done by `setUpBeforeClass()`.
Might as well move it there.
Technically, this check is also called by way of `setUp()`, but it's
redundant at that point. (Constants are constants...)
Tim Otten [Thu, 15 Dec 2022 07:04:05 +0000 (23:04 -0800)]
CiviUnitTestCase - Inline misleading function 'getConnection'
This function returns a connection that nobody uses. It has only one
caller. It's mostly interesting because it can reset the database.
Hiding it under the name `getConnection` is misleading.
Tim Otten [Thu, 15 Dec 2022 07:02:11 +0000 (23:02 -0800)]
CiviUnitTestCase - Remove unused property $_dbconn
Tim Otten [Thu, 15 Dec 2022 06:58:30 +0000 (22:58 -0800)]
CiviUnitTestCase - Remove unused property $populateOnce
The property is initialized to FALSE. It seems that the idea was to let some classes
override this, but it is never used.
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)
Eileen McNaughton [Thu, 15 Dec 2022 23:30:35 +0000 (12:30 +1300)]
Divide & conquer, initSet no longer shared as much code is not
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
Jaap Jansma [Thu, 15 Dec 2022 17:08:22 +0000 (18:08 +0100)]
Fix for CiviX issue 257
Alice Frumin [Thu, 15 Dec 2022 16:41:27 +0000 (11:41 -0500)]
Action Type as variable
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
Alice Frumin [Wed, 14 Dec 2022 15:29:39 +0000 (10:29 -0500)]
use id instead of label
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