Merge pull request #9578 from lchrusciel/bc-fix

pamil · web-flow · commit 1405dec66987 · 2018-07-11T10:13:54.000+02:00
[Core] Nullable customer on order
diff --git a/src/Sylius/Component/Core/Model/Order.php b/src/Sylius/Component/Core/Model/Order.php
@@ -126,7 +126,7 @@ public function getCustomer(): ?BaseCustomerInterface
      */
     public function setCustomer(?BaseCustomerInterface $customer): void
     {
-        Assert::isInstanceOf($customer, CustomerInterface::class);
+        Assert::nullOrisInstanceOf($customer, CustomerInterface::class);
 
         $this->customer = $customer;
     }
diff --git a/src/Sylius/Component/Core/spec/Model/OrderSpec.php b/src/Sylius/Component/Core/spec/Model/OrderSpec.php
@@ -52,6 +52,12 @@ function its_allows_defining_customer(CustomerInterface $customer): void
         $this->getCustomer()->shouldReturn($customer);
     }
 
+    function its_customer_can_be_nullable(): void
+    {
+        $this->setCustomer(null);
+        $this->getCustomer()->shouldReturn(null);
+    }
+
     function its_channel_is_mutable(ChannelInterface $channel): void
     {
         $this->setChannel($channel);

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public function getCustomer(): ?BaseCustomerInterface`
`126`	`126`	`*/`
`127`	`127`	`public function setCustomer(?BaseCustomerInterface $customer): void`
`128`	`128`	`{`
`129`		`- Assert::isInstanceOf($customer, CustomerInterface::class);`
	`129`	`+ Assert::nullOrisInstanceOf($customer, CustomerInterface::class);`
`130`	`130`
`131`	`131`	`$this->customer = $customer;`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,12 @@ function its_allows_defining_customer(CustomerInterface $customer): void`
`52`	`52`	`$this->getCustomer()->shouldReturn($customer);`
`53`	`53`	`}`
`54`	`54`
	`55`	`+ function its_customer_can_be_nullable(): void`
	`56`	`+ {`
	`57`	`+ $this->setCustomer(null);`
	`58`	`+ $this->getCustomer()->shouldReturn(null);`
	`59`	`+ }`
	`60`	`+`
`55`	`61`	`function its_channel_is_mutable(ChannelInterface $channel): void`
`56`	`62`	`{`
`57`	`63`	`$this->setChannel($channel);`