From 2ffd0e74a82628a52b4756eee8d978faa1b18e67 Mon Sep 17 00:00:00 2001
From: Mohammed Nassar <msh.nassar@gmail.com>
Date: Fri, 31 Jan 2025 15:59:42 +0000
Subject: [PATCH 1/4] ISSUE-3503634: Remove php and drupal core from composer.
---
composer.json | 4 ----
1 file changed, 4 deletions(-)
diff --git a/composer.json b/composer.json
index a2be941..d23d55a 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"
}
--
GitLab
From 5fe3d7c64af850d7c70f6352a259220bb62360c0 Mon Sep 17 00:00:00 2001
From: Mohammed Nassar <msh.nassar@gmail.com>
Date: Fri, 31 Jan 2025 16:00:40 +0000
Subject: [PATCH 2/4] ISSUE-3503634: Remove empty line.
---
datetime_range_timezone.info.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/datetime_range_timezone.info.yml b/datetime_range_timezone.info.yml
index 28bf9e2..256a4e7 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
--
GitLab
From fadd98cdbe2abaaa6b856562f36a6ed2cf5736e6 Mon Sep 17 00:00:00 2001
From: Mohammed Nassar <msh.nassar@gmail.com>
Date: Fri, 31 Jan 2025 16:01:42 +0000
Subject: [PATCH 3/4] ISSUE-3503634: Add gitlab ci for D10.
---
.gitlab-ci.yml | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
create mode 100644 .gitlab-ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..b9f8021
--- /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
--
GitLab
From 1bfcff9bdd8ab982d81ce585ad250847b93d2577 Mon Sep 17 00:00:00 2001
From: Mohammed Nassar <msh.nassar@gmail.com>
Date: Fri, 31 Jan 2025 16:12:08 +0000
Subject: [PATCH 4/4] ISSUE-3503634: Fix typos.
---
datetime_range_timezone.tokens.inc | 2 +-
templates/datetime-range-timezone.html.twig | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/datetime_range_timezone.tokens.inc b/datetime_range_timezone.tokens.inc
index 0aa9236..7231646 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 e9c6e51..0432c85 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 %}
--
GitLab