From 70d48ee5e0ba0c82082a3c1a6afc145e6fe5ffa4 Mon Sep 17 00:00:00 2001
From: Martin Penev <martin.penev@liip.ch>
Date: Wed, 2 Apr 2025 10:32:23 +0200
Subject: [PATCH 01/10] Add support for commerce 3

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8f35d02..a8fb1c6 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
     "source": "http://cgit.drupalcode.org/graphql_commerce"
   },
   "require": {
-    "drupal/commerce": "~2.0",
+    "drupal/commerce": "~2.0 || ^3",
     "drupal/graphql_core_schema": "^1.0"
   }
 }
-- 
GitLab


From 028c487a2d429118ba07fa7b030529ef58c9066a Mon Sep 17 00:00:00 2001
From: Martin Penev <martin.penev@liip.ch>
Date: Wed, 2 Apr 2025 12:22:50 +0200
Subject: [PATCH 02/10] Add support for commerce 3

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index a8fb1c6..1aedf60 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
     "source": "http://cgit.drupalcode.org/graphql_commerce"
   },
   "require": {
-    "drupal/commerce": "~2.0 || ^3",
+    "drupal/commerce": "~2.0 || ^3.0",
     "drupal/graphql_core_schema": "^1.0"
   }
 }
-- 
GitLab


From f5f43ef7e21886e388168acda4898a85dc7f756b Mon Sep 17 00:00:00 2001
From: Martin Penev <martin.penev@liip.ch>
Date: Wed, 2 Apr 2025 13:43:49 +0200
Subject: [PATCH 03/10] Add Drupal 11 as supported version to all main and sub
 modules of graphql_commerce

---
 graphql_commerce.info.yml                                       | 2 +-
 modules/graphql_commerce_price/graphql_commerce_price.info.yml  | 2 +-
 .../graphql_commerce_promotion.info.yml                         | 2 +-
 .../graphql_commerce_registration.info.yml                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/graphql_commerce.info.yml b/graphql_commerce.info.yml
index f5b58e0..0dadd18 100644
--- a/graphql_commerce.info.yml
+++ b/graphql_commerce.info.yml
@@ -2,7 +2,7 @@ name: GraphQL Commerce
 type: module
 description: GraphQL Core for commerce modules.
 package: GraphQL
-core_version_requirement: ^9.3 || ^10
+core_version_requirement: ^9.3 || ^10 || ^11
 dependencies:
   - graphql_core_schema:graphql_core_schema
   - commerce:commerce
diff --git a/modules/graphql_commerce_price/graphql_commerce_price.info.yml b/modules/graphql_commerce_price/graphql_commerce_price.info.yml
index 901b9c9..e581bee 100644
--- a/modules/graphql_commerce_price/graphql_commerce_price.info.yml
+++ b/modules/graphql_commerce_price/graphql_commerce_price.info.yml
@@ -2,7 +2,7 @@ name: GraphQL Commerce Price
 type: module
 description: GraphQL Core Schema support for commerce_price.
 package: GraphQL
-core_version_requirement: ^9.3 || ^10
+core_version_requirement: ^9.3 || ^10 || ^11
 dependencies:
   - graphql:graphql
   - commerce:commerce
diff --git a/modules/graphql_commerce_promotion/graphql_commerce_promotion.info.yml b/modules/graphql_commerce_promotion/graphql_commerce_promotion.info.yml
index 69223f4..b6670b9 100644
--- a/modules/graphql_commerce_promotion/graphql_commerce_promotion.info.yml
+++ b/modules/graphql_commerce_promotion/graphql_commerce_promotion.info.yml
@@ -2,7 +2,7 @@ name: GraphQL Commerce Promotion
 type: module
 description: GraphQL Core Schema support for commerce_promotion.
 package: GraphQL
-core_version_requirement: ^9.3 || ^10
+core_version_requirement: ^9.3 || ^10 || ^11
 dependencies:
   - graphql:graphql
   - commerce:commerce
diff --git a/modules/graphql_commerce_registration/graphql_commerce_registration.info.yml b/modules/graphql_commerce_registration/graphql_commerce_registration.info.yml
index 4fc837d..a7163ee 100644
--- a/modules/graphql_commerce_registration/graphql_commerce_registration.info.yml
+++ b/modules/graphql_commerce_registration/graphql_commerce_registration.info.yml
@@ -2,7 +2,7 @@ name: GraphQL Commerce Registration
 type: module
 description: GraphQL Core Schema support for commerce_registration.
 package: GraphQL
-core_version_requirement: ^9.3 || ^10
+core_version_requirement: ^9.3 || ^10 || ^11
 dependencies:
   - graphql:graphql
   - commerce:commerce
-- 
GitLab


From 0a5ee38b81b8ad2b15e9184fec1fb26beddd1c4e Mon Sep 17 00:00:00 2001
From: Martin Penev <martin.penev@liip.ch>
Date: Wed, 2 Apr 2025 14:01:48 +0200
Subject: [PATCH 04/10] Update .gitlab-ci.yml with Drupal 10.4 and PHP 8.3

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1130797..7d9f822 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,8 @@ include:
       - '/includes/include.drupalci.workflows.yml'
 
 variables:
-  _TARGET_PHP: "8.2"
+  DRUPAL_CORE: "10.4"
+  _TARGET_PHP: "8.3"
   SYMFONY_DEPRECATIONS_HELPER: weak
   SKIP_STYLELINT: "1"
   SKIP_ESLINT: "1"
-- 
GitLab


From 44774bd7717189edbdb0e8a1031f4eb85e20fd23 Mon Sep 17 00:00:00 2001
From: Martin Penev <martin.penev@liip.ch>
Date: Wed, 2 Apr 2025 14:06:11 +0200
Subject: [PATCH 05/10] Update .gitlab-ci.yml with Drupal 10.4 and PHP 8.3

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d9f822..3404d56 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ include:
       - '/includes/include.drupalci.workflows.yml'
 
 variables:
-  DRUPAL_CORE: "10.4"
+  _TARGET_CORE: "10.4"
   _TARGET_PHP: "8.3"
   SYMFONY_DEPRECATIONS_HELPER: weak
   SKIP_STYLELINT: "1"
-- 
GitLab


From e9b930509f725a940d09e830de7cb65b174e6e58 Mon Sep 17 00:00:00 2001
From: Martin Penev <martin.penev@liip.ch>
Date: Wed, 2 Apr 2025 14:38:01 +0200
Subject: [PATCH 06/10] Add phpcs fixes

---
 .../src/Plugin/GraphQL/DataProducer/CalculatedPrice.php   | 6 +++---
 .../src/Plugin/GraphQL/DataProducer/FormattedPrice.php    | 4 ++--
 .../src/Plugin/GraphQL/SchemaExtension/PriceExtension.php | 2 +-
 .../graphql_commerce_registration.module                  | 5 +++--
 .../Plugin/GraphQL/DataProducer/RegistrationSettings.php  | 4 ++--
 src/Plugin/GraphQL/CommerceCartDataProducerBase.php       | 8 ++++----
 src/Plugin/GraphQL/DataProducer/Checkout.php              | 4 ++--
 src/Plugin/GraphQL/DataProducer/OrderTotalSummary.php     | 4 ++--
 .../GraphQL/DataProducer/ProductAttributeValues.php       | 4 ++--
 src/Plugin/GraphQL/DataProducer/ProductAttributes.php     | 4 ++--
 src/Plugin/GraphQL/SchemaExtension/CheckoutExtension.php  | 2 +-
 src/Wrapper/CommerceMutationResult.php                    | 2 +-
 12 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/modules/graphql_commerce_price/src/Plugin/GraphQL/DataProducer/CalculatedPrice.php b/modules/graphql_commerce_price/src/Plugin/GraphQL/DataProducer/CalculatedPrice.php
index 7b33d12..9b4d810 100644
--- a/modules/graphql_commerce_price/src/Plugin/GraphQL/DataProducer/CalculatedPrice.php
+++ b/modules/graphql_commerce_price/src/Plugin/GraphQL/DataProducer/CalculatedPrice.php
@@ -75,7 +75,7 @@ class CalculatedPrice extends DataProducerPluginBase implements ContainerFactory
     ContainerInterface $container,
     array $configuration,
     $pluginId,
-    $pluginDefinition
+    $pluginDefinition,
   ) {
     return new static(
       $configuration,
@@ -113,7 +113,7 @@ class CalculatedPrice extends DataProducerPluginBase implements ContainerFactory
     PriceCalculatorInterface $priceCalculator,
     CurrentStoreInterface $currentStore,
     AccountInterface $currentUser,
-    AdjustmentTypeManager $adjustmentTypeManager
+    AdjustmentTypeManager $adjustmentTypeManager,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->priceCalculator = $priceCalculator;
@@ -135,7 +135,7 @@ class CalculatedPrice extends DataProducerPluginBase implements ContainerFactory
    * @return \Drupal\commerce_price\Price|null
    *   The resolved price of the purchasable entity, or NULL if not available.
    */
-  public function resolve(PurchasableEntityInterface $purchasableEntity, array $adjustmentTypes = NULL, FieldContext $field) {
+  public function resolve(PurchasableEntityInterface $purchasableEntity, ?array $adjustmentTypes = NULL, FieldContext $field) {
     $context = new Context($this->currentUser, $this->currentStore->getStore(), NULL, []);
 
     $adjustmentTypes = $this->mapAdjustmentTypes($adjustmentTypes ?? []);
diff --git a/modules/graphql_commerce_price/src/Plugin/GraphQL/DataProducer/FormattedPrice.php b/modules/graphql_commerce_price/src/Plugin/GraphQL/DataProducer/FormattedPrice.php
index 95569a0..6a64f48 100644
--- a/modules/graphql_commerce_price/src/Plugin/GraphQL/DataProducer/FormattedPrice.php
+++ b/modules/graphql_commerce_price/src/Plugin/GraphQL/DataProducer/FormattedPrice.php
@@ -41,7 +41,7 @@ class FormattedPrice extends DataProducerPluginBase implements ContainerFactoryP
     ContainerInterface $container,
     array $configuration,
     $pluginId,
-    $pluginDefinition
+    $pluginDefinition,
   ) {
     return new static(
       $configuration,
@@ -67,7 +67,7 @@ class FormattedPrice extends DataProducerPluginBase implements ContainerFactoryP
     array $configuration,
     $pluginId,
     $pluginDefinition,
-    CurrencyFormatterInterface $currencyFormatter
+    CurrencyFormatterInterface $currencyFormatter,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->currencyFormatter = $currencyFormatter;
diff --git a/modules/graphql_commerce_price/src/Plugin/GraphQL/SchemaExtension/PriceExtension.php b/modules/graphql_commerce_price/src/Plugin/GraphQL/SchemaExtension/PriceExtension.php
index c366183..e2ab1ac 100644
--- a/modules/graphql_commerce_price/src/Plugin/GraphQL/SchemaExtension/PriceExtension.php
+++ b/modules/graphql_commerce_price/src/Plugin/GraphQL/SchemaExtension/PriceExtension.php
@@ -66,7 +66,7 @@ class PriceExtension extends SdlSchemaExtensionPluginBase implements TypeAwareSc
     $pluginId,
     array $pluginDefinition,
     ModuleHandlerInterface $moduleHandler,
-    AdjustmentTypeManager $adjustmentTypeManager
+    AdjustmentTypeManager $adjustmentTypeManager,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition, $moduleHandler);
     $this->adjustmentTypeManager = $adjustmentTypeManager;
diff --git a/modules/graphql_commerce_registration/graphql_commerce_registration.module b/modules/graphql_commerce_registration/graphql_commerce_registration.module
index 5e71fb2..332cdf1 100644
--- a/modules/graphql_commerce_registration/graphql_commerce_registration.module
+++ b/modules/graphql_commerce_registration/graphql_commerce_registration.module
@@ -1,10 +1,11 @@
 <?php
 
-use /**
+/**
  * @file
  * Provides Drupal\Core\Access\AccessResult class documentation.
  */
-  Drupal\Core\Access\AccessResult;
+
+use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Session\AccountInterface;
 
diff --git a/modules/graphql_commerce_registration/src/Plugin/GraphQL/DataProducer/RegistrationSettings.php b/modules/graphql_commerce_registration/src/Plugin/GraphQL/DataProducer/RegistrationSettings.php
index 9536cff..0e5132d 100644
--- a/modules/graphql_commerce_registration/src/Plugin/GraphQL/DataProducer/RegistrationSettings.php
+++ b/modules/graphql_commerce_registration/src/Plugin/GraphQL/DataProducer/RegistrationSettings.php
@@ -51,7 +51,7 @@ class RegistrationSettings extends DataProducerPluginBase implements ContainerFa
     ContainerInterface $container,
     array $configuration,
     $pluginId,
-    $pluginDefinition
+    $pluginDefinition,
   ) {
     return new static(
       $configuration,
@@ -81,7 +81,7 @@ class RegistrationSettings extends DataProducerPluginBase implements ContainerFa
     $pluginId,
     $pluginDefinition,
     EntityTypeManagerInterface $entity_type_manager,
-    RendererInterface $renderer
+    RendererInterface $renderer,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->entityTypeManager = $entity_type_manager;
diff --git a/src/Plugin/GraphQL/CommerceCartDataProducerBase.php b/src/Plugin/GraphQL/CommerceCartDataProducerBase.php
index b54a773..1ba3738 100644
--- a/src/Plugin/GraphQL/CommerceCartDataProducerBase.php
+++ b/src/Plugin/GraphQL/CommerceCartDataProducerBase.php
@@ -39,7 +39,7 @@ class CommerceCartDataProducerBase extends DataProducerPluginBase implements Con
     ContainerInterface $container,
     array $configuration,
     $pluginId,
-    $pluginDefinition
+    $pluginDefinition,
   ) {
     return new static(
       $configuration,
@@ -97,7 +97,7 @@ class CommerceCartDataProducerBase extends DataProducerPluginBase implements Con
     protected CurrentStoreInterface $currentStore,
     protected AccountProxyInterface $currentUser,
     protected MessengerInterface $messenger,
-    protected ConfigFactoryInterface $configFactory
+    protected ConfigFactoryInterface $configFactory,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
   }
@@ -113,7 +113,7 @@ class CommerceCartDataProducerBase extends DataProducerPluginBase implements Con
    * @return \Drupal\commerce\Context
    *   Context.
    */
-  protected function getAvailabilityContext(ProductVariationInterface $entity, OrderInterface $order = NULL): Context {
+  protected function getAvailabilityContext(ProductVariationInterface $entity, ?OrderInterface $order = NULL): Context {
     // If we have an order we use that to determine the store. If not, we use
     // the current store. In either case we check if the variation is
     // offered in that store. If not, we default to the first store that the
@@ -164,7 +164,7 @@ class CommerceCartDataProducerBase extends DataProducerPluginBase implements Con
   protected function addStockViolationsToResult(
     PurchasableEntityInterface $purchaseableEntity,
     int $quantityDelta,
-    CommerceMutationResult $result
+    CommerceMutationResult $result,
   ): bool {
 
     if (!function_exists('commerce_stock_enforcement_get_stock_level')) {
diff --git a/src/Plugin/GraphQL/DataProducer/Checkout.php b/src/Plugin/GraphQL/DataProducer/Checkout.php
index bcd3e60..3f121c2 100644
--- a/src/Plugin/GraphQL/DataProducer/Checkout.php
+++ b/src/Plugin/GraphQL/DataProducer/Checkout.php
@@ -64,7 +64,7 @@ class Checkout extends DataProducerPluginBase implements ContainerFactoryPluginI
     ContainerInterface $container,
     array $configuration,
     $pluginId,
-    $pluginDefinition
+    $pluginDefinition,
   ) {
     return new static(
       $configuration,
@@ -116,7 +116,7 @@ class Checkout extends DataProducerPluginBase implements ContainerFactoryPluginI
     $this->subRequestBuffer = $subRequestBuffer;
   }
 
-  public function resolve(OrderInterface $order, string $requestedStep = NULL, FieldContext $fieldContext) {
+  public function resolve(OrderInterface $order, ?string $requestedStep = NULL, FieldContext $fieldContext) {
     $url = Url::fromRoute('commerce_checkout.form', [
       'commerce_order' => $order->id(),
     ]);
diff --git a/src/Plugin/GraphQL/DataProducer/OrderTotalSummary.php b/src/Plugin/GraphQL/DataProducer/OrderTotalSummary.php
index 603ab6a..a97fb9e 100644
--- a/src/Plugin/GraphQL/DataProducer/OrderTotalSummary.php
+++ b/src/Plugin/GraphQL/DataProducer/OrderTotalSummary.php
@@ -42,7 +42,7 @@ class OrderTotalSummary extends DataProducerPluginBase implements ContainerFacto
     ContainerInterface $container,
     array $configuration,
     $pluginId,
-    $pluginDefinition
+    $pluginDefinition,
   ) {
     return new static(
       $configuration,
@@ -68,7 +68,7 @@ class OrderTotalSummary extends DataProducerPluginBase implements ContainerFacto
     array $configuration,
     $pluginId,
     $pluginDefinition,
-    OrderTotalSummaryInterface $orderTotalSummary
+    OrderTotalSummaryInterface $orderTotalSummary,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->orderTotalSummary = $orderTotalSummary;
diff --git a/src/Plugin/GraphQL/DataProducer/ProductAttributeValues.php b/src/Plugin/GraphQL/DataProducer/ProductAttributeValues.php
index ea90ebf..8c02561 100644
--- a/src/Plugin/GraphQL/DataProducer/ProductAttributeValues.php
+++ b/src/Plugin/GraphQL/DataProducer/ProductAttributeValues.php
@@ -40,7 +40,7 @@ class ProductAttributeValues extends DataProducerPluginBase implements Container
     ContainerInterface $container,
     array $configuration,
     $pluginId,
-    $pluginDefinition
+    $pluginDefinition,
   ) {
     return new static(
       $configuration,
@@ -66,7 +66,7 @@ class ProductAttributeValues extends DataProducerPluginBase implements Container
     array $configuration,
     $pluginId,
     $pluginDefinition,
-    ProductVariationAttributeMapperInterface $attributeMapper
+    ProductVariationAttributeMapperInterface $attributeMapper,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->attributeMapper = $attributeMapper;
diff --git a/src/Plugin/GraphQL/DataProducer/ProductAttributes.php b/src/Plugin/GraphQL/DataProducer/ProductAttributes.php
index f55a84b..042ef1d 100644
--- a/src/Plugin/GraphQL/DataProducer/ProductAttributes.php
+++ b/src/Plugin/GraphQL/DataProducer/ProductAttributes.php
@@ -42,7 +42,7 @@ class ProductAttributes extends DataProducerPluginBase implements ContainerFacto
     ContainerInterface $container,
     array $configuration,
     $pluginId,
-    $pluginDefinition
+    $pluginDefinition,
   ) {
     return new static(
       $configuration,
@@ -68,7 +68,7 @@ class ProductAttributes extends DataProducerPluginBase implements ContainerFacto
     array $configuration,
     $pluginId,
     $pluginDefinition,
-    ProductVariationAttributeMapperInterface $attributeMapper
+    ProductVariationAttributeMapperInterface $attributeMapper,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
     $this->attributeMapper = $attributeMapper;
diff --git a/src/Plugin/GraphQL/SchemaExtension/CheckoutExtension.php b/src/Plugin/GraphQL/SchemaExtension/CheckoutExtension.php
index dd5f26a..459e9bb 100644
--- a/src/Plugin/GraphQL/SchemaExtension/CheckoutExtension.php
+++ b/src/Plugin/GraphQL/SchemaExtension/CheckoutExtension.php
@@ -72,7 +72,7 @@ class CheckoutExtension extends SdlSchemaExtensionPluginBase implements TypeAwar
     $pluginId,
     array $pluginDefinition,
     ModuleHandlerInterface $moduleHandler,
-    CheckoutPaneManager $checkoutPaneManager
+    CheckoutPaneManager $checkoutPaneManager,
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition, $moduleHandler);
     $this->checkoutPaneManager = $checkoutPaneManager;
diff --git a/src/Wrapper/CommerceMutationResult.php b/src/Wrapper/CommerceMutationResult.php
index d5a54fd..86d95f7 100644
--- a/src/Wrapper/CommerceMutationResult.php
+++ b/src/Wrapper/CommerceMutationResult.php
@@ -28,7 +28,7 @@ class CommerceMutationResult {
    *   The commerce order.
    */
   public function __construct(
-    protected ?OrderInterface $order = NULL
+    protected ?OrderInterface $order = NULL,
   ) {
   }
 
-- 
GitLab


From 25d9bcfe37cc4e41cac9c40cf827307fc4a7ff49 Mon Sep 17 00:00:00 2001
From: Martin Penev <martin.penev@liip.ch>
Date: Wed, 2 Apr 2025 14:53:17 +0200
Subject: [PATCH 07/10] Remove DeprecationSuppressionTrait

---
 tests/src/Kernel/GraphQLCommerceKernelTestBase.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/src/Kernel/GraphQLCommerceKernelTestBase.php b/tests/src/Kernel/GraphQLCommerceKernelTestBase.php
index 48459c9..0058d64 100644
--- a/tests/src/Kernel/GraphQLCommerceKernelTestBase.php
+++ b/tests/src/Kernel/GraphQLCommerceKernelTestBase.php
@@ -8,7 +8,6 @@ use Drupal\commerce_price\Comparator\NumberComparator;
 use Drupal\commerce_price\Comparator\PriceComparator;
 use Drupal\commerce_store\StoreCreationTrait;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Tests\commerce\Traits\DeprecationSuppressionTrait;
 use Drupal\Tests\graphql_core_schema\Kernel\CoreComposableKernelTestBase;
 use SebastianBergmann\Comparator\Factory as PhpUnitComparatorFactory;
 
@@ -19,7 +18,6 @@ use SebastianBergmann\Comparator\Factory as PhpUnitComparatorFactory;
  */
 abstract class GraphQLCommerceKernelTestBase extends CoreComposableKernelTestBase {
 
-  use DeprecationSuppressionTrait;
   use StoreCreationTrait;
   use StringTranslationTrait;
 
@@ -53,7 +51,6 @@ abstract class GraphQLCommerceKernelTestBase extends CoreComposableKernelTestBas
    */
   protected function setUp(): void {
     parent::setUp();
-    $this->setErrorHandler();
 
     $factory = PhpUnitComparatorFactory::getInstance();
     $factory->register(new NumberComparator());
@@ -74,7 +71,6 @@ abstract class GraphQLCommerceKernelTestBase extends CoreComposableKernelTestBas
    * {@inheritdoc}
    */
   protected function tearDown(): void {
-    $this->restoreErrorHandler();
     parent::tearDown();
   }
 
-- 
GitLab


From 93dce14f8e83b368e29d14ce944e007c20616cfb Mon Sep 17 00:00:00 2001
From: Martin Penev <martin.penev@liip.ch>
Date: Wed, 2 Apr 2025 15:02:28 +0200
Subject: [PATCH 08/10] Remove DeprecationSuppressionTrait

---
 tests/src/Kernel/GraphQLCommerceKernelTestBase.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/tests/src/Kernel/GraphQLCommerceKernelTestBase.php b/tests/src/Kernel/GraphQLCommerceKernelTestBase.php
index 0058d64..e88d444 100644
--- a/tests/src/Kernel/GraphQLCommerceKernelTestBase.php
+++ b/tests/src/Kernel/GraphQLCommerceKernelTestBase.php
@@ -67,11 +67,4 @@ abstract class GraphQLCommerceKernelTestBase extends CoreComposableKernelTestBas
     $this->store = $this->createStore('Default store', 'admin@example.com');
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  protected function tearDown(): void {
-    parent::tearDown();
-  }
-
 }
-- 
GitLab


From cfc6b8546aec143e5ed5062292edda0880ef06cf Mon Sep 17 00:00:00 2001
From: Martin Penev <martin.penev@liip.ch>
Date: Wed, 2 Apr 2025 15:07:31 +0200
Subject: [PATCH 09/10] Update .gitlab-ci.yml with Drupal 10.4.5 and PHP 8.3

---
 .gitlab-ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3404d56..5013287 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,8 +12,12 @@ include:
       - '/includes/include.drupalci.workflows.yml'
 
 variables:
-  _TARGET_CORE: "10.4"
   _TARGET_PHP: "8.3"
   SYMFONY_DEPRECATIONS_HELPER: weak
   SKIP_STYLELINT: "1"
   SKIP_ESLINT: "1"
+
+composer (10.4.5):
+  extends: .composer-base
+  variables:
+    DRUPAL_CORE: "10.4.5"
\ No newline at end of file
-- 
GitLab


From bd8adfe55258e42f4e56c10803dea2e4fb4f51c6 Mon Sep 17 00:00:00 2001
From: Martin Penev <martin.penev@liip.ch>
Date: Wed, 2 Apr 2025 15:08:50 +0200
Subject: [PATCH 10/10] Update .gitlab-ci.yml with Drupal 10.4.5 and PHP 8.3

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5013287..6281b35 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,6 @@ variables:
   SKIP_STYLELINT: "1"
   SKIP_ESLINT: "1"
 
-composer (10.4.5):
-  extends: .composer-base
+composer:
   variables:
     DRUPAL_CORE: "10.4.5"
\ No newline at end of file
-- 
GitLab