Skip to content

Commit

Permalink
maybe
Browse files Browse the repository at this point in the history
  • Loading branch information
demeritcowboy committed Feb 19, 2025
1 parent a17fa85 commit f736639
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
13 changes: 3 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,6 @@ jobs:
fail-fast: false
matrix:
include:
- drupal: '10.3.*'
civicrm: '5.78.*'
php: '8.2'
- drupal: '10.3.*'
civicrm: '5.82.*'
php: '8.2'
- drupal: '10.3.*'
civicrm: '6.0.x-dev'
php: '8.2'
- drupal: '10.3.*'
civicrm: 'dev-master'
php: '8.3'
Expand Down Expand Up @@ -106,6 +97,8 @@ jobs:
run: |
cd ~/drupal
COMPOSER_MEMORY_LIMIT=-1 composer require civicrm/civicrm-asset-plugin:'~1.1' civicrm/civicrm-{core,packages,drupal-8}:${{ matrix.civicrm }} -W
cd vendor/civicrm/civicrm-core
git apply -vvv $GITHUB_WORKSPACE/patch.patch
- name: Download Webform
run: |
cd ~/drupal
Expand Down Expand Up @@ -187,7 +180,7 @@ jobs:
run: |
mkdir -p $BROWSERTEST_OUTPUT_DIRECTORY
cd ~/drupal/web
../vendor/bin/phpunit --verbose -c core modules/contrib/webform_civicrm
../vendor/bin/phpunit --verbose -c core --filter testDynamicCustomFields modules/contrib/webform_civicrm/tests/src/FunctionalJavascript/CustomFieldSubmissionTest.php
env:
SYMFONY_DEPRECATIONS_HELPER: 999999
SIMPLETEST_DB: mysql://root:@127.0.0.1:${{ job.services.mysql.ports[3306] }}/db
Expand Down
13 changes: 13 additions & 0 deletions patch.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index e114d48145..88b6716c05 100644
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -2938,7 +2938,7 @@ SELECT contact_id
}
// Legacy handling for hook-based fields from `fields_callback`
if (!$entity->getField($fieldName)) {
- return CRM_Core_PseudoConstant::get(static::class, $fieldName, [], $context);
+ return CRM_Core_PseudoConstant::get(static::class, $fieldName, [], $context) ?: NULL;
}
$checkPermissions = (bool) ($values['check_permissions'] ?? ($context == 'create' || $context == 'search'));
$includeDisabled = ($context == 'validate' || $context == 'get');

0 comments on commit f736639

Please sign in to comment.