Seamus Lee [Thu, 30 May 2019 22:52:09 +0000 (08:52 +1000)]
Update test files to use PHPUnit6 notiation for classes
Update for phpunit5 compatability
Add in old catch to see if we get tests to pass
Fix Report Form Test case
Fix last remaining test issues
Eileen McNaughton [Sat, 1 Jun 2019 04:02:02 +0000 (16:02 +1200)]
Merge pull request #14392 from totten/master-test-exts
CRM_Extension_System - Only allow `test.*` extensions during headless testing. Hide from regular users.
colemanw [Sat, 1 Jun 2019 01:41:02 +0000 (21:41 -0400)]
Merge pull request #14384 from samuelsov/CRM-15375-next
Wysiwyg support for i18n event fields
Tim Otten [Sat, 1 Jun 2019 00:11:26 +0000 (17:11 -0700)]
CRM_Extension_System - Only handle `test.*` extensions on headless test sites
The headless test suite includes integration tests for correct handling of
the extension installation/removal process. This involves some
dummy extensions. Unfortunately, the dummy extensions are often picked up on
live deployments -- where they're a bit distracting/annoying.
Before
------
The `test.*` dummy extensions appear as available in all environments,
including headless tests and live sites.
After
-----
The `test.*` dummy extensions are only available in the headless test
environment.
Tim Otten [Sat, 1 Jun 2019 00:03:50 +0000 (17:03 -0700)]
CRM_Extension_Container_Basic - Add mechanism for filtering
This function allows one to filter down the list of extensions which are visible.
A few notes:
* The result of the scanning/filtering is stored in cache. On a typical
page-load, the system uses this cache -- which happily means that
filtering shouldn't result in any extra page-load time.
* The extension-system is generally boot-critical. I could imagine some
scope-creep around making making the filter mechanism hookable, but that's
a separate+complicated issue. Optimistically... if `array $containers`
somehow becomes hookable, then one could use the same mechanism to
manipulate the filters.
Seamus Lee [Thu, 30 May 2019 22:59:19 +0000 (08:59 +1000)]
Merge pull request #14385 from seamuslee001/master
[NFC] Update package-lock and civicrm_generated to fix langague issues
Seamus Lee [Thu, 30 May 2019 22:17:17 +0000 (08:17 +1000)]
Merge pull request #14333 from eileenmcnaughton/phpunit
dev/core#980 [phpunit test] update phpunit extends class to support later versions
Eileen McNaughton [Thu, 30 May 2019 22:13:22 +0000 (10:13 +1200)]
Merge pull request #14377 from eileenmcnaughton/fin_batch
dev/financial#59 Fix unreleased regression on batch form
Eileen McNaughton [Thu, 30 May 2019 21:31:27 +0000 (09:31 +1200)]
Merge pull request #14325 from eileenmcnaughton/merge_cust_field
dev/core#723 Fix fatal error when trying to merge contacts with a cus…
Seamus Lee [Thu, 30 May 2019 21:31:20 +0000 (07:31 +1000)]
[NFC] Update package-lock and civicrm_generated to fix langague issues
Samuel Vanhove [Thu, 30 May 2019 18:30:35 +0000 (14:30 -0400)]
Wysiwyg support for i18n event fields
Mathieu Lu [Thu, 30 May 2019 12:08:29 +0000 (08:08 -0400)]
Merge pull request #14376 from eileenmcnaughton/location_form
dev/core#994 remove Thousands Separator can not have more than 1 character rule
Seamus Lee [Thu, 30 May 2019 05:48:19 +0000 (15:48 +1000)]
Merge pull request #14383 from civicrm/5.14
5.14
Seamus Lee [Thu, 30 May 2019 04:22:30 +0000 (14:22 +1000)]
Merge pull request #14382 from seamuslee001/5_13_5_release_notes
5.14 version of 5.13.5 Release notes
Tim Otten [Thu, 30 May 2019 03:45:42 +0000 (20:45 -0700)]
Update 5.13.5.md
Tim Otten [Thu, 30 May 2019 03:42:43 +0000 (20:42 -0700)]
Update 5.13.5.md
Seamus Lee [Thu, 30 May 2019 02:35:53 +0000 (12:35 +1000)]
Add in 5.13.5 Release notes
Eileen McNaughton [Thu, 30 May 2019 02:25:03 +0000 (14:25 +1200)]
Merge pull request #14380 from civicrm/5.14
5.14
Eileen McNaughton [Thu, 30 May 2019 02:12:54 +0000 (14:12 +1200)]
Merge pull request #14378 from seamuslee001/dev_core_969
Update bower.json to target fixed jquery branch for dev/core#969
Seamus Lee [Thu, 30 May 2019 02:07:11 +0000 (12:07 +1000)]
Update bower.json to target fixed jquery branch for dev/core#969
Eileen McNaughton [Wed, 29 May 2019 23:30:15 +0000 (11:30 +1200)]
Merge pull request #14368 from seamuslee001/dev_core_996
dev/core996 Ensure that the oldest created_date is retained no matter…
eileen [Wed, 29 May 2019 23:05:54 +0000 (11:05 +1200)]
dev/financial#59 Fix unreleased regression on batch form
I think changing to use the search form as the parent makes sense here. Relying on the parent without including
it feels like a recipe for trouble
eileen [Wed, 29 May 2019 22:27:38 +0000 (10:27 +1200)]
dev/core#994 remove Thousands Separator can not have more than 1 character rule
Per issue it seems unnecessarily opinionated to block longer strings & we not know of at least one case where it is inappropriate
Eileen McNaughton [Wed, 29 May 2019 19:24:49 +0000 (07:24 +1200)]
Merge pull request #14375 from davejenx/activity-summary-refactor
[REF] Activity Summary report - move temp table generation etc from postProcess to buildQuery, remove postProcess, don't skip in unit tests
eileen [Thu, 23 May 2019 22:22:07 +0000 (10:22 +1200)]
dev/core#723 Fix fatal error when trying to merge contacts with a custom file field
Technical comments here https://lab.civicrm.org/dev/core/issues/723#note_16231
Dave Jenkins [Wed, 29 May 2019 15:00:46 +0000 (16:00 +0100)]
Refactor CRM/Report/Form/ActivitySummary.php, removing postProcess(), moving temp table creation etc into buildQuery(). In tests/phpunit/api/v3/ReportTemplateTest.php, remove activitySummary from reportsToSkip, as tests pass after this refactoring; also rename testActivitySummary() to testActivityDetails(), as it actually tests report_id = Activity which is the activity details report.
eileen [Tue, 28 May 2019 20:26:46 +0000 (08:26 +1200)]
Activity Summary report - stop overloading from function on activity summary report
Seamus Lee [Wed, 29 May 2019 01:37:14 +0000 (11:37 +1000)]
dev/core996 Ensure that the oldest created_date is retained no matter the ids of the contacts being merged
Reduce sleep to 5
Eileen McNaughton [Wed, 29 May 2019 07:54:13 +0000 (19:54 +1200)]
Merge pull request #14371 from seamuslee001/nfc_update_civicrm_generated_data
[NFC] Update civicrm_generated data file following addition of contri…
Seamus Lee [Wed, 29 May 2019 06:20:31 +0000 (16:20 +1000)]
[NFC] Update civicrm_generated data file following addition of contribution_recur_status option group
Eileen McNaughton [Wed, 29 May 2019 05:21:58 +0000 (17:21 +1200)]
Merge pull request #14343 from eileenmcnaughton/recur_status
dev/core#905 Separate contribution_recur status_id option group from contribution option group
Seamus Lee [Wed, 29 May 2019 03:36:41 +0000 (13:36 +1000)]
Merge pull request #14369 from civicrm/5.14
5.14
Seamus Lee [Wed, 29 May 2019 02:13:42 +0000 (12:13 +1000)]
Merge pull request #14355 from seamuslee001/harden_extern_open
Validate queue_id is a positive integer before passing to the BAO
Seamus Lee [Wed, 29 May 2019 00:40:10 +0000 (10:40 +1000)]
Merge pull request #14365 from eileenmcnaughton/dedupe_move
[REF] move calculation of migrationInfo into the function that uses it
Seamus Lee [Mon, 27 May 2019 06:27:25 +0000 (16:27 +1000)]
Validate queue_id is a positive integer before passing to the BAO
Switch to using retrieveValue as per Eileen
eileen [Tue, 28 May 2019 21:23:40 +0000 (09:23 +1200)]
[REF] move calculation of migrationInfo into the function that uses it
This doesn't make a lot of sense as a passed parameter & it's better to derive it closer to where it's used.
It's also kinda silly....
Eileen McNaughton [Tue, 28 May 2019 19:56:56 +0000 (07:56 +1200)]
Merge pull request #14354 from eileenmcnaughton/cont_search
Fix inconsistent handling when searching contribution text fields
Eileen McNaughton [Tue, 28 May 2019 14:20:27 +0000 (02:20 +1200)]
Merge pull request #14098 from eileenmcnaughton/event_income
[REF] extract buildClause from CRM_Report_Form_Event_Income
Seamus Lee [Tue, 28 May 2019 05:17:21 +0000 (15:17 +1000)]
Merge pull request #14359 from seamuslee001/fix_cache_key_column
Fix name of cache key column to be all lower case rather than camel c…
Seamus Lee [Mon, 27 May 2019 22:45:33 +0000 (08:45 +1000)]
Fix name of cache key column to be all lower case rather than camel case in civicrm_prevnext_cache
Fix test failures
Eileen McNaughton [Tue, 28 May 2019 00:51:08 +0000 (12:51 +1200)]
Merge pull request #14360 from colemanw/byRef
Remove confusing pass params by ref
Coleman Watts [Mon, 27 May 2019 23:15:43 +0000 (19:15 -0400)]
Remove confusing pass params by ref
eileen [Sun, 26 May 2019 23:57:09 +0000 (11:57 +1200)]
Fix inconsistent handling when searching contribution text fields
I found that if you search on contribution source it adds wildcards & uses 'like' but with cancel_reason not
so much.
I found that for contribution_source there was field-specific hacky handling, so I converted both fields
to be metadata based and added handling for string fields on the form layer
colemanw [Mon, 27 May 2019 21:58:25 +0000 (17:58 -0400)]
Merge pull request #14298 from eileenmcnaughton/dedupe_stats
dev/core#982 add dedupe.getstatistics api
Eileen McNaughton [Mon, 27 May 2019 21:54:45 +0000 (09:54 +1200)]
Merge pull request #14358 from samuelsov/billingblockts
Translation in billingblock.tpl - dropping 'Information'
eileen [Sun, 26 May 2019 05:38:37 +0000 (17:38 +1200)]
dev/core#905 Separate contribution_recur status_id option group from contribution option group
As we did earlier for pledge status this separates out the option groups - on the basis we have different
statuses for the 2 things. In order to ensure we don't break anything existing the values
we give the new option group the exact same values as the old one>
However, I HAVE added one more value - Processing - which is intended for the period between when
a new contribution starts to be added and when it has been added. This would normally be a few seconds
but when there is an error it would be left in this state - warding off future attempts.
For new sites I have left off some statuses that I think would not be relevant - Refunded,
Partially Paid, Chargeback, Pending Refund
Eileen McNaughton [Mon, 27 May 2019 21:18:04 +0000 (09:18 +1200)]
Merge pull request #14357 from colemanw/api4Wrap
Don't apply api3 pre/post processing to api4 actions
Eileen McNaughton [Mon, 27 May 2019 21:13:07 +0000 (09:13 +1200)]
Merge pull request #14352 from eileenmcnaughton/fin_status
Fix bug where contribution status is mishandled if label is changed
Samuel Vanhove [Mon, 27 May 2019 18:17:59 +0000 (14:17 -0400)]
Translation in billingblock.tpl - dropping 'Information'
Coleman Watts [Fri, 24 May 2019 18:27:52 +0000 (14:27 -0400)]
Skip wrapping v4 api requests in a transaction
Transactions aren't a bad thing and we probably want to revisit this but
for now I'm disabling it becuase it's broken, as seen in api_v3_ActivityTest.
I think the problem is with the onApiException event not being dispatched
because api4 doesn't go through Kernel->runSafe, so transactions aren't
being rolled back when they should.
Coleman Watts [Fri, 24 May 2019 18:27:23 +0000 (14:27 -0400)]
Skip adding default api wrappers to v4 actions
Seamus Lee [Mon, 27 May 2019 08:40:42 +0000 (18:40 +1000)]
Merge pull request #14356 from civicrm/5.14
5.14
Seamus Lee [Mon, 27 May 2019 06:59:27 +0000 (16:59 +1000)]
Merge pull request #14351 from seamuslee001/ics_file
dev/core#974 Whitelist .ics extension
Seamus Lee [Mon, 20 May 2019 23:04:49 +0000 (09:04 +1000)]
Whitelist .ics file extension
Include Upgrade step and regenrate civicrm_generated file
Fix upgrade
Eileen McNaughton [Mon, 27 May 2019 04:15:37 +0000 (16:15 +1200)]
Merge pull request #14280 from seamuslee001/dev_core_975
dev/core#975 Fix url for new activity in breadcrumbs
Seamus Lee [Tue, 21 May 2019 09:11:41 +0000 (19:11 +1000)]
dev/core#975 Fix url for new activity in breadcrumbs in find activity search
eileen [Sun, 26 May 2019 22:03:06 +0000 (10:03 +1200)]
Fix bug where contribution status is mishandled if label is changed
Seamus Lee [Mon, 27 May 2019 00:01:39 +0000 (10:01 +1000)]
Merge pull request #14350 from seamuslee001/test_dev_627
dev/core#627 Extend a unit test to verify fix made by Sunil
Seamus Lee [Sun, 26 May 2019 22:42:52 +0000 (08:42 +1000)]
Merge pull request #14345 from mattwire/case_extraline
Remove duplicate line in case BAO
Seamus Lee [Sun, 26 May 2019 22:39:05 +0000 (08:39 +1000)]
Merge pull request #13374 from cividesk/dev-627
correct syntax "IS NOT NULL" to get pledge payment count
Seamus Lee [Sun, 26 May 2019 21:30:53 +0000 (07:30 +1000)]
dev/core#627 Extend a unit test to verify fix made by Sunil
Add in additional test for when no transactions have occured
Seamus Lee [Sun, 26 May 2019 21:12:25 +0000 (07:12 +1000)]
Merge pull request #14342 from eileenmcnaughton/deprecated
[REF] Remove input format function from deprecated utils to the only place that calls it
Seamus Lee [Sun, 26 May 2019 21:09:05 +0000 (07:09 +1000)]
Merge pull request #14335 from eileenmcnaughton/bao_contribution
[NFC] phpdoc cleanup
Eileen McNaughton [Sun, 26 May 2019 20:54:47 +0000 (08:54 +1200)]
Merge pull request #14332 from civicrm/colemanw-patch-1
dev/core#968 Fix javascript error on public pages
Matthew Wire [Sun, 26 May 2019 14:32:31 +0000 (15:32 +0100)]
Merge pull request #14334 from eileenmcnaughton/fin_status
[REF] extract updateFinancialAccountsOnContributionStatusChange
colemanw [Sun, 26 May 2019 12:12:25 +0000 (08:12 -0400)]
Merge pull request #14341 from eileenmcnaughton/deprecated2
Remove never-called function _civicrm_api3_deprecated_contact_check_custom_params
Matthew Wire (MJW Consulting) [Sun, 26 May 2019 11:53:03 +0000 (12:53 +0100)]
Remove duplicate line
Matthew Wire [Sun, 26 May 2019 11:03:20 +0000 (12:03 +0100)]
Merge pull request #14336 from eileenmcnaughton/pdfletter
[REF] extract isLiveMode
Seamus Lee [Sun, 26 May 2019 07:18:08 +0000 (17:18 +1000)]
Merge pull request #14344 from seamuslee001/test_tidy_up
[NFC] Further tests tidy up following removing of dbunit
Seamus Lee [Sun, 26 May 2019 05:53:28 +0000 (15:53 +1000)]
[NFC] Further tests tidy up following removing of dbunit
Eileen McNaughton [Sun, 26 May 2019 05:05:59 +0000 (17:05 +1200)]
Merge pull request #14331 from eileenmcnaughton/select
Fix fatal error when full group by mysql mode enabled & selecting contacts
Seamus Lee [Sun, 26 May 2019 03:14:45 +0000 (13:14 +1000)]
Merge pull request #14340 from eileenmcnaughton/select2
Unit test for FGB error in #14331
eileen [Sun, 26 May 2019 02:54:02 +0000 (14:54 +1200)]
Remove input format function from deprecated utils to the only place that calls it
eileen [Sun, 26 May 2019 02:56:00 +0000 (14:56 +1200)]
Remove never-called function _civicrm_api3_deprecated_contact_check_custom_params
colemanw [Sat, 25 May 2019 19:15:19 +0000 (15:15 -0400)]
dev/core#968 Fix javascript error on public pages
Checks for the existence of the toolbar item before referencing it.
eileen [Sun, 26 May 2019 01:56:16 +0000 (13:56 +1200)]
Unit test for FGB error in #14331
Eileen McNaughton [Sun, 26 May 2019 01:05:36 +0000 (13:05 +1200)]
Merge pull request #14338 from eileenmcnaughton/contact_search
[REF] use generic loadStandardSearchOptionsFromUrl
eileen [Sun, 26 May 2019 00:05:08 +0000 (12:05 +1200)]
[REF] use generic loadStandardSearchOptionsFromUrl
I picked this up as a reviewer's commit of https://github.com/civicrm/civicrm-core/pull/13651
That PR is stale but I like to pick out a bit I can get merged when closing a stale pr
Eileen McNaughton [Sat, 25 May 2019 23:56:50 +0000 (11:56 +1200)]
Merge pull request #14138 from johncronan/drupal_login_url
dev/core#898: use user.login route for D8 login URL instead of user.page
eileen [Sat, 25 May 2019 23:47:41 +0000 (11:47 +1200)]
[REF] extract isLiveMode
I'm closing https://github.com/civicrm/civicrm-core/pull/13369 as it is stale, but
I figure it makes sense to pull out this extraction from it. I think the PR then
alters the button names taken into account but I'm not seeking to fix here, just
to do the extraction
Eileen McNaughton [Sat, 25 May 2019 23:41:10 +0000 (11:41 +1200)]
Merge pull request #14158 from demeritcowboy/deny-for-real
dev/core#913 - update autogenerated .htaccess for apache 2.4
eileen [Sat, 25 May 2019 23:38:21 +0000 (11:38 +1200)]
Further phpcs mandated fixes
I removed the poorly formatted comment as it seemed out of date anyway
eileen [Sat, 25 May 2019 23:32:10 +0000 (11:32 +1200)]
[NFC] phpdoc cleanup
Fixes style elements that stricter phpcs picks up
eileen [Sat, 25 May 2019 23:18:29 +0000 (11:18 +1200)]
[REF] extract updateFinancialAccountsOnContributionStatusChange
eileen [Sat, 25 May 2019 22:50:31 +0000 (10:50 +1200)]
dev/core#980 update phpunit extends class to support later versions
Per https://engineering.facile.it/blog/eng/phpunit-upgrade-namespace/ this works with phpunit 4.8 +
Phpunit support for php versions is here https://phpunit.de/supported-versions.html
Basically we need phpunit 7 to support php 7.3 - which we should be adding to our
test suite now. It's hard to make a case that we still need to support phpunit 4.8 - let
alone versions before that - 5.7 still covers php 5.6 which we need for some of our current branches.
Unit testing on master would ideally switch up to a supported version of phpunit - 7 or 8
Seamus Lee [Sat, 25 May 2019 21:12:39 +0000 (07:12 +1000)]
Merge pull request #14328 from eileenmcnaughton/dbunit
[dbunit test] remove dbunit dependency
Matthew Wire [Sat, 25 May 2019 16:14:47 +0000 (17:14 +0100)]
Merge pull request #14292 from eileenmcnaughton/cachedtree
Reduce cache bypasses - do not bypass custom metadata cache in setGroupTree
Matthew Wire [Sat, 25 May 2019 16:11:46 +0000 (17:11 +0100)]
Merge pull request #14316 from eileenmcnaughton/membershipRenewal
Fix test / possible live error on submitting credit card renewals
Matthew Wire [Sat, 25 May 2019 16:09:17 +0000 (17:09 +0100)]
Merge pull request #14324 from eileenmcnaughton/dedupe_cleanup2
[REF] Extract function to get cached duplicate matches
Matthew Wire [Sat, 25 May 2019 16:07:59 +0000 (17:07 +0100)]
Merge pull request #14318 from eileenmcnaughton/reorg
[REF] minor code re-org
Matthew Wire [Sat, 25 May 2019 16:05:27 +0000 (17:05 +0100)]
Merge pull request #14323 from eileenmcnaughton/dao
[NFC] Docblock fixes
Matthew Wire [Sat, 25 May 2019 16:03:41 +0000 (17:03 +0100)]
Merge pull request #14329 from eileenmcnaughton/smtp
dev/core#879 SMTP help text is misleading - references the wrong admin screen
Matthew Wire [Sat, 25 May 2019 16:02:00 +0000 (17:02 +0100)]
Merge pull request #13997 from eileenmcnaughton/recur_entity
dev/core#830 Expose cancel_reason field by cleaning up the cancel template to use entity field template
eileen [Sat, 25 May 2019 08:32:54 +0000 (20:32 +1200)]
Disable full group by when selecting contacts
eileen [Sat, 25 May 2019 05:59:02 +0000 (17:59 +1200)]
[dbunit test] remove dbunit dependency
Seamus Lee [Sat, 25 May 2019 08:37:46 +0000 (18:37 +1000)]
Merge pull request #14321 from eileenmcnaughton/test_dbunit
dev/core#980 [dbunit] remove dependency on discontinued dbunit
eileen [Sat, 25 May 2019 06:34:10 +0000 (18:34 +1200)]
dev/core#879 SMTP help text is misleading - references the wrong admin screen
Eileen McNaughton [Sat, 25 May 2019 06:13:44 +0000 (18:13 +1200)]
Merge pull request #14087 from seamuslee001/npm_version_update
(NFC) Update node package versions to latest ones
Eileen McNaughton [Sat, 25 May 2019 06:05:49 +0000 (18:05 +1200)]
Merge pull request #14082 from pradpnayak/caseReport
dev/core/issues/743, Donot join relationship table when not required
eileen [Fri, 24 May 2019 21:27:18 +0000 (09:27 +1200)]
[dbunit] remove dependency on discontinued dbunit