diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..b9f8021298343f024796358e9204b652be345fad --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,39 @@ +################ +# Includes +# +# Additional configuration can be provided through includes. +# One advantage of include files is that if they are updated upstream, the changes affect all pipelines using that include. +# +# Includes can be overridden by re-declaring anything provided in an include, here in gitlab-ci.yml +# https://docs.gitlab.com/ee/ci/yaml/includes.html#override-included-configuration-values +################ + +include: + ################ + # DrupalCI includes: + # As long as you include this, any future includes added by the Drupal Association will be accessible to your pipelines automatically. + # View these include files at https://git.drupalcode.org/project/gitlab_templates/ + ################ + - project: $_GITLAB_TEMPLATES_REPO + ref: $_GITLAB_TEMPLATES_REF + file: + - '/includes/include.drupalci.main.yml' + - '/includes/include.drupalci.variables.yml' + - '/includes/include.drupalci.workflows.yml' + +################ +# Pipeline configuration variables +# +# These are the variables provided to the Run Pipeline form that a user may want to override. +# +# Docs at https://git.drupalcode.org/project/gitlab_templates/-/blob/main/includes/include.drupalci.variables.yml +################ +variables: + # Broaden test coverage. + _SHOW_ENVIRONMENT_VARIABLES: 1 + _PHPUNIT_CONCURRENT: 1 + OPT_IN_TEST_CURRENT: 0 + OPT_IN_TEST_PREVIOUS_MAJOR: 1 + OPT_IN_TEST_PREVIOUS_MINOR: 0 + OPT_IN_TEST_NEXT_MINOR: 0 + OPT_IN_TEST_MAX_PHP: 0 diff --git a/composer.json b/composer.json index a2be9413a655591b47772f977c98f4cdb6869fa5..d23d55a245dcf8c6884bd46a0385b34b35a175d6 100644 --- a/composer.json +++ b/composer.json @@ -4,10 +4,6 @@ "homepage": "https://www.drupal.org/project/datetime_range_timezone", "type": "drupal-module", "license": "GPL-2.0+", - "require": { - "php": ">=7.4", - "drupal/core": "^9.2 || ^10" - }, "require-dev": { "drupal/token": "^1.10" } diff --git a/datetime_range_timezone.info.yml b/datetime_range_timezone.info.yml index 28bf9e2d5084134156b34f21f744e0b27f5dddb9..256a4e7f23e50752f8bcf6a352f614fe6ea58a7c 100644 --- a/datetime_range_timezone.info.yml +++ b/datetime_range_timezone.info.yml @@ -3,6 +3,5 @@ type: module description: 'Provides a new field type and widget to allow a user defined timezone when entering date ranges.' package: Date core_version_requirement: ^8 || ^9 || ^10 - dependencies: - drupal:datetime_range diff --git a/datetime_range_timezone.tokens.inc b/datetime_range_timezone.tokens.inc index 0aa92369bc57d3eadbefd52fbf81893cbde1dcda..723164656cb023ce6694d826ce8b5848b79e799d 100644 --- a/datetime_range_timezone.tokens.inc +++ b/datetime_range_timezone.tokens.inc @@ -19,7 +19,7 @@ use Drupal\field\FieldStorageConfigInterface; * fields that are type of daterange_timezone. */ function datetime_range_timezone_token_info_alter(&$info) { - // Attach field tokens to their respecitve entity tokens. + // Attach field tokens to their respective entity tokens. foreach (\Drupal::entityTypeManager()->getDefinitions() as $entity_type_id => $entity_type) { if (!$entity_type->entityClassImplements(ContentEntityInterface::class)) { continue; diff --git a/templates/datetime-range-timezone.html.twig b/templates/datetime-range-timezone.html.twig index e9c6e519154e624fbfdd2ad259bee8f6caf54ce7..0432c857dfee55196fd5bffa0c4571497f2463e4 100644 --- a/templates/datetime-range-timezone.html.twig +++ b/templates/datetime-range-timezone.html.twig @@ -10,7 +10,7 @@ <span class='daterange__date daterange__start-date'><time datetime="{{ iso_start_date }}">{{ start_date }}</time></span> {% if separator is not empty %} - <span class='daterange__separtor'>{{ separator }}</span> + <span class='daterange__separator'>{{ separator }}</span> {% endif %} {% if end_date is not empty %}