From e9b49d09b9784e588131846f86b94b783444e42a Mon Sep 17 00:00:00 2001
From: Eric Smith <13226-ericgsmith@users.noreply.drupalcode.org>
Date: Wed, 25 Oct 2023 18:51:49 +0000
Subject: [PATCH] #3395433 GitLab CI
---
.gitlab-ci.yml | 11 +++++++++++
composer.json | 4 +---
config/schema/purge_queuer_url.schema.yml | 2 +-
src/Form/ConfigurationForm.php | 2 +-
.../QueuerConfigFormTest.php | 4 ++--
5 files changed, 16 insertions(+), 7 deletions(-)
create mode 100644 .gitlab-ci.yml
rename tests/src/{Functional => FunctionalJavascript}/QueuerConfigFormTest.php (93%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..f145b81
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,11 @@
+# View these include files at https://git.drupalcode.org/project/gitlab_templates/
+include:
+ - project: $_GITLAB_TEMPLATES_REPO
+ ref: $_GITLAB_TEMPLATES_REF
+ file:
+ - '/includes/include.drupalci.main.yml'
+ - '/includes/include.drupalci.variables.yml'
+ - '/includes/include.drupalci.workflows.yml'
+
+variables:
+ _TARGET_CORE: "9.5.10"
diff --git a/composer.json b/composer.json
index 7e63a0a..9c0517d 100644
--- a/composer.json
+++ b/composer.json
@@ -10,9 +10,7 @@
}
],
"require": {
- "php": ">=7.2",
- "drupal/core": "^8.7.7 || ^9",
- "drupal/purge": "^3.0.0-beta9"
+ "drupal/purge": "^3.4"
},
"extra": {
"branch-alias": {
diff --git a/config/schema/purge_queuer_url.schema.yml b/config/schema/purge_queuer_url.schema.yml
index 5a41c4c..d499d4b 100644
--- a/config/schema/purge_queuer_url.schema.yml
+++ b/config/schema/purge_queuer_url.schema.yml
@@ -1,4 +1,4 @@
- # Schema for the configuration files of the purge_queuer_url module.
+# Schema for the configuration files of the purge_queuer_url module.
purge_queuer_url.settings:
type: config_object
label: 'purge_queuer_url settings.'
diff --git a/src/Form/ConfigurationForm.php b/src/Form/ConfigurationForm.php
index 3dddef2..84e5ec4 100644
--- a/src/Form/ConfigurationForm.php
+++ b/src/Form/ConfigurationForm.php
@@ -152,7 +152,7 @@ class ConfigurationForm extends QueuerConfigFormBase {
if (!isset($form['blacklist']['blacklist'][$delta])) {
$element = [
'#type' => 'textfield',
- '#default_value' => isset($blacklist[$delta]) ? $blacklist[$delta] : '',
+ '#default_value' => $blacklist[$delta] ?? '',
];
$form['blacklist']['blacklist'][$delta] = $element;
}
diff --git a/tests/src/Functional/QueuerConfigFormTest.php b/tests/src/FunctionalJavascript/QueuerConfigFormTest.php
similarity index 93%
rename from tests/src/Functional/QueuerConfigFormTest.php
rename to tests/src/FunctionalJavascript/QueuerConfigFormTest.php
index 3de2124..7819d18 100644
--- a/tests/src/Functional/QueuerConfigFormTest.php
+++ b/tests/src/FunctionalJavascript/QueuerConfigFormTest.php
@@ -1,9 +1,9 @@
<?php
-namespace Drupal\Tests\purge_queuer_url\Functional;
+namespace Drupal\Tests\purge_queuer_url\FunctionalJavascript;
use Drupal\purge_queuer_url\Form\ConfigurationForm;
-use Drupal\Tests\purge_ui\Functional\Form\Config\QueuerConfigFormTestBase;
+use Drupal\Tests\purge_ui\FunctionalJavascript\Form\Config\QueuerConfigFormTestBase;
/**
* Tests \Drupal\purge_queuer_url\Form\ConfigurationForm.
--
GitLab