RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-02 04:46:16 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] simplified removing code

Browse source
This commit is contained in:
piccoloprincipe 2009-07-02 09:44:06 +00:00
parent 1b9b6c68e0
commit 3f4cd46b96
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/Doctrine/Tests/Models/ECommerce/ECommerceCategory.php
View file

@ -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);
} }
} }

12
tests/Doctrine/Tests/Models/ECommerce/ECommerceProduct.php
View file

@ -98,13 +98,11 @@ 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) { if ($removed !== null) {
$feature->removeProduct(); $removed->removeProduct();
return true; return true;
} }
}
return false; return false;
} }
@ -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);
} }
} }