RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Bumped Common dependency to RC1, fixing related issues in the test suite.

Browse source
This commit is contained in:
Roman S. Borschel 2010-09-01 20:43:23 +02:00
parent 7ff9976b3c
commit 207d624f5f
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/vendor/doctrine-common vendored

@ -1 +1 @@
Subproject commit 3b5123434e979c7adfd42061484b5a8f10a3431b Subproject commit 0bd0fa68bbdc4d81c7742f2c972b5ed0c02b0640

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

@ -73,8 +73,8 @@ class ECommerceCategory
public function removeProduct(ECommerceProduct $product) public function removeProduct(ECommerceProduct $product)
{ {
$removed = $this->products->removeElement($product); $removed = $this->products->removeElement($product);
if ($removed !== null) { if ($removed) {
$removed->removeCategory($this); $product->removeCategory($this);
} }
} }
@ -114,8 +114,8 @@ class ECommerceCategory
public function removeChild(ECommerceCategory $child) public function removeChild(ECommerceCategory $child)
{ {
$removed = $this->children->removeElement($child); $removed = $this->children->removeElement($child);
if ($removed !== null) { if ($removed) {
$removed->removeParent(); $child->removeParent();
} }
} }

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

@ -112,11 +112,10 @@ class ECommerceProduct
public function removeFeature(ECommerceFeature $feature) public function removeFeature(ECommerceFeature $feature)
{ {
$removed = $this->features->removeElement($feature); $removed = $this->features->removeElement($feature);
if ($removed !== null) { if ($removed) {
$removed->removeProduct(); $feature->removeProduct();
return true;
} }
return false; return $removed;
} }
public function addCategory(ECommerceCategory $category) public function addCategory(ECommerceCategory $category)
@ -130,8 +129,8 @@ class ECommerceProduct
public function removeCategory(ECommerceCategory $category) public function removeCategory(ECommerceCategory $category)
{ {
$removed = $this->categories->removeElement($category); $removed = $this->categories->removeElement($category);
if ($removed !== null) { if ($removed) {
$removed->removeProduct($this); $category->removeProduct($this);
} }
} }