Noah Miller [Thu, 20 Jan 2022 02:32:56 +0000 (18:32 -0800)]
translate 2-digit years to 4 using rolling -95yr to +5yr window
Tim Otten [Thu, 20 Jan 2022 00:00:34 +0000 (16:00 -0800)]
Merge pull request #22574 from braders/send_unsub_response-phpdoc
(NFC) Minor phpdoc fixes to CRM_Mailing_Event_BAO_Unsubscribe::send_unsub_response
colemanw [Wed, 19 Jan 2022 22:50:28 +0000 (17:50 -0500)]
Merge pull request #22480 from eileenmcnaughton/create_date
Add created_date & modified_date to civicrm_relationship
Seamus Lee [Wed, 19 Jan 2022 22:30:49 +0000 (09:30 +1100)]
Merge pull request #22575 from braders/getGroupByFromSelectColumns-tidy
(NFC) Minor amends to getGroupByFromSelectColumns
Bradley Taylor [Wed, 19 Jan 2022 20:05:32 +0000 (20:05 +0000)]
(NFC) Minor amends to getGroupByFromSelectColumns
Bradley Taylor [Wed, 19 Jan 2022 19:24:16 +0000 (19:24 +0000)]
(NFC) Minor phpdoc fixes to CRM_Mailing_Event_BAO_Unsubscribe::send_unsub_response
Eileen McNaughton [Wed, 19 Jan 2022 19:03:26 +0000 (08:03 +1300)]
Merge pull request #22562 from braders/hook-preevent-docblock
(NFC) Correctly document CRM_Utils_Hook::pre to allow null ID
Eileen McNaughton [Wed, 19 Jan 2022 19:02:30 +0000 (08:02 +1300)]
Merge pull request #22573 from colemanw/componentFn
[REF] Components - Use extracted function
Coleman Watts [Wed, 19 Jan 2022 16:01:30 +0000 (11:01 -0500)]
Components - Use extracted function
Uses function extracted in #22567
colemanw [Wed, 19 Jan 2022 14:29:42 +0000 (09:29 -0500)]
Merge pull request #22458 from eileenmcnaughton/test
dev/core#2757 test to demonstrate contact delete actions were not called for v4 api
Eileen McNaughton [Wed, 19 Jan 2022 07:59:33 +0000 (20:59 +1300)]
Merge pull request #22565 from braders/report-form-docblock
(NFC) CiviReport, etal - More phpdoc fixes
Eileen McNaughton [Wed, 19 Jan 2022 05:43:42 +0000 (18:43 +1300)]
Merge pull request #22507 from colemanw/searchImportCleanup
[REF] SearchKit - Simplify import/export popup code
Seamus Lee [Wed, 19 Jan 2022 04:53:03 +0000 (15:53 +1100)]
Merge pull request #22568 from demeritcowboy/details-wrong-name
Activity Details field on batch update via profile has wrong fieldname
Eileen McNaughton [Wed, 12 Jan 2022 03:00:59 +0000 (16:00 +1300)]
Add created_date & modified_date to civicrm_relationship
As with other tables we have done this to, knowing when we added a record to the
DB is useful (and differs from the relationship start_date).
I'm not sure yet if I will try to expose in the UI or whether search-kit
is all we need
demeritcowboy [Wed, 19 Jan 2022 03:59:56 +0000 (22:59 -0500)]
Merge pull request #22569 from demeritcowboy/duplicate-file
Remove duplicate file
demeritcowboy [Wed, 19 Jan 2022 02:12:18 +0000 (21:12 -0500)]
remove duplicate file
Eileen McNaughton [Wed, 19 Jan 2022 01:35:59 +0000 (14:35 +1300)]
Merge pull request #22563 from braders/alterDeferredRevenueItems-phpdoc
(NFC) Update PHPDoc for alterDeferredRevenueItems
Eileen McNaughton [Wed, 19 Jan 2022 01:02:48 +0000 (14:02 +1300)]
Merge pull request #22567 from eileenmcnaughton/enabled
(REF) Extract function `CRM_Core_Component::isEnabled()`
demeritcowboy [Tue, 18 Jan 2022 23:29:04 +0000 (18:29 -0500)]
fix wrong field name
Eileen McNaughton [Tue, 18 Jan 2022 22:08:45 +0000 (11:08 +1300)]
Add function Core_Component::isEnabled
It always feels like there should be an easier to discover way to check if
a component is enabled ....
Bradley Taylor [Tue, 18 Jan 2022 20:57:02 +0000 (20:57 +0000)]
More phpdoc fixes, this time related to report form methods
Tim Otten [Tue, 18 Jan 2022 20:43:18 +0000 (12:43 -0800)]
Merge pull request #22555 from eileenmcnaughton/stricter
(NFC) Comment fixes Stricter phpcs
Tim Otten [Tue, 18 Jan 2022 20:41:54 +0000 (12:41 -0800)]
Merge pull request #22553 from eileenmcnaughton/css
(NFC) Remaining css phpcs fixes
Bradley Taylor [Tue, 18 Jan 2022 20:33:39 +0000 (20:33 +0000)]
Update PHPDoc for alterDeferredRevenueItems
Bradley Taylor [Tue, 18 Jan 2022 20:27:39 +0000 (20:27 +0000)]
Correctly document CRM_Utils_Hook::pre to allow null ID
Eileen McNaughton [Tue, 18 Jan 2022 05:19:14 +0000 (18:19 +1300)]
Merge pull request #22556 from eileenmcnaughton/from_where
Follow up fn removal
Seamus Lee [Tue, 18 Jan 2022 03:11:55 +0000 (14:11 +1100)]
Merge pull request #22549 from eileenmcnaughton/tool_clean
Remove obsolete scripts
Eileen McNaughton [Tue, 18 Jan 2022 01:39:06 +0000 (14:39 +1300)]
Follow up fn removal
Eileen McNaughton [Tue, 18 Jan 2022 01:37:56 +0000 (14:37 +1300)]
Merge pull request #22542 from colemanw/deprecateGetName
[REF] SavedSearch - Deprecate/remove redundant/unused functions
Eileen McNaughton [Tue, 18 Jan 2022 00:59:42 +0000 (13:59 +1300)]
Remainin css phpcs fixes
Eileen McNaughton [Tue, 18 Jan 2022 01:19:38 +0000 (14:19 +1300)]
Stricter phpcs
Eileen McNaughton [Tue, 18 Jan 2022 01:08:45 +0000 (14:08 +1300)]
Merge pull request #22466 from eileenmcnaughton/searchtype
Re-fix enotice on searchType to work with default modifiers
Eileen McNaughton [Tue, 18 Jan 2022 01:08:20 +0000 (14:08 +1300)]
Merge pull request #22550 from eileenmcnaughton/tool_clean1
Remove obsolete postIPN script
colemanw [Tue, 18 Jan 2022 00:03:19 +0000 (19:03 -0500)]
Merge pull request #22529 from eileenmcnaughton/phpcs4
PHPCS standards on css....
Seamus Lee [Mon, 17 Jan 2022 23:29:59 +0000 (10:29 +1100)]
Merge pull request #22544 from colemanw/deconstructor
(REF) Remove constructors that do nothing
Seamus Lee [Mon, 17 Jan 2022 23:29:17 +0000 (10:29 +1100)]
Merge pull request #22545 from eileenmcnaughton/build
Remove unused variable
Eileen McNaughton [Mon, 17 Jan 2022 23:16:34 +0000 (12:16 +1300)]
Remove obsolete postIPN script
Per https://github.com/civicrm/civicrm-core/pull/22534#issuecomment-
1014934985
Eileen McNaughton [Mon, 17 Jan 2022 23:15:14 +0000 (12:15 +1300)]
Remove obsolete scripts
Per https://github.com/civicrm/civicrm-core/pull/22534#issuecomment-
1014932778
Tim Otten [Mon, 17 Jan 2022 22:42:40 +0000 (14:42 -0800)]
Merge pull request #22534 from eileenmcnaughton/tools
Remove some old scripts
Eileen McNaughton [Tue, 11 Jan 2022 00:40:14 +0000 (13:40 +1300)]
Re-fix enotice on searchType to work with default modifiers
Use a value that we ensure we assign
Eileen McNaughton [Mon, 17 Jan 2022 21:34:37 +0000 (10:34 +1300)]
Remove unused variable
This is over-written a couple of lines later in the template so
we don't need it & ergo don't need to assign it either
Note that the paramter is assigned in postProcess for the
receipt so this is just this usage
Coleman Watts [Mon, 17 Jan 2022 21:13:34 +0000 (16:13 -0500)]
Remove unused pass-by-reference
This pass-by-ref was causing `civilint` to crash and appears to be unnecessary and possibly harmful.
Coleman Watts [Mon, 17 Jan 2022 20:54:46 +0000 (15:54 -0500)]
Remove constructors that do nothing
Eileen McNaughton [Mon, 17 Jan 2022 20:44:02 +0000 (09:44 +1300)]
Merge pull request #22541 from braders/buildpremiumpreviewblock-refactor2
Refactor buildPremiumPreviewBlock function to make intended usage clearer
Coleman Watts [Mon, 17 Jan 2022 19:34:18 +0000 (14:34 -0500)]
SavedSearch - Deprecate/remove redundant/unused functions
Bradley Taylor [Mon, 17 Jan 2022 19:08:01 +0000 (19:08 +0000)]
Refactor buildPremiumPreviewBlock function to make intended usage clearer.
Eileen McNaughton [Mon, 17 Jan 2022 18:54:19 +0000 (07:54 +1300)]
Merge pull request #22540 from civicrm/5.46
5.46 to master
Eileen McNaughton [Mon, 17 Jan 2022 18:53:48 +0000 (07:53 +1300)]
Merge pull request #22539 from colemanw/searchKitTokenFix
SearchKit - Fix token selector to use expression alias
colemanw [Mon, 17 Jan 2022 17:38:42 +0000 (12:38 -0500)]
Merge pull request #22533 from eileenmcnaughton/phpcs
More comments & style fixes
Coleman Watts [Mon, 17 Jan 2022 17:22:44 +0000 (12:22 -0500)]
SearchKit - Fix token selector to use expression alias
demeritcowboy [Mon, 17 Jan 2022 16:45:09 +0000 (11:45 -0500)]
Merge pull request #22470 from eileenmcnaughton/isAdmin
Smarty notice fix on Email help
Eileen McNaughton [Mon, 17 Jan 2022 08:56:34 +0000 (21:56 +1300)]
Merge pull request #22536 from eileenmcnaughton/regen
Re-run regen
Eileen McNaughton [Mon, 17 Jan 2022 08:56:15 +0000 (21:56 +1300)]
Merge pull request #22535 from eileenmcnaughton/style
Fixes to spaces from phpcs
Eileen McNaughton [Mon, 17 Jan 2022 05:57:33 +0000 (18:57 +1300)]
Re-run regen
Eileen McNaughton [Mon, 17 Jan 2022 05:51:39 +0000 (18:51 +1300)]
Fixes to spaces from phpcs
Eileen McNaughton [Mon, 17 Jan 2022 05:42:46 +0000 (18:42 +1300)]
Remove some old scripts
Eileen McNaughton [Mon, 17 Jan 2022 05:34:16 +0000 (18:34 +1300)]
Merge pull request #22531 from seamuslee001/example_regenerate
[NFC] Update test example template and regenerate examples
Eileen McNaughton [Mon, 17 Jan 2022 05:29:23 +0000 (18:29 +1300)]
More comments & style fixes
This is mostly generated by code sniffer but I also added the deprecation to the isEnvironment function
as I wound up having to do cleanup on something never called....
demeritcowboy [Mon, 17 Jan 2022 03:24:44 +0000 (22:24 -0500)]
Merge pull request #22530 from eileenmcnaughton/category
Remove category from case activity template
Seamus Lee [Mon, 17 Jan 2022 02:47:39 +0000 (13:47 +1100)]
[NFC] Update test example template and regenerate examples
Eileen McNaughton [Mon, 17 Jan 2022 01:22:11 +0000 (14:22 +1300)]
Merge pull request #22527 from eileenmcnaughton/phpcs2
Run stricter phpcs on Civi dir
Eileen McNaughton [Mon, 17 Jan 2022 00:20:08 +0000 (13:20 +1300)]
Remove category from case activity template
Seamus Lee [Sun, 16 Jan 2022 23:53:53 +0000 (10:53 +1100)]
Merge pull request #22528 from eileenmcnaughton/phpcs3
Run 'full drupal strictness' standard over api/v3/examples
Eileen McNaughton [Sun, 16 Jan 2022 23:47:26 +0000 (12:47 +1300)]
Merge pull request #22444 from eileenmcnaughton/isform
Remove empty check
Seamus Lee [Sun, 16 Jan 2022 23:13:06 +0000 (10:13 +1100)]
Merge pull request #22517 from eileenmcnaughton/skip
Move deprecated function back to the only class that calls it
Eileen McNaughton [Sun, 16 Jan 2022 22:50:42 +0000 (11:50 +1300)]
Merge pull request #22526 from eileenmcnaughton/phpcs
Fix php comments
Eileen McNaughton [Sun, 16 Jan 2022 22:30:52 +0000 (11:30 +1300)]
PHPCS standards on css....
I ran phpcbf over our code base & it made these changes to the css - I guess the
standard must prefer them....
Eileen McNaughton [Sun, 16 Jan 2022 22:27:35 +0000 (11:27 +1300)]
Run 'full drupal strictness' standard over api/v3/examples
I just removed all the rules we weren't enforcing cos too-hard from
our drupal code standard & ran phpcbf over the directory. I figure
we aren't really updating these so getting them to what strict phpcs will
tolerate could save time when we next tighten the noose
and if someone ever regenerates them
they can deal with re-running it or improving the tpl
Seamus Lee [Sun, 16 Jan 2022 22:24:27 +0000 (09:24 +1100)]
Merge pull request #22482 from eileenmcnaughton/token
Add unit test on updateGreeting & remove deprecated fn call
Eileen McNaughton [Sun, 16 Jan 2022 22:21:51 +0000 (11:21 +1300)]
Run stricter phpcs on Civi dir
Eileen McNaughton [Sun, 16 Jan 2022 21:57:46 +0000 (10:57 +1300)]
Merge pull request #22520 from colemanw/contactTypeCleanup
[REF] - Use CRM_Contact_BAO_ContactType::basicTypes()
Eileen McNaughton [Mon, 10 Jan 2022 01:19:31 +0000 (14:19 +1300)]
Remove empty check
We had to ensure this was always assigned for default modifier so remove the
empty to make it clear it is 'sorted'
Eileen McNaughton [Sun, 16 Jan 2022 21:29:09 +0000 (10:29 +1300)]
Fix php comments
As per https://github.com/civicrm/civicrm-core/pull/22515
Eileen McNaughton [Sun, 16 Jan 2022 21:22:05 +0000 (10:22 +1300)]
Merge pull request #22524 from braders/contacttype-types
[NFC] Fixes to the type definitions for contactType methods
colemanw [Sun, 16 Jan 2022 17:37:31 +0000 (12:37 -0500)]
Merge pull request #22525 from braders/remove-charts-colours
[Ref] Remove unused _colours property
colemanw [Sun, 16 Jan 2022 17:31:26 +0000 (12:31 -0500)]
Merge pull request #22522 from braders/phpdoc-fixes-2
Another set of PHPDoc fixes
colemanw [Sun, 16 Jan 2022 17:28:52 +0000 (12:28 -0500)]
Merge pull request #22521 from braders/phpdoc-links
Fix more phpdoc comments in member links functions
Coleman Watts [Sun, 16 Jan 2022 04:23:27 +0000 (23:23 -0500)]
REF - Use CRM_Contact_BAO_ContactType::basicTypes() instead of hardcoded lists
demeritcowboy [Sun, 16 Jan 2022 14:52:39 +0000 (09:52 -0500)]
Merge pull request #22518 from colemanw/cleanupBadCode
Remove unreachable, nonsensical code
demeritcowboy [Sun, 16 Jan 2022 14:38:05 +0000 (09:38 -0500)]
Merge pull request #22515 from eileenmcnaughton/phpcs
Fix php comments
demeritcowboy [Sun, 16 Jan 2022 14:30:48 +0000 (09:30 -0500)]
Merge pull request #22442 from demeritcowboy/tests-22429
Unit tests for 22429 and apply same treatment to other money format functions
Bradley Taylor [Sun, 16 Jan 2022 13:59:07 +0000 (13:59 +0000)]
[Ref] Remove unused _colours property
Bradley Taylor [Sun, 16 Jan 2022 13:42:05 +0000 (13:42 +0000)]
[NFC] Fixes to the type definitions for contactType methods
Bradley Taylor [Sun, 16 Jan 2022 12:00:50 +0000 (12:00 +0000)]
Another set of PHPDoc fixes
Bradley Taylor [Sun, 16 Jan 2022 11:08:04 +0000 (11:08 +0000)]
Fix more phpdoc comments in member links functions
Eileen McNaughton [Sat, 15 Jan 2022 19:24:37 +0000 (08:24 +1300)]
Fix php comments
This commit contains 14 files worth of changes from the following steps
1) install https://github.com/civicrm/coder.git
2) comment out <rule ref=Drupal.Commenting.FunctionComment.IncorrectParamVarName><severity>0</severity></rule>
3) run phpcbf --standard=Drupal
This follows on from efforts from @braders - there are not many
instances (although I kept the comment small) and we could fairly easily get rid of them
all and enable that rule in CI - which would lift the bar a little
colemanw [Sun, 16 Jan 2022 02:30:55 +0000 (21:30 -0500)]
Merge pull request #22497 from eileenmcnaughton/mem_ids
Test cleanup - remove direct calls to BAO_Membership::add
Eileen McNaughton [Sat, 15 Jan 2022 19:44:14 +0000 (08:44 +1300)]
Move deprecated function back to the only class that calls it
This function is only called from the importer (in core) - copy back there & noisily
deprecate (one known extension usage).
Note that I removed 2 parts of it in the copy back that are unreachable
as only specific params are passed in we know they don't include
case & always include skipRecent
https://github.com/civicrm/civicrm-core/blob/
5484728757de4c85d44305a92bfa2aa35351fbce/CRM/Contact/Import/Parser/Contact.php#L880-L887
Eileen McNaughton [Sun, 16 Jan 2022 02:11:39 +0000 (15:11 +1300)]
Merge pull request #22516 from eileenmcnaughton/legacy2
Merge function back into parent function
Coleman Watts [Sat, 15 Jan 2022 20:40:37 +0000 (15:40 -0500)]
Remove unused frozen form blocks
These blocks appear to be unused because these forms are never displayed in frozen "view" mode.
If they were in use they would be broken because the urls are incorrectly output raw
instead of being properly passed to `CRM_Utils_System::url()`.
Coleman Watts [Sat, 15 Jan 2022 20:32:18 +0000 (15:32 -0500)]
Remove unreachable, nonsensical code
This block of code appears to be unreachable, because the contribution page
wizard is never frozen in "view" mode.
If it were reachable, it would do nothing sensible, as the button would link
to a completely unrelated page (configure custom data) and the link would be
broken because it is incorrectly bypassing `CRM_Utils_System::url()`.
Eileen McNaughton [Fri, 14 Jan 2022 18:41:47 +0000 (07:41 +1300)]
Merge function back into parent function
It isn't a logical separation of responsibility & doesn't reduce code
colemanw [Sat, 15 Jan 2022 17:57:18 +0000 (12:57 -0500)]
Merge pull request #22514 from braders/feature/report-statistics-docblock
Add type to phpdoc comment for report statistic function
colemanw [Sat, 15 Jan 2022 17:56:32 +0000 (12:56 -0500)]
Merge pull request #22513 from braders/phpdoc-self
Update phpdoc references to $self to include type
Bradley Taylor [Sat, 15 Jan 2022 11:29:31 +0000 (11:29 +0000)]
Add type to phpdoc comment for report statistic function
Bradley Taylor [Sat, 15 Jan 2022 11:21:09 +0000 (11:21 +0000)]
Update phpdoc references to $self to include type
Seamus Lee [Sat, 15 Jan 2022 04:03:00 +0000 (15:03 +1100)]
Merge pull request #22512 from colemanw/weightTest
[test] - Add test coverage for adjusting custom group weights
Coleman Watts [Sat, 15 Jan 2022 00:20:01 +0000 (19:20 -0500)]
[test] - Add test coverage for adjusting custom group weights
demeritcowboy [Fri, 14 Jan 2022 23:57:49 +0000 (18:57 -0500)]
Merge pull request #22471 from eileenmcnaughton/noticesm
Enotice fixes
demeritcowboy [Fri, 14 Jan 2022 22:24:06 +0000 (17:24 -0500)]
Merge pull request #22505 from colemanw/fixSelect2Collapsible
Select2 - Fix auto-expanding collapsible optgroups for multi-selects