diff --git a/modules/checkout/tests/src/Functional/CheckoutOrderTest.php b/modules/checkout/tests/src/Functional/CheckoutOrderTest.php index 13e10c58..7ed0ccbc 100644 --- a/modules/checkout/tests/src/Functional/CheckoutOrderTest.php +++ b/modules/checkout/tests/src/Functional/CheckoutOrderTest.php @@ -135,7 +135,7 @@ class CheckoutOrderTest extends CommerceBrowserTestBase { */ public function testGuestOrderCheckout() { $this->drupalLogout(); - $this->drupalGet($this->product->toUrl()); + $this->drupalGet($this->product->toUrl()->toString()); $this->submitForm([], 'Add to cart'); $this->assertSession()->pageTextContains('1 item'); $cart_link = $this->getSession()->getPage()->findLink('your cart'); @@ -165,7 +165,7 @@ class CheckoutOrderTest extends CommerceBrowserTestBase { $this->assertSession()->pageTextContains('Your order number is 1. You can view your order on your account page when logged in.'); $this->assertSession()->pageTextContains('0 items'); // Test second order. - $this->drupalGet($this->product->toUrl()); + $this->drupalGet($this->product->toUrl()->toString()); $this->submitForm([], 'Add to cart'); $this->assertSession()->pageTextContains('1 item'); $cart_link = $this->getSession()->getPage()->findLink('your cart'); @@ -212,7 +212,7 @@ class CheckoutOrderTest extends CommerceBrowserTestBase { $config->save(); $this->drupalLogout(); - $this->drupalGet($this->product->toUrl()); + $this->drupalGet($this->product->toUrl()->toString()); $this->submitForm([], 'Add to cart'); $cart_link = $this->getSession()->getPage()->findLink('your cart'); $cart_link->click(); @@ -325,7 +325,7 @@ class CheckoutOrderTest extends CommerceBrowserTestBase { 'stores' => [$this->store], ]); // Adding a new product to the cart resets the checkout step. - $this->drupalGet($product2->toUrl()); + $this->drupalGet($product2->toUrl()->toString()); $this->submitForm([], 'Add to cart'); $this->getSession()->getPage()->findLink('your cart')->click(); $this->submitForm([], 'Checkout'); diff --git a/modules/order/src/Entity/Order.php b/modules/order/src/Entity/Order.php index 13cf999c..99eb6bef 100644 --- a/modules/order/src/Entity/Order.php +++ b/modules/order/src/Entity/Order.php @@ -91,8 +91,7 @@ class Order extends CommerceContentEntityBase implements OrderInterface { * {@inheritdoc} */ public function getStore() { - $store = $this->getTranslatedReferencedEntities('store_id'); - return reset($store); + return $this->getTranslatedReferencedEntity('store_id'); } /** diff --git a/modules/order/src/Entity/OrderItem.php b/modules/order/src/Entity/OrderItem.php index d4d7ea77..3ee87c99 100644 --- a/modules/order/src/Entity/OrderItem.php +++ b/modules/order/src/Entity/OrderItem.php @@ -75,8 +75,7 @@ class OrderItem extends CommerceContentEntityBase implements OrderItemInterface * {@inheritdoc} */ public function getPurchasedEntity() { - $purchased_entity = $this->getTranslatedReferencedEntities('purchased_entity'); - return reset($purchased_entity); + return $this->getTranslatedReferencedEntity('purchased_entity'); } /**