Merge branch 'b-6.5.x' into fix-noarticle-adyen-order

OXID-eSales · Jan 28, 2025 · 25da4f8 · 25da4f8
2 parents 6ee9bef + 742060a
commit 25da4f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.1.9] - 2025-??-??
+
 ## FIX
 - Fix github workflows docker compose
+- request Adyen cancellation when finalizeOrder fails due to stock exceptions
 
 ## [1.1.8] - 2024-11-19
 

diff --git a/src/Model/Order.php b/src/Model/Order.php
@@ -31,6 +31,7 @@
  *
  * @mixin \OxidEsales\Eshop\Application\Model\Order
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Order extends Order_parent
 {