From 1f5f68386c502ee9450cef6e1ad04d28aedf25a1 Mon Sep 17 00:00:00 2001
From: Oleh Vehera <44159-voleger@users.noreply.drupalcode.org>
Date: Wed, 9 Oct 2024 09:50:22 +0000
Subject: [PATCH] Issue #3479580 by voleger: Update .gitlab-ci.yml template
---
.gitlab-ci.yml | 102 +++---------------
README.md | 3 +
src/Queue/QueueWorkerManager.php | 2 +-
.../src/Kernel/DefinitionsWithModuleTest.php | 2 +-
.../Kernel/DefinitionsWithoutModuleTest.php | 2 +-
5 files changed, 23 insertions(+), 88 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e73eecb..e5384a8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,97 +1,29 @@
################
-# DrupalCI GitLabCI template
+# GitLabCI template for Drupal projects.
#
-# Gitlab-ci.yml to replicate DrupalCI testing for Contrib
-#
-# With thanks to:
-# * The GitLab Acceleration Initiative participants
-# * DrupalSpoons
-################
-
-################
-# Guidelines
-#
-# This template is designed to give any Contrib maintainer everything they need to test, without requiring modification. It is also designed to keep up to date with Core Development automatically through the use of include files that can be centrally maintained.
-#
-# However, you can modify this template if you have additional needs for your project.
-################
-
-################
-# 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
+# This template is designed to give any Contrib maintainer everything they need to test, without requiring modification.
+# It is also designed to keep up to date with Core Development automatically through the use of include files that can be centrally maintained.
+# As long as you include the project, ref and three files below, any future updates added by the Drupal Association will be used in your
+# pipelines automatically. However, you can modify this template if you have additional needs for your project.
+# The full documentation is on https://project.pages.drupalcode.org/gitlab_templates/
################
-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/
- ################
+# For information on alternative values for 'ref' see https://project.pages.drupalcode.org/gitlab_templates/info/templates-version/
+# To test a Drupal 7 project, change the first include filename from .main.yml to .main-d7.yml
+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'
+ - "/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/1.0.x/includes/include.drupalci.variables.yml
+# Pipeline configuration variables are defined with default values and descriptions in the file
+# https://git.drupalcode.org/project/gitlab_templates/-/blob/main/includes/include.drupalci.variables.yml
+# Uncomment the lines below if you want to override any of the variables. The following is just an example.
################
# variables:
# SKIP_ESLINT: '1'
-
-
-###################################################################################
-#
-# *
-# /(
-# ((((,
-# /(((((((
-# ((((((((((*
-# ,(((((((((((((((
-# ,(((((((((((((((((((
-# ((((((((((((((((((((((((*
-# *(((((((((((((((((((((((((((((
-# ((((((((((((((((((((((((((((((((((*
-# *(((((((((((((((((( .((((((((((((((((((
-# ((((((((((((((((((. /(((((((((((((((((*
-# /((((((((((((((((( .(((((((((((((((((,
-# ,(((((((((((((((((( ((((((((((((((((((
-# .(((((((((((((((((((( .(((((((((((((((((
-# ((((((((((((((((((((((( ((((((((((((((((/
-# (((((((((((((((((((((((((((/ ,(((((((((((((((*
-# .((((((((((((((/ /(((((((((((((. ,(((((((((((((((
-# *(((((((((((((( ,(((((((((((((/ *((((((((((((((.
-# ((((((((((((((, /(((((((((((((. ((((((((((((((,
-# (((((((((((((/ ,(((((((((((((* ,(((((((((((((,
-# *((((((((((((( .((((((((((((((( ,(((((((((((((
-# ((((((((((((/ /((((((((((((((((((. ,((((((((((((/
-# ((((((((((((( *(((((((((((((((((((((((* *((((((((((((
-# ((((((((((((( ,(((((((((((((..((((((((((((( *((((((((((((
-# ((((((((((((, /((((((((((((* /((((((((((((/ ((((((((((((
-# ((((((((((((( /((((((((((((/ (((((((((((((* ((((((((((((
-# (((((((((((((/ /(((((((((((( ,((((((((((((, *((((((((((((
-# (((((((((((((( *(((((((((((/ *((((((((((((. ((((((((((((/
-# *((((((((((((((((((((((((((, /(((((((((((((((((((((((((
-# ((((((((((((((((((((((((( ((((((((((((((((((((((((,
-# .(((((((((((((((((((((((/ ,(((((((((((((((((((((((
-# ((((((((((((((((((((((/ ,(((((((((((((((((((((/
-# *((((((((((((((((((((( (((((((((((((((((((((,
-# ,(((((((((((((((((((((, ((((((((((((((((((((/
-# ,(((((((((((((((((((((* /((((((((((((((((((((
-# ((((((((((((((((((((((, ,/((((((((((((((((((((,
-# ,(((((((((((((((((((((((((((((((((((((((((((((((((((
-# .(((((((((((((((((((((((((((((((((((((((((((((
-# .((((((((((((((((((((((((((((((((((((,.
-# .,(((((((((((((((((((((((((.
-#
-###################################################################################
+# OPT_IN_TEST_NEXT_MAJOR: '1'
+# _CURL_TEMPLATES_REF: 'main'
diff --git a/README.md b/README.md
index 16d2d8d..4c1dd2a 100644
--- a/README.md
+++ b/README.md
@@ -64,12 +64,15 @@ for development needs.
MAINTAINERS
-----------
+[//]: # "cspell:disable-next-line"
* Oleh Vehera (voleger) - https://www.drupal.org/u/voleger
Supporting organization:
+[//]: # "cspell:disable-next-line"
* GOLEMS GABB - https://www.drupal.org/golems-gabb
+[//]: # "cspell:disable-next-line"
GOLEMS GABB is a team of experienced developers!
Our work includes strategy, design, and development
across a variety of industries.
diff --git a/src/Queue/QueueWorkerManager.php b/src/Queue/QueueWorkerManager.php
index d273db5..de32ea5 100644
--- a/src/Queue/QueueWorkerManager.php
+++ b/src/Queue/QueueWorkerManager.php
@@ -26,7 +26,7 @@ class QueueWorkerManager implements QueueWorkerManagerInterface, CachedDiscovery
*/
public function __construct(
protected QueueWorkerManagerInterface $subject,
- protected ConfigFactoryInterface $config
+ protected ConfigFactoryInterface $config,
) {}
/**
diff --git a/tests/src/Kernel/DefinitionsWithModuleTest.php b/tests/src/Kernel/DefinitionsWithModuleTest.php
index d7eb6d7..475fb4e 100644
--- a/tests/src/Kernel/DefinitionsWithModuleTest.php
+++ b/tests/src/Kernel/DefinitionsWithModuleTest.php
@@ -37,7 +37,7 @@ class DefinitionsWithModuleTest extends DefinitionsWithoutModuleTest {
/**
* Test is functionality force creation of `cron` key.
*/
- public function testCronKeyExistance() {
+ public function testCronKeyExistence() {
$definition = $this->queueWorkerManager
->getDefinition('queue_order_worker_B');
$this->assertArrayNotHasKey('cron', $definition);
diff --git a/tests/src/Kernel/DefinitionsWithoutModuleTest.php b/tests/src/Kernel/DefinitionsWithoutModuleTest.php
index a07786a..2575490 100644
--- a/tests/src/Kernel/DefinitionsWithoutModuleTest.php
+++ b/tests/src/Kernel/DefinitionsWithoutModuleTest.php
@@ -7,7 +7,7 @@ use Drupal\KernelTests\KernelTestBase;
/**
* Class DefinitionsWithoutModuleTest.
*
- * Tests comnpatibility with Drupal functionality.
+ * Tests compatibility with Drupal functionality.
*
* @package Drupal\queue_order\Tests\Kernel
*
--
GitLab