Skip to content

D
doctrine-dbal
Commit 3f4cd46b authored by piccoloprincipe's avatar piccoloprincipe
Browse files
Options

[2.0] simplified removing code

parent 1b9b6c68
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 12 deletions
tests/Doctrine/Tests/Models/ECommerce/ECommerceCategory.php
View file @ 3f4cd46b
...@@ -59,9 +59,9 @@ class ECommerceCategory ...@@ -59,9 +59,9 @@ class ECommerceCategory
public function removeProduct(ECommerceProduct $product) public function removeProduct(ECommerceProduct $product)
{ {
if ($this->products->contains($product)) { $removed = $this->products->removeElement($product);
$this->products->removeElement($product); if ($removed !== null) {
$product->removeCategory($this); $removed->removeCategory($this);
} }
} }
......
tests/Doctrine/Tests/Models/ECommerce/ECommerceProduct.php
View file @ 3f4cd46b
...@@ -98,12 +98,10 @@ class ECommerceProduct ...@@ -98,12 +98,10 @@ class ECommerceProduct
public function removeFeature(ECommerceFeature $feature) public function removeFeature(ECommerceFeature $feature)
{ {
if ($this->features->contains($feature)) { $removed = $this->features->removeElement($feature);
$removed = $this->features->removeElement($feature); if ($removed !== null) {
if ($removed) { $removed->removeProduct();
$feature->removeProduct(); return true;
return true;
}
} }
return false; return false;
} }
...@@ -118,9 +116,9 @@ class ECommerceProduct ...@@ -118,9 +116,9 @@ class ECommerceProduct
public function removeCategory(ECommerceCategory $category) public function removeCategory(ECommerceCategory $category)
{ {
if ($this->categories->contains($category)) { $removed = $this->categories->removeElement($category);
$this->categories->removeElement($category); if ($removed !== null) {
$category->removeProduct($this); $removed->removeProduct($this);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment