Issue #2834628 by googletorp, mglaman: Fatal error when adding a order item to cart which doesn't have a purchaseable entity (#607)

Author: mglaman

modules/cart/src/CartManager.php

@@ -115,8 +115,11 @@ public function addOrderItem(OrderInterface $cart, OrderItemInterface $order_ite
       $cart->addItem($order_item);
     }
 
-    $event = new CartEntityAddEvent($cart, $purchased_entity, $quantity, $order_item);
-    $this->eventDispatcher->dispatch(CartEvents::CART_ENTITY_ADD, $event);
+    if ($purchased_entity) {
+      $event = new CartEntityAddEvent($cart, $purchased_entity, $quantity, $order_item);
+      $this->eventDispatcher->dispatch(CartEvents::CART_ENTITY_ADD, $event);
+    }
+
     if ($save_cart) {
       $cart->save();
     }

modules/cart/tests/src/Kernel/CartManagerTest.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\commerce_cart\Kernel;
 
+use Drupal\commerce_order\Entity\OrderItem;
 use Drupal\commerce_price\Price;
 use Drupal\commerce_order\Entity\OrderInterface;
 use Drupal\commerce_product\Entity\ProductVariation;
@@ -159,4 +160,21 @@ public function testCartManager() {
     $this->assertEquals(new Price('0.00', 'USD'), $cart->getTotalPrice());
   }
 
+  /**
+   * Tests that order items without purchaseable entity do not cause crashes.
+   */
+  public function testAddOrderItem() {
+    $this->installCommerceCart();
+    $cart = $this->cartProvider->createCart('default', $this->store, $this->user);
+
+    $order_item = OrderItem::create([
+      'type' => 'default',
+      'quantity' => 2,
+      'unit_price' => new Price('12.00', 'USD'),
+    ]);
+    $order_item->save();
+    $this->cartManager->addOrderItem($cart, $order_item);
+    $this->assertEquals(1, count($cart->getItems()));
+  }
+
 }