Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dev/core#4959 - Handle extra whitespace in scheduled job params #29296

Merged
merged 1 commit into from
Feb 7, 2024

Conversation

colemanw
Copy link
Member

@colemanw colemanw commented Feb 7, 2024

Overview

Fixes https://lab.civicrm.org/dev/core/-/issues/4959

Before

Extra newlines in scheduled job parameters (textarea) cause errors.

After

No errors.

Technical Details

This regressed with ebe5df9

Copy link

civibot bot commented Feb 7, 2024

🤖 Thank you for contributing to CiviCRM! ❤️ We will need to test and review this PR. 👷

Introduction for new contributors...
  • If this is your first PR, an admin will greenlight automated testing with the command ok to test or add to whitelist.
  • A series of tests will automatically run. You can see the results at the bottom of this page (if there are any problems, it will include a link to see what went wrong).
  • A demo site will be built where anyone can try out a version of CiviCRM that includes your changes.
  • If this process needs to be repeated, an admin will issue the command test this please to rerun tests and build a new demo site.
  • Before this PR can be merged, it needs to be reviewed. Please keep in mind that reviewers are volunteers, and their response time can vary from a few hours to a few weeks depending on their availability and their knowledge of this particular part of CiviCRM.
  • A great way to speed up this process is to "trade reviews" with someone - find an open PR that you feel able to review, and leave a comment like "I'm reviewing this now, could you please review mine?" (include a link to yours). You don't have to wait for a response to get started (and you don't have to stop at one!) the more you review, the faster this process goes for everyone 😄
  • To ensure that you are credited properly in the final release notes, please add yourself to contributor-key.yml
  • For more information about contributing, see CONTRIBUTING.md.
Quick links for reviewers...

➡️ Online demo of this PR 🔗

@civibot civibot bot added the 5.70 label Feb 7, 2024
@eileenmcnaughton
Copy link
Contributor

@colemanw CRM_Core_JobManagerTest::testHookCron
trim(): Passing null to parameter #1 ($string) of type string is deprecated

/home/homer/buildkit/build/build-0/web/sites/all/modules/civicrm/CRM/Core/BAO/Job.php:129
/home/homer/buildkit/build/build-0/web/sites/all/modules/civicrm/CRM/Core/ScheduledJob.php:142
/home/homer/buildkit/build/build-0/web/sites/all/modules/civicrm/CRM/Core/JobManager.php:158
/home/homer/buildkit/build/build-0/web/sites/all/modules/civicrm/CRM/Core/JobManager.php:43
/home/homer/buildkit/build/build-0/web/sites/all/modules/civicrm/tests/phpunit/CRM/Core/JobManagerTest.php:27
/home/homer/buildkit/build/build-0/web/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviUnitTestCase.php:247
/home/homer/buildkit/extern/phpunit9/phpunit9.phar:2307

@eileenmcnaughton eileenmcnaughton merged commit 3d85ef4 into civicrm:5.70 Feb 7, 2024
3 checks passed
@eileenmcnaughton eileenmcnaughton deleted the jobParams branch February 7, 2024 21:26
@eileenmcnaughton
Copy link
Contributor

@colemanw do we have a back port here?

@colemanw
Copy link
Member Author

colemanw commented Feb 7, 2024

@eileenmcnaughton I was kinda hoping @jmcclelland would verify this fixes the issue before we had to release it but it certainly isn't going to hurt anything so it's fine that you merged. At worst it will do nothing.

@colemanw
Copy link
Member Author

colemanw commented Feb 7, 2024

Anyway here is a backport ^

@eileenmcnaughton eileenmcnaughton deleted the jobParams branch February 7, 2024 22:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants