Skip to content
Snippets Groups Projects
Commit dc3957e8 authored by Jonathan Smith's avatar Jonathan Smith
Browse files

#3451750 Change plugin to entity_target_id [1.x]

parent b0ae6fe5
No related branches found
No related tags found
1 merge request!166#3451750 Change plugin to entity_target_id [1.x]
Pipeline #252502 passed
......@@ -106,10 +106,7 @@ composer (next minor):
composer (next major):
rules:
- !reference [ .opt-in-next-major-rule ]
- when: manual
allow_failure: true
variables:
_LENIENT_ALLOW_LIST: devel,devel_generate,rules,commerce,entity,address,state_machine,entity_reference_revisions,profile,inline_entity_form,token,workbench_moderation,workbench_moderation_actions
- *manual-if-not-mr-rule
composer (drupal 8):
extends: .composer-base
......@@ -173,6 +170,9 @@ phpunit:
export _PHPUNIT_CONCURRENT=1
fi
fi
# Patch to disable strict config schema validation on older versions of core.
# See https://www.drupal.org/project/scheduler/issues/3451750
- if [[ $DRUPAL_CORE =~ ^(8.9|9.5|10.2) ]]; then patch -p1 --verbose < tests/3451750-strict-config-schema.patch; fi
- echo "End of before_script _PHPUNIT_CONCURRENT=$_PHPUNIT_CONCURRENT _PHPUNIT_EXTRA=$_PHPUNIT_EXTRA"
phpunit (next minor):
......
......@@ -1090,7 +1090,8 @@ display:
not: false
entity_type: node
entity_field: uid
plugin_id: numeric
plugin_id: entity_target_id
target_entity_type_id: user
empty:
area_text_custom:
id: area_text_custom
......
diff --git a/tests/src/Functional/SchedulerBrowserTestBase.php b/tests/src/Functional/SchedulerBrowserTestBase.php
index c4c3ed1..8b1fb84 100644
--- a/tests/src/Functional/SchedulerBrowserTestBase.php
+++ b/tests/src/Functional/SchedulerBrowserTestBase.php
@@ -33,6 +33,21 @@ abstract class SchedulerBrowserTestBase extends BrowserTestBase {
*/
protected $defaultTheme = 'stark';
+ /**
+ * Strict schema checking.
+ *
+ * The EntityReferenceArgument `entity_target_id` views argument plugin was
+ * introduced in Drupal 10.3 but not back-ported. This throws a schema error
+ * in earlier versions during tests (but not in actual live sites) so we need
+ * to remove the schema validation for versions earlier than 10.3.
+ *
+ * @var bool
+ *
+ * @see https://www.drupal.org/project/drupal/issues/2640994
+ * @see https://www.drupal.org/project/scheduler/issues/3451750
+ */
+ protected $strictConfigSchema = FALSE;
+
/**
* {@inheritdoc}
*/
diff --git a/tests/src/FunctionalJavascript/SchedulerJavascriptTestBase.php b/tests/src/FunctionalJavascript/SchedulerJavascriptTestBase.php
index f4f86b2..d1662a8 100644
--- a/tests/src/FunctionalJavascript/SchedulerJavascriptTestBase.php
+++ b/tests/src/FunctionalJavascript/SchedulerJavascriptTestBase.php
@@ -38,6 +38,21 @@ abstract class SchedulerJavascriptTestBase extends WebDriverTestBase {
*/
protected $defaultTheme = 'claro';
+ /**
+ * Strict schema checking.
+ *
+ * The EntityReferenceArgument `entity_target_id` views argument plugin was
+ * introduced in Drupal 10.3 but not back-ported. This throws a schema error
+ * in earlier versions during tests (but not in actual live sites) so we need
+ * to remove the schema validation for versions earlier than 10.3.
+ *
+ * @var bool
+ *
+ * @see https://www.drupal.org/project/drupal/issues/2640994
+ * @see https://www.drupal.org/project/scheduler/issues/3451750
+ */
+ protected $strictConfigSchema = FALSE;
+
/**
* {@inheritdoc}
*/
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment