- [0007915]: Fix fatal error "Call to a member function getId() on null" on product detail page when an out-of-stock variant is in the basket. hasProductVariantInBasket() delegated to Basket::getArtStockInBasket() which calls getArticle(true) (buyable-check). For out-of-stock variants this returns null. Replaced with direct basket iteration using getArticle(false) to skip the buyable check.

Author: mariolorenz

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### FIX
 
+- [0007915](https://bugs.oxid-esales.com/view.php?id=7915): Fix fatal error "Call to a member function getId() on null" on product detail page when an out-of-stock variant is in the basket. `hasProductVariantInBasket()` delegated to `Basket::getArtStockInBasket()` which calls `getArticle(true)` (buyable-check). For out-of-stock variants this returns null. Replaced with direct basket iteration using `getArticle(false)` to skip the buyable check.
 - [0007916](https://bugs.oxid-esales.com/view.php?id=7916): Fix orphaned oscpaypal_order rows with OSCPAYPALSTATUS=COMPLETED and empty OXORDERID. When `sess_challenge` was cleared before `captureOrder()` completed (e.g. by a concurrent cancel request), the capture flow proceeded and created tracking records that could not be matched by webhook processing. Added defense-in-depth validation at four levels: `AjaxPaymentController::captureOrder()` now aborts if the shop order cannot be resolved, `PayPalOrderCompletedSubscriber` rejects events with empty shopOrderId, `Payment::trackPayPalOrder()` throws on empty shopOrderId, and `OrderRepository::paypalOrderByOrderIdAndPayPalId()` refuses to create new records with empty shopOrderId.
 
 ## [3.7.1] - 2026-03-19

src/Model/Basket.php

@@ -252,17 +252,22 @@ public function getPayPalCheckoutRoundDiff()
      */
     public function hasProductVariantInBasket(\OxidEsales\Eshop\Application\Model\Article $product)
     {
-        $return = false;
-
         $variantIds = $product->getVariantIds();
-        foreach ($variantIds as $id) {
-            if ($this->getArtStockInBasket($id)) {
-                $return = true;
-                break;
+        if (empty($variantIds)) {
+            return false;
+        }
+
+        $variantIdMap = array_flip($variantIds);
+        foreach ($this->getContents() as $basketItem) {
+            // Use getArticle(false) to skip the buyable check – out-of-stock
+            // variants that are still in the basket must not cause a fatal error.
+            $article = $basketItem->getArticle(false);
+            if ($article && isset($variantIdMap[$article->getId()])) {
+                return true;
             }
         }
 
-        return $return;
+        return false;
     }
 
     /**