diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11307978e480f08e0d87ec8877ce72bb2c4d91f3..6281b35b549a7f89e2222f170ac26d6d0fd74323 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,11 @@ include:
       - '/includes/include.drupalci.workflows.yml'
 
 variables:
-  _TARGET_PHP: "8.2"
+  _TARGET_PHP: "8.3"
   SYMFONY_DEPRECATIONS_HELPER: weak
   SKIP_STYLELINT: "1"
   SKIP_ESLINT: "1"
+
+composer:
+  variables:
+    DRUPAL_CORE: "10.4.5"
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 8f35d02940acef54d07cd5317e3f08eeb1360d57..1aedf606f3a20366ef109b595e47e09b8c9f08ee 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.0",
     "drupal/graphql_core_schema": "^1.0"
   }
 }
diff --git a/graphql_commerce.info.yml b/graphql_commerce.info.yml
index f5b58e0d4b7bf158ce45b44b5364baf6657b78a9..0dadd18c0abed31ac4b8970bff8d5440193edf8b 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 901b9c917d1d9283efc696d4e6360d1ff1a4cfe5..e581bee8fe2b5d6c572789ea04937f4e844bbfd7 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_price/src/Plugin/GraphQL/DataProducer/CalculatedPrice.php b/modules/graphql_commerce_price/src/Plugin/GraphQL/DataProducer/CalculatedPrice.php
index 7b33d12ec295c7054aac396871446eb7a44d680b..9b4d810049be1909977d3faf3a50b928192f9ac5 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 95569a0607de1911160bbde446dad797422bd673..6a64f48c5e14427c5d572948d798a92c4daa8314 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 c366183a6ae89a0259376cf3fd380c7ae5d95b79..e2ab1ac902ad794092fa71e2f4657330770a2dd9 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_promotion/graphql_commerce_promotion.info.yml b/modules/graphql_commerce_promotion/graphql_commerce_promotion.info.yml
index 69223f4db2eb32c42029cc7c4634b63f3e89bbe5..b6670b9ad7042349014c46f6e128524f776fcae1 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 4fc837dfe7d75238d1a8ed596dedefdccf81a31b..a7163eeb075f62ef5d42d52ad98adf5e2b69208d 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
diff --git a/modules/graphql_commerce_registration/graphql_commerce_registration.module b/modules/graphql_commerce_registration/graphql_commerce_registration.module
index 5e71fb217eb68190f26a6edef8e39543db9a40b3..332cdf1c5344034929dc06556b19d3d0dae4364a 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 9536cff4cf79849c062c9c1736a743c052f907be..0e5132dd93c7d18f36809724b437625737fa6d25 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 b54a7731a7674876bb4ceadce7574f5ad495807f..1ba37386c09858ef138ff4ab27f717819f96ed67 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 bcd3e60edef17c0cdda08a9b71788d73c641b73b..3f121c22fb4ed5f029e16e859d0c57774bdd66bf 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 603ab6a91af7ed3b762aaa6674b8bf904041e437..a97fb9e314e046de822ef978c8a12fc12bb204dc 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 ea90ebf74475c79fbc76877aecd8c98d638d4400..8c02561b255ad78cbf592258e6dbba50c0346bc3 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 f55a84b38240f738fd60c7157ce884934126d3e7..042ef1db2dfd8115e0a23d4fa44ad2d46d1f3589 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 dd5f26aeab3e389e53d6d2811ed5fb63d04e268b..459e9bbc3a44f30d92dd61e572d1bb79d1690a4c 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 d5a54fdf5d336861070e0023085978857db204d1..86d95f7544633ca5d94763c313e374c9d6ed04f6 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,
   ) {
   }
 
diff --git a/tests/src/Kernel/GraphQLCommerceKernelTestBase.php b/tests/src/Kernel/GraphQLCommerceKernelTestBase.php
index 48459c90db14564dba89ed4a212826658ef2dfc1..e88d444b886eba8cbcf198bfbf6deb0ec71e2787 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());
@@ -70,12 +67,4 @@ abstract class GraphQLCommerceKernelTestBase extends CoreComposableKernelTestBas
     $this->store = $this->createStore('Default store', 'admin@example.com');
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  protected function tearDown(): void {
-    $this->restoreErrorHandler();
-    parent::tearDown();
-  }
-
 }